调漆

applications/dee-mes/src/api/config.js

+// eslint-disable-next-line no-unused-vars
 import { get } from '../utils/http'
 
 // 删除索引
+// eslint-disable-next-line no-redeclare
 export function get(params) {
   return get(`/demo`)
 }

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

@@ -61,7 +61,7 @@ export default {
         } else {
           this.cmpOptions = {
             typeName: 'AssignCardPaint',
-            layKey: 'assignCardInfo'
+            layKey: 'AssignCardPaintView'
           }
         }
       }

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

@@ -155,6 +155,7 @@ export default {
             name = '阿洛丁调配'
             break
         }
+        delete this.setAttrs.modelNo
         if (e.el.selectedData.length === 0) {
           this.$utils.showConfirm(
             `确定不关联${name}申请创建调配卡吗, 是否继续?`,
@@ -215,7 +216,8 @@ export default {
         'dxClassName': 'com.yonde.tf.mom.common.vo.schedule.AssignCardVO',
         'subTypeName': this.subTypeName,
         'operator': 'ADD',
-        productArea: this.productArea
+        productArea: this.productArea,
+        createTimeTo: this.$moment().format('YYYY-MM-DD hh:mm:ss')
       }
       post(`/AssignCard/recursion`, params).then(res => {
         if (res.code === 0) {

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

@@ -5,7 +5,7 @@
       class="input-with-select el-input--small"
       placeholder=""
       clearable
-      :disabled="itemObj.readOnly"
+      :disabled="disabled"
       style="width: 40%"
       @change="change"
     />
@@ -15,7 +15,7 @@
       class="input-with-select el-input--small"
       placeholder=""
       clearable
-      :disabled="itemObj.readOnly"
+      :disabled="disabled"
       style="width: 40%"
       @change="change"
     />
@@ -41,9 +41,13 @@ export default {
   data() {
     return {
       cup: '',
-      second: ''
+      second: '',
+      com: {},
+      disabled: false
     }
   },
+  computed: {
+  },
   watch: {
     'form.id': {
       immediate: true,
@@ -55,9 +59,21 @@ export default {
     }
 
   },
+  mounted() {
+    this.com = this.$utils.findByNameVnode(this, 'DeeAsForm')
+    this.com.formData.forEach(item => {
+      item.data && item.data.forEach(x => {
+        if (x.key === 'viscosity') {
+          this.disabled = x.component.disabled
+        }
+      })
+    })
+  },
   methods: {
     change() {
-      this.$emit('input', this.cup + ' ' + this.second)
+      if (this.cup && this.second) {
+        this.$emit('input', this.cup + ' ' + this.second)
+      }
     }
   }
 }