验收入库bug修改

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

@@ -455,6 +455,9 @@ export default {
             }
           }
         },
+        // { title: '是否虚拟件', key: 'isVirtual', width: '100', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+        //   return cellValue ? '是' : '否'
+        // } },
         { title: '创建时间', key: 'createTime', headerAlign: 'center' }
       ],
       tableData: [],
@@ -840,6 +843,7 @@ export default {
         if (item.children) {
           item.children.forEach((child, j) => {
             child.parentIndex = item.parentIndex + '.' + (j + 1)
+            child.state = ''
           })
         }
       })

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

@@ -7,7 +7,7 @@
 <template>
   <div :key="refreshKey" class="purchasingwarehousing-process">
     <dee-as-com
-      :lay-config="{ typeName: 'InStoragePurchase', layKey: 'flowView_view' }"
+      :lay-config="topLayConfig"
       :basic-data="{ id: basicData.inventoryReqId }"
     />
     <div class="sub-title">
@@ -121,6 +121,9 @@ export default {
             }
           }
         },
+        // { title: '是否虚拟件', key: 'isVirtual', width: '100', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+        //   return cellValue ? '是' : '否'
+        // } },
         {
           title: '创建时间', key: 'createTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
             return row.createTime && row.createTime.split(' ')[0]
@@ -137,11 +140,22 @@ export default {
         pageSize: 20,
         total: 0,
         pageSizes: [10, 20, 50, 100]
-      }
+      },
+      topLayConfig: { typeName: 'InStoragePurchase', layKey: 'flowView_view' }
     }
   },
   computed: {},
   watch: {
+    'basicData.state': {
+      immediate: true,
+      handler(val) {
+        if (val === 'Apply') {
+          this.$set(this.topLayConfig, 'layKey', 'flowtable_edit')
+        } else {
+          this.$set(this.topLayConfig, 'layKey', 'flowView_view')
+        }
+      }
+    }
   },
   created() {
     // 初始化数据
@@ -240,6 +254,7 @@ export default {
         if (item.children) {
           item.children.forEach((child, j) => {
             child.parentIndex = item.parentIndex + '.' + (j + 1)
+            child.state = ''
           })
         }
       })

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

@@ -7,7 +7,7 @@
 <template>
   <div class="purchasingwarehousing-process">
     <dee-as-com
-      :lay-config="{ typeName: 'InStoragePurchase', layKey: 'flowView_view' }"
+      :lay-config="topLayConfig"
       :basic-data="{ id: basicData.inventoryReqId }"
     />
     <div class="sub-title">
@@ -25,7 +25,7 @@
       @pagination-size-change="changePageSize"
       @pagination-current-change="changePageNum"
     >
-      <dee-tools slot="header" :tools="tools" mode="normal" :collapse="false" /></dee-up-table>
+      <dee-tools v-if="basicData.state === 'In_Confirm'" slot="header" :tools="tools" mode="normal" :collapse="false" /></dee-up-table>
     <EditDrawer ref="editDrawer" :basic-data="basicData" />
     <!-- 打印标签 -->
     <PrintTag ref="print" :config="printConfig" />
@@ -47,6 +47,7 @@ export default {
     }
   },
   data() {
+    const _that = this
     return {
       tableData: [],
       optionsTree: {
@@ -77,10 +78,11 @@ export default {
       },
       selections: [],
       selectable: (row, index) => {
-        if (row.isRoot && row.state === 'In_Confirm') {
+        if (row.isRoot && row.state === 'In_Confirm' && _that.basicData.state === 'In_Confirm') {
           return true
         }
-      }
+      },
+      topLayConfig: { typeName: 'InStoragePurchase', layKey: 'flowView_view' }
 
     }
   },
@@ -223,6 +225,9 @@ export default {
             }
           }
         },
+        // { title: '是否虚拟件', key: 'isVirtual', width: '100', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+        //   return cellValue ? '是' : '否'
+        // } },
         {
           title: '创建时间', key: 'createTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
             return row.createTime && row.createTime.split(' ')[0]
@@ -237,6 +242,16 @@ export default {
     }
   },
   watch: {
+    'basicData.state': {
+      immediate: true,
+      handler(val) {
+        if (val === 'Apply') {
+          this.$set(this.topLayConfig, 'layKey', 'flowtable_edit')
+        } else {
+          this.$set(this.topLayConfig, 'layKey', 'flowView_view')
+        }
+      }
+    }
   },
   created() {
     // 初始化数据
@@ -374,6 +389,7 @@ export default {
         if (item.children) {
           item.children.forEach((child, j) => {
             child.parentIndex = item.parentIndex + '.' + (j + 1)
+            child.state = ''
             const targetInventory = this.$utils.getTargetJobResponses(child, 'JobResponseInEntry')
             if (targetInventory) {
               child.exWorkUnitName = targetInventory.extWorkUnit && targetInventory.extWorkUnit.extcode || ''