批量签审——验收入库确认

applications/dee-mes/src/privateComponents/components/WarehousingConfirmationConfirm/component/warehouseSelect.vue

@@ -7,7 +7,7 @@
 <template>
   <div class="warehouse-select">
     <el-select
-      v-if="basicData"
+      v-if="basicData||scope.row.jobOrder&&scope.row.jobOrder.storageZoneId"
       v-model="selectVal"
       :loading="tableColumnSelect"
       size="small"
@@ -54,15 +54,20 @@ export default {
       immediate: true,
       deep: true,
       handler: function(val) {
-        this.storageZoneId = val.storageZoneId
+        val && (this.storageZoneId = val.storageZoneId)
       }
     },
     'scope.row': {
       immediate: true,
       deep: true,
       handler: function(val) {
-        if (val.inventoryJobResponses[0].extWorkUnit) {
+        if (val.inventoryJobResponses && val.inventoryJobResponses[0].extWorkUnit) {
           this.selectVal = val.inventoryJobResponses[0].extWorkUnit.extcode
+        } else if (val.extWorkUnit && val.extWorkUnit.extcode) {
+          this.selectVal = val.extWorkUnit.extcode
+        }
+        if (!this.basicData && val.jobOrder.storageZoneId) {
+          this.storageZoneId = val.jobOrder.storageZoneId
         }
       }
     }
@@ -125,6 +130,25 @@ export default {
     save(v) {
       if (!this.selectVal) this.$utils.showMessageWarning('请选择库位')
       this.$emit('save', this.selectVal)
+      // 适配验收入库确认批量签审
+      if (this.scope.row.subTypeName === 'JobResponseInEntry') {
+        const resValue = this.selectVal.split('+')[0]
+        this.$emit('input', resValue)
+        this.saveExtWorkUnit(resValue)
+      }
+    },
+    saveExtWorkUnit(resValue) {
+      if (!resValue) return this.$utils.showMessageWarning('请选择库位')
+      const params = {
+        id: this.scope.row.id,
+        operator: 'MODIFY',
+        extWorkUnitId: resValue,
+        extWorkUnitIdType: 'ExtDxProductWorkUnit'
+      }
+      this.$api.recursion('JobResponseInStorage', params).then(res => {
+        this.$utils.showMessageSuccess('保存成功')
+        this.$bus.$emit('reloadModuleList')
+      })
     }
   }
 }

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/index.vue

@@ -39,8 +39,10 @@ export default {
   },
   created() {
     this.$bus.$on('reloadModuleList', (hasFlag) => {
+      this.$nextTick(() => {
         this.$refs.moduleTaskList.loadData(hasFlag)
       })
+    })
   },
   destroyed() {
   },

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/taskList.vue

 <template>
   <div class="MyPlanTaskPage">
     <div class="TaskComponentView" :class="{'height_class':heightClass}">
-      <compnent :is="selectData.router" :select-data="selectData" :sub-type="subType" :def-state="state" />
+      <compnent :is="selectData.router" :key="componentKey" :select-data="selectData" :sub-type="subType" :def-state="state" />
     </div>
   </div>
 </template>
@@ -28,10 +28,18 @@ export default {
       subType: '计划',
       state: '',
       loadComponents: true,
-      heightClass: false
+      heightClass: false,
+      componentKey: 0
     }
   },
   watch: {
+    selectData: {
+      immediate: true,
+      deep: true,
+      handler() {
+        this.componentKey += 1
+      }
+    }
   },
   created() {
   },

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/warehouseConfirm/index.vue

@@ -11,14 +11,19 @@
       :basic-data=" { selectData,selectionRows }"
       :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'batchSign_warehouseConfirm'}"
       @selectionChange="selectionChange"
+      @tableToolHandler="tableToolHandler"
     />
+    <!-- 打印标签 -->
+    <PrintTag ref="print" :config="printConfig" />
   </div>
+
 </template>
 
 <script>
+import PrintTag from '@/../../dee-mes/src/privateComponents/components/WarehousingConfirmationConfirm/component/PrintTag.vue'
 export default {
   name: 'WarehouseConfirm',
-  components: {},
+  components: { PrintTag },
   props: {
     selectData: {
       type: Object,
@@ -27,7 +32,13 @@ export default {
   },
   data() {
     return {
-      selectionRows: []
+      selectionRows: [],
+      // 打印标签
+      printConfig: {
+        visible: false,
+        width: 300,
+        prints: []
+      }
     }
   },
   computed: {},
@@ -38,6 +49,41 @@ export default {
   methods: {
     selectionChange(val) {
       this.selectionRows = val
+    },
+    tableToolHandler(val) {
+      if (val.key.btnValue === 'print') {
+        this.print()
+      }
+    },
+    print() {
+      // 获取需要打印的数据
+      this.printConfig.prints = []
+      let JobResponseInStorageEntryId = ''
+      this.selectionRows.forEach((row) => {
+        this.$message.closeAll()
+        JobResponseInStorageEntryId = row.extWorkUnit.extcode
+        this.printConfig = Object.assign({}, this.printConfig, {
+          visible: true
+        })
+        this.printConfig.prints.push({
+          text: JobResponseInStorageEntryId,
+          propertys: [
+            { label: '编码', value: row.jobOrder.extMaterial.resCode },
+            { label: '名称', value: row.jobOrder.extMaterial.resName },
+            { label: '型号/牌号/件号', value: row.jobOrder.extMaterial.modelNo },
+            { label: '规格', value: row.jobOrder.extMaterial.spec },
+            { label: '批号', value: row.jobOrder.lotNo },
+            { label: '系列号/序列号', value: row.jobOrder.serialNo },
+            { label: '机型', value: row.jobOrder.airModel },
+            { label: '验收单号', value: row.testNo },
+            { label: '库位号', value: row.extWorkUnit.extcode || '' },
+            { label: '备注', value: row.jobOrder.remark || '' }
+          ]
+        })
+      })
+
+      // 打印操作
+      this.$refs.print.print()
     }
   }
 }