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

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

+<template>
+  <div class="AssignCradInfo">
+    <dee-as-com
+      ref="detailCom"
+      dis-business
+      :lay-config="cmpOptions"
+      :basic-data="basicData"
+    />
+  </div>
+</template>
+<script>
+export default {
+  name: 'AssignCradInfo',
+  componentName: '调配卡详情',
+  components: {},
+  props: {
+    basicData: {
+      type: Object,
+      default: () => null
+    }
+  },
+  data() {
+    return {
+      cmpOptions: {}
+    }
+  },
+  watch: {
+    basicData: {
+      immediate: true,
+      deep: true,
+      handler: function(val) {
+        if (val.subTypeName === 'AssignCardAlodine') {
+          this.cmpOptions = {
+            typeName: 'AssignCardAlodine',
+            layKey: 'assignCardInfo'
+          }
+        } else if (val.subTypeName === 'AssignCardLacquer') {
+          this.cmpOptions = {
+            typeName: 'AssignCardLacquer',
+            layKey: 'assignCardInfo'
+          }
+        } else {
+          this.cmpOptions = {
+            typeName: 'AssignCardPaint',
+            layKey: 'assignCardInfo'
+          }
+        }
+      }
+    }
+  }
+}
+</script>
+<style  lang='scss'>
+</style>

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

+export default {
+  layoutConfigData: [
+    {
+      title: '高级组件配置',
+      data: [
+        {
+          key: 'readOnly',
+          title: '只读',
+          component: {
+            name: 'el-checkbox'
+          }
+        }
+      ]
+    }
+  ],
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  computed: {
+
+  },
+  methods: {
+
+  }
+}
+

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

@@ -16,7 +16,7 @@
                 class="input-with-select el-input--small"
                 placeholder="请输入剩余施工期"
                 clearable
-                :disabled="disabled"
+                :disabled="itemObj.readOnly"
                 type="Number"
               />
             </el-form-item>
@@ -29,7 +29,7 @@
                 class="input-with-select el-input--small"
                 placeholder="请选择失效期"
                 style="width: 220px"
-                :disabled="disabled"
+                :disabled="itemObj.readOnly"
                 format="yyyy 年 MM 月 dd 日 HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
               />
@@ -39,7 +39,7 @@
             <el-form-item label="" prop="isFreezing">
               <el-radio-group
                 v-model="form.isFreezing"
-                :disabled="disabled"
+                :disabled="itemObj.readOnly"
               >
                 <el-radio :label="true">需要</el-radio>
                 <el-radio :label="false">不需要</el-radio>
@@ -53,7 +53,7 @@
                 placeholder="请输入冷冻温度/℃"
                 clearable
                 class="input-with-select el-input--small"
-                :disabled="disabled"
+                :disabled="itemObj.readOnly"
                 type="Number"
               />
             </el-form-item>
@@ -81,6 +81,7 @@
   </div>
 </template>
 <script>
+import config from './config'
 import Dialog from './dialog'
 import { post } from '@/utils/http'
 export default {
@@ -89,6 +90,7 @@ export default {
   components: {
     Dialog
   },
+  mixins: [config],
   props: {
     basicData: {
       type: Object,
@@ -97,11 +99,14 @@ export default {
     form: {
       type: Object,
       default: () => null
+    },
+    itemObj: {
+      type: Object,
+      default: null
     }
   },
   data() {
     return {
-      disabled: false,
       loading: false,
       // 左侧行ID
       cardId: null,

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

+export default {
+  layoutConfigData: [
+    {
+      title: '高级组件配置',
+      data: [
+        {
+          key: 'readOnly',
+          title: '只读',
+          component: {
+            name: 'el-checkbox'
+          }
+        }
+      ]
+    }
+  ],
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  computed: {
+
+  },
+  methods: {
+
+  }
+}
+

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

@@ -5,6 +5,7 @@
       class="input-with-select el-input--small"
       placeholder=""
       clearable
+      :disabled="itemObj.readOnly"
       style="width: 40%"
       @change="change"
     />
@@ -14,6 +15,7 @@
       class="input-with-select el-input--small"
       placeholder=""
       clearable
+      :disabled="itemObj.readOnly"
       style="width: 40%"
       @change="change"
     />
@@ -21,13 +23,19 @@
   </div>
 </template>
 <script>
+import config from './config'
 export default {
   name: 'ViscosityBox',
   componentName: '黏度框',
+  mixins: [config],
   props: {
     form: {
       type: Object,
       default: () => null
+    },
+    itemObj: {
+      type: Object,
+      default: null
     }
   },
   data() {

applications/dee-mes/src/views/taskExecution/components/TechnicalRequirements/components/Table2.vue

@@ -134,7 +134,7 @@ export default {
       }
       // eslint-disable-next-line no-undef
       const baseURl = `${VUE_APP_BASE_API || process.env.VUE_APP_BASE_API}`
-      const user = 27200113
+      const user = 'wcadmin'
       console.log(row.docsUrl + user)
       axios({
         method: 'get',