验收入库确认打印标签修改

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

@@ -128,7 +128,7 @@ export default {
           let JobResponseInStorageEntryId = ''
           // 打印标签二维码扫描结果展示入库响应的id
           if (row.inventoryJobResponses && row.inventoryJobResponses.length) {
-            const entryResponse = row.inventoryJobResponses.find(el => el.subTypeName === 'JobResponseInEntry' || el.subTypeName.includes('JobResponseOutStorage'))
+            const entryResponse = row.inventoryJobResponses.find(el => el.subTypeName === 'JobResponseInEntry')
             entryResponse && (JobResponseInStorageEntryId = entryResponse.id)
           }
           this.config.prints.push({
@@ -141,8 +141,8 @@ export default {
               { label: '批号', value: row.lotNo },
               { label: '系列号/序列号', value: row.serialNo },
               { label: '机型', value: row.airModel },
-              { label: '验收单号', value: row.inventory && row.inventory.testNo },
-              { label: '库位号', value: row.inventory && row.inventory.workunit || '' },
+              { label: '验收单号', value: row.inventory && row.inventory.testNo || row.testNo || '' },
+              { label: '库位号', value: row.inventory && row.inventory.workunit || row.extWorkUnitCode || '' },
               { label: '备注', value: row.remark || '' }
             ]
           })

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

@@ -11,19 +11,15 @@
       :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: { PrintTag },
+  components: {},
   props: {
     selectData: {
       type: Object,
@@ -32,13 +28,7 @@ export default {
   },
   data() {
     return {
-      selectionRows: [],
-      // 打印标签
-      printConfig: {
-        visible: false,
-        width: 300,
-        prints: []
-      }
+      selectionRows: []
     }
   },
   computed: {},
@@ -49,41 +39,6 @@ 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()
     }
   }
 }