Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/privateComponents/components/AddExtProcessSkillUser/index.vue

@@ -83,6 +83,12 @@ export default {
             }
             try {
               await this.$api.searchApi('DxPostMemberLink', params).then(post => {
+                if (form.hasOwnProperty('workCode')) {
+                  form.workCode.sort(function(a, b) {
+                    return parseInt(a.substring(a.lastIndexOf('(') + 1, a.lastIndexOf(')'))) - parseInt(b.substring(b.lastIndexOf('(') + 1, b.lastIndexOf(')')))
+                  })
+                  form.workCode = form.workCode.join(',')
+                }
                 if (post.items.content.length) {
                   const postList = post.items.content[0]
                   tableDataList.push({
@@ -91,6 +97,7 @@ export default {
                     dxUserInfoId: user.id,
                     isSkillLeader: form.isSkillLeader,
                     postValidity: form.postValidity,
+                    workCode: form.workCode,
                     remark: form.remark,
                     sealNo: form.sealNo
                   })
@@ -100,6 +107,7 @@ export default {
                     dxUserInfoId: user.id,
                     isSkillLeader: form.isSkillLeader,
                     postValidity: form.postValidity,
+                    workCode: form.workCode,
                     remark: form.remark,
                     sealNo: form.sealNo
                   })

applications/dee-mes/src/privateComponents/components/GeneralLinkageSelect/index.vue

@@ -87,7 +87,6 @@ export default {
     }
   },
   created() {
-    console.log(http, 'http')
     // 初始化数据
   },
   methods: {

applications/dee-mes/src/privateComponents/components/ProblemProgressCom/config.js

+export default {
+  props: {},
+  layoutConfigData: [
+    {
+      title: '高级组件配置',
+      data: [
+        {
+          key: 'bindValue',
+          title: '绑定属性',
+          component: {
+            defaultValue: '',
+            name: 'el-input'
+          }
+        }
+      ]
+    }
+  ],
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  computed: {
+
+  },
+  methods: {
+
+  }
+}
+

applications/dee-mes/src/privateComponents/components/ProblemProgressCom/index.vue

+<template>
+  <div class="problemProgressCom">
+    <el-form ref="form" class="processForm" :inline="true" :model="formData" label-width="40px">
+      <el-row v-for="(item, index) in resultFormData" :key="index">
+        <el-col :span="5">
+          <el-form-item
+            label="日期"
+            :prop="'progresss.' + index + '.progressTime'"
+          >
+            <!-- :rules="{
+            required: true, message: '该项必填', trigger: 'blur'
+          }" -->
+            <el-date-picker
+              v-model="item.progressTime"
+              size="small"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="17">
+          <el-form-item
+            label="答复"
+            :prop="'progresss.' + index + '.progressItem'"
+            class="textareaItem"
+          >
+            <!-- :rules="[
+            {required: true, message: '该项必填', trigger: 'blur'},
+          ]" -->
+            <el-input v-model="item.progressItem" autosize type="textarea" size="small" @change="changeVal" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="2">
+          <el-form-item class="btn-box">
+            <span v-if="index+1 == resultFormData.length" class="btn-item" title="新增" @click="addItem" @change="changeVal">
+              <img src="/icons/c-add.png" alt="">
+            </span>
+            <span v-if="index !== 0" class="btn-item" title="删除" @click="deleteItem(item,index)">
+              <img src="/icons/c-creatbackups.png" alt="">
+            </span>
+          </el-form-item>
+        </el-col>
+
+      </el-row></el-form>
+  </div>
+</template>
+<script>
+import config from './config'
+import moment from 'moment'
+export default {
+  componentName: '问题进展',
+  name: 'ProblemProgressCom', // name写在组件的最前方,自定义组件为必填
+  components: {},
+  mixins: [config],
+  props: {
+    itemObj: {
+      type: Object,
+      default: null
+    },
+    form: {
+      type: Object,
+      default: () => {}
+    },
+    middleForm: {
+      type: Object,
+      default: () => {}
+    },
+    value: {
+      type: [Number, String, Object, Array],
+      default: () => ''
+    }
+  },
+  data() {
+    return {
+      formData: {
+        progresss: [
+          {
+            progressTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+            progressItem: '',
+            operator: 'ADD'
+          }
+        ]
+      }
+
+    }
+  },
+  computed: {
+    resultFormData() {
+      return this.formData.progresss.filter(item => item.operator !== 'REMOVE')
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      deep: true,
+      handler(v) {
+        if (v) {
+          this.$set(this.formData, 'progresss', this.value.map(item => {
+            if (!item.operator) {
+              if (item.id) {
+                item.operator = 'MODIFY'
+              } else {
+                item.operator = 'ADD'
+              }
+            }
+            return item
+          }))
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化数据
+  },
+  methods: {
+    addItem() {
+      this.formData.progresss.push({
+        progressTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+        progressItem: '',
+        operator: 'ADD'
+      })
+      this.changeVal()
+    },
+    deleteItem(item, index) {
+      item.operator = 'REMOVE'
+      this.changeVal()
+    },
+    changeVal() {
+      this.$emit('input', this.formData.progresss)
+    }
+  }
+}
+</script>
+<style lang='scss'>
+.problemProgressCom{
+  .processForm{
+    width: 100%;
+    .el-form-item{
+    width: 100%;
+    .el-form-item__content{
+    width: calc(100% - 50px);
+   }
+  }
+  .btn-box{
+        width: 100%;
+        height: 100%;
+        margin-bottom: 0px;
+        .el-form-item__content{
+           width: 100%;
+         }
+        .btn-item {
+          display: inline-block;
+            padding: 4px;
+            width: 16px;
+            height: 16px;
+            img{
+              height: 100%;
+              width: 100%;
+            }
+            // line-height: 16px;
+
+        }
+
+    }
+  }
+
+}
+
+</style>

applications/dee-mes/src/privateComponents/components/StationSelect/config.js

+export default {
+  props: {},
+  layoutConfigData: [
+    {
+      title: '高级组件配置',
+      data: [
+        {
+          key: 'bindKey',
+          title: '绑定属性',
+          disabled: true,
+          component: {
+            defaultValue: 'positionNumber',
+            name: 'el-input'
+          }
+        },
+        {
+          key: 'relatedAttribute',
+          title: '受关联属性',
+          disabled: true,
+          component: {
+            defaultValue: '',
+            name: 'el-input'
+          }
+        }
+      ]
+    }
+  ],
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  computed: {
+
+  },
+  methods: {
+
+  }
+}
+

applications/dee-mes/src/privateComponents/components/StationSelect/index.vue

 <template>
   <div>
     <el-select
-      :value="value"
+      :value="selVal"
       :loading="loading"
       filterable
       remote
@@ -22,10 +22,11 @@
 </template>
 
 <script>
-
+import config from './config'
 export default {
   name: 'StationSelect',
   componentName: '架次关联站位编号',
+  mixins: [config],
   props: {
     value: {
       type: [String, Number],
@@ -47,20 +48,35 @@ export default {
   data() {
     return {
       loading: false,
-      options: []
+      options: [],
+      // linkageValue: '',
+      selVal: ''
     }
   },
   computed: {},
   watch: {
     'form.sorties': {
       immediate: true,
-      deep: true,
+      // deep: true,
       handler(val) {
+        // if (val !== this.linkageValue) {
         if (this.item.key !== 'position') {
+          // this.linkageValue = val
           this.$set(this.form, 'positionNumber', '')
+          this.selVal = ''
         }
+        // }
         val && this.getOptions()
       }
+    },
+    value: {
+      immediate: true,
+      deep: true,
+      handler(v) {
+        if (v) {
+          this.selVal = this.value
+        }
+      }
     }
   },
   methods: {
@@ -104,6 +120,15 @@ export default {
     },
     change(val) {
       this.$emit('input', val)
+      this.clearRelativeAttr()
+    },
+    clearRelativeAttr() {
+      if (this.item.relatedAttribute) {
+        const attributes = this.item.relatedAttribute.split(',') || []
+        attributes.forEach(el => {
+          el && this.$set(this.form, el, '')
+        })
+      }
     },
     clear() {
       this.$emit('input')