【nev-报表】业务整理标注更改+回收料调整单打印功能暂存

fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue

@@ -97,7 +97,7 @@ export default {
         {
           type: 'success',
           label: '完成',
-          hide: () => { return this.hideButton([1,2,4])},//待处理,部分完成
+          hide: () => { return this.hideButton([1,2,4])},//待处理，执行中，部分完成
           name: "close",
           size: 'mini'
         },

fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue

@@ -97,14 +97,14 @@ export default {
         {
           type: 'danger',
           label: '取消',
-          hide: () => { return this.hideButton([1,5,9])},//新增，执行中
+          hide: () => { return this.hideButton([1,5,9])},//新增，执行中，部分完成
           name: "cancel",
           size: 'mini'
         },
         {
           type: 'success',
           label: '完成',
-          hide: () => { return this.hideButton([1,5,9])},//部分完成
+          hide: () => { return this.hideButton([1,5,9])},//新增，执行中，部分完成
           name: "complete",
           size: 'mini'
         },

fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue

@@ -287,7 +287,7 @@ export default {
           icon: "el-icon-upload2",
           label: "导出",
           name: "export",
-          hide: () => { return this.hideButtonExport([1]) },
+          // hide: () => { return this.hideButtonExport([1]) },
           size: "mini",
         },
       ]

fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue

@@ -71,14 +71,14 @@ export default {
       ],
       // todo:打印单据更改
       DrawerButtonData: [
-        // {
-        //   type: 'info',
-        //   icon: 'el-icon-printer',
-        //   label: '打印',
-        //   hide: false,
-        //   name: "print",
-        //   size: 'mini'
-        // },
+        {
+          type: 'info',
+          icon: 'el-icon-printer',
+          label: '打印',
+          hide: false,
+          name: "print",
+          size: 'mini'
+        },
       ]
     };
   },
@@ -92,22 +92,19 @@ export default {
       if(val == 'print'){
         // 特殊字段处理
         // todo:打印单据更改
-        // let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        // _propsData.details.forEach(item=>{
-        //   item.recommendLot = item.recommendLot + " "
-        // })
-        // let _option = {
-        //   details:{
-        //     fromLocationCode:"recommendLocationCode",
-        //     qty:"handledQty",
-        //     uom:"recommendUom",
-        //     fromLot:"recommendLot",
-        //     toLocationErpCode:"locationErpCode",
-        //     fromLocationErpCode:"recommendLocationErpCode",
-        //   }
-        // }
-        // let data = initPrintAllData(_propsData,'tzd.rdlx','AdjustmentReason',_option);
-        let data = initPrintAllData(this.tableDataDetails,'tzd.rdlx','AdjustmentReason');
+        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
+        _propsData.details.forEach(item=>{
+          item.reasonStr = ""
+          item.recommendLot = item.recommendLot + " "
+        })
+        let _option = {
+          details:{
+            locationCode:"toLocationCode",
+            qty:"toQty",
+          }
+        }
+        let data = initPrintAllData(_propsData,'tzd.rdlx','AdjustmentReason',_option);
+        // let data = initPrintAllData(this.tableDataDetails,'tzd.rdlx','AdjustmentReason');
         this.Print(data)
       }
     },

fe/PC/src/views/padManage/isPadForTransferLibJob.vue

@@ -199,7 +199,7 @@ export default {
         { label: _Names.itemCode, prop: "itemCode"},
         { label: _Names.itemName, prop: "itemName" },
         { label: _Names.itemDesc1, prop: "itemDesc1" },
-        // { label: _Names.itemDesc2, prop: "itemDesc2" },
+        { label: _Names.itemDesc2, prop: "itemDesc2" },
         // { label: "请求数量", prop: 'requestQty' },
         // { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
         { label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -226,8 +226,8 @@ export default {
         // { label: "实际目标批次", prop: 'handledToLot' },
         // { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
         // { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
-        { label: "位置码", prop: 'positionCode' },
-        { label: "生产线", prop: 'prodLine' },
+        // { label: "位置码", prop: 'positionCode' },
+        // { label: "生产线", prop: 'prodLine' },
         { label: "任务状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
         // { label: "推荐类型", prop: 'recommendType' },
       ],

fe/PC/src/views/systemManage/pageLock.vue

@@ -85,7 +85,6 @@ export default {
     };
   },
   mounted() {
-    // todo:删除未测试
     this.paging();
   },
 };