采购入库bug修改

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

@@ -107,7 +107,7 @@ export default {
         { title: '含税单价', key: 'taxUnitPrice', align: 'center', headerAlign: 'center' },
         { title: '含税金额', key: 'taxPrice', align: 'center', headerAlign: 'center' },
         { title: '税率', key: 'taxRate', align: 'center', headerAlign: 'center' },
-        { title: '报检人', key: 'applyUserName', align: 'center', headerAlign: 'center' },
+        { title: '报检人', key: 'creator.userName', align: 'center', headerAlign: 'center' },
         {
           title: '接受仓库', key: 'extname', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
             const value = row.storageZone && typeof (row.storageZone) === 'object' ? row.storageZone.extname : row.storageZoneName

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

@@ -218,7 +218,7 @@ export default {
         { title: '含税单价', key: 'taxUnitPrice', align: 'center', headerAlign: 'center' },
         { title: '含税金额', key: 'taxPrice', align: 'center', headerAlign: 'center' },
         { title: '税率', key: 'taxRate', align: 'center', headerAlign: 'center' },
-        { title: '报检人', key: 'applyUserName', align: 'center', headerAlign: 'center' },
+        { title: '报检人', key: 'creator.userName', align: 'center', headerAlign: 'center' },
         {
           title: '接受仓库', key: 'extname', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
             const value = row.storageZone && typeof (row.storageZone) === 'object' ? row.storageZone.extname : row.storageZoneName
@@ -460,6 +460,7 @@ export default {
       // 获取需要打印的数据
       this.printConfig.prints = []
       let JobResponseInStorageEntryId = ''
+      let testResponse = {}
       this.selections.forEach((row) => {
         this.$message.closeAll()
         if (!row.exWorkUnitName) {
@@ -468,6 +469,7 @@ export default {
         }
         // 打印标签二维码扫描结果展示入库响应的id
         if (row.inventoryJobResponses && row.inventoryJobResponses.length) {
+          testResponse = row.inventoryJobResponses.find(el => el.subTypeName === 'JobResponseInTest') || {}
           const entryResponse = row.inventoryJobResponses.find(el => el.subTypeName === 'JobResponseInEntry' || el.subTypeName.includes('JobResponseOutStorage'))
           entryResponse && (JobResponseInStorageEntryId = entryResponse.id)
         }
@@ -486,6 +488,8 @@ export default {
             { label: '系列号/序列号', value: row.serialNo },
             { label: '机型', value: row.airModel },
             { label: '验收单号', value: testJobResponse && testJobResponse.testNo || '' },
+            { label: '保证保管期', value: testResponse.guaranteePeriod && testResponse.guaranteePeriod.replace(' 00:00:00', '') },
+            { label: '贮存期', value: testResponse.qualityPeriod && testResponse.qualityPeriod.replace(' 00:00:00', '') },
             { label: '库位号', value: row.exWorkUnitName || '' },
             { label: '备注', value: row.remark || '' }
           ]

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

@@ -365,8 +365,8 @@ export default {
       this.print()
     },
     printInStorageLabel(selection) {
-      if (selection[0].subTypeName === 'InStorageMatchBackItem' || selection[0].subTypeName === 'InStorageUseBackItem' || selection[0].subTypeName === 'InStorageOutBackItem') {
-        if (selection.find(item => ((!item.inventory || !item.inventory.workunit) && !item.extWorkUnitCods))) return this.$utils.showMessageWarning('请选择库位后打印！')
+      if (selection[0].subTypeName === 'InStorageMatchBackItem' || selection[0].subTypeName === 'InStorageUseBackItem' || selection[0].subTypeName === 'InStorageOutBackItem' || selection[0].subTypeName === 'InStoragePurchaseItem') {
+        if (selection.find(item => ((!item.inventory || !item.inventory.workunit) && !item.extWorkUnitCode))) return this.$utils.showMessageWarning('请选择库位后打印！')
       }
       // 获取需要打印的数据
       this.config.prints = []

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

@@ -115,9 +115,10 @@ export default {
 <style  lang='scss'>
 .warehouseApply{
   width: 100%;
-  height: calc(100% - 50px);
+  // height: calc(100% - 50px);
+  height: 100%;
   box-sizing: border-box;
-  padding:0 4px;
+  // padding:0 4px;
   .search-form-box-com .search-box-col{
     width: 100%!important;
   }