【nev-pc】打印修改暂存

fe/PC/src/mixins/printMixin.js

@@ -213,11 +213,12 @@ const printEnumOption = {
  * @param {*} enumOption 选填  转义状态 如果是字符串直接走[printEnumOption]格式，
  *            如果自定义格式：{reportStr:'报表中用到的值'，staName:'localStorage中的名称'，value:'要转义的detail中的值',label:"可不填，默认label"}
  * @param {*} options 选填  自定义特殊配置值 示例：{'number':'poNumber'} (number值将传为poNumber)
+ * @param {*} deptInfo 选填 是否需要获取部门相关信息  默认false
  * @param {*} url 选填  dataUrl
  * @returns 
  */
 // 
- export function initPrintAllData(propsData,name,enumOption,options,url){
+ export function initPrintAllData(propsData,name,enumOption,options,deptInfo,url){
     if(!propsData || propsData.details.length <= 0)return false
     let _printData = {details:[]}
     let _outData = {}
@@ -248,6 +249,14 @@ const printEnumOption = {
         let _item = Object.assign({},item, _outData);
         _printData.details.push(_item)
     });
+    // 部门相关信息获取
+    if(deptInfo && _printData.details[0] && _printData.details[0].creatorId && _printData.details[0].creatorId != 'null'){
+        // todo获取接口
+        _printData.details.forEach(item=>{
+            item.deptCode = '111'
+            item.deptName = '222'
+        })
+    }
     let data = {
         reportName: name,
         dataUrl: url || 'ccc',

fe/PC/src/utils/detailsTableColumns/index.js

@@ -978,7 +978,7 @@ export const ProductReceiptNote =  [
   { label: "库位代码", prop: 'locationCode' },
   { label: _Names.locationErpCode, prop:"locationErpCode" },
   { label: "生产时间", prop: "produceDate",type:"dateTime" },
-  { label: "缴库库位", prop: 'rawLocationCode' },
+  // { label: "缴库库位", prop: 'rawLocationCode' },
   { label: "返线数量", prop: "returnQty" },
   { label: "到货时间", prop: 'arriveDate',type:"dateTime" },
   { label: "过期时间", prop: "expireDate" ,type:"dateTime" },

fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue

@@ -96,7 +96,7 @@ export default {
         }
         // let _data = initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,_option);
         // todo:打印单据更改
-        let _data = initPrintAllData(this.tableDataDetails,'xbctl.rdlx',false,_option);
+        let _data = initPrintAllData(this.tableDataDetails,'xbctl.rdlx',false,_option,true);
         this.Print(_data)
       }
     },

fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue

@@ -143,12 +143,12 @@ export default {
               }
             })
           })
-          let data = initPrintAllData(this.tableDataDetails,'fsctl.rdlx');
+          let data = initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,false,true);
           this.Print(data)
         }).catch(err => {
           this.Loading.appMainLoading = false
           this.$message.error('物品信息配置获取失败');
-          let data = initPrintAllData(this.tableDataDetails,'fsctl.rdlx');
+          let data = initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,false,true);
           this.Print(data)
         })
       } else {

fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue

@@ -143,12 +143,12 @@ export default {
               }
             })
           })
-          let data = initPrintAllData(this.tableDataDetails,'fscll.rdlx');
+          let data = initPrintAllData(this.tableDataDetails,'fscll.rdlx',false,false,true);
           this.Print(data)
         }).catch(err => {
           this.Loading.appMainLoading = false
           this.$message.error('物品信息配置获取失败');
-          let data = initPrintAllData(this.tableDataDetails,'fscll.rdlx');
+          let data = initPrintAllData(this.tableDataDetails,'fscll.rdlx',false,false,true);
           this.Print(data)
         })
       } else {

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

@@ -89,7 +89,7 @@ export default {
     drawerbutton (val) {
       // 打印
       if(val == 'print'){
-        let data = initPrintAllData(this.tableDataDetails,'hslrkd.rdlx');
+        let data = initPrintAllData(this.tableDataDetails,'hslrkd.rdlx',false,false,true);
         this.Print(data)
       }
     },

fe/PC/src/views/kittingManage/KittingIssueNote.vue

@@ -105,7 +105,7 @@
           _propsData.details.forEach(item=>{
             item.handledToLot = item.handledToLot + " "
           })
-          let data = initPrintAllData(_propsData,'xbcll.rdlx');
+          let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
           this.Print(data)
         } else {
           this.drawerbutton(val, this)

fe/PC/src/views/materialIssueBP/IssueNoteBP.vue

@@ -105,7 +105,7 @@ export default {
         _propsData.details.forEach(item=>{
           item.handledToLot = item.handledToLot + " "
         })
-        let data = initPrintAllData(_propsData,'xbcll.rdlx');
+        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
         this.Print(data)
       } else {
         this.drawerbutton(val, this)

fe/PC/src/views/materialIssuePT/IssueNotePT.vue

@@ -105,7 +105,7 @@ export default {
         _propsData.details.forEach(item=>{
           item.handledToLot = item.handledToLot + " "
         })
-        let data = initPrintAllData(_propsData,'xbcll.rdlx');
+        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
         this.Print(data)
       } else {
         this.drawerbutton(val, this)

fe/PC/src/views/materialIssueZP/IssueNoteZP.vue

@@ -105,7 +105,7 @@ export default {
         _propsData.details.forEach(item=>{
           item.handledToLot = item.handledToLot + " "
         })
-        let data = initPrintAllData(_propsData,'xbcll.rdlx');
+        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
         this.Print(data)
       } else {
         this.drawerbutton(val, this)

fe/PC/src/views/materialIssueZS/IssueNoteZS.vue

@@ -105,7 +105,7 @@ export default {
         _propsData.details.forEach(item=>{
           item.handledToLot = item.handledToLot + " "
         })
-        let data = initPrintAllData(_propsData,'xbcll.rdlx');
+        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
         this.Print(data)
       } else {
         this.drawerbutton(val, this)

fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue

@@ -119,6 +119,8 @@ export default {
                 if(item.itemCode == item2.itemCode){
                   item2.supplierItemCode = item.supplierItemCode
                 }
+                // 时间转换格式为20240708
+                item2.arriveDate = item2.arriveDate.slice(0,10).replaceAll("-","")
               })
             })
           }
@@ -131,7 +133,7 @@ export default {
           })
           _printData.details = []
           for(let i in _sumArr){ _printData.details.push(_sumArr[i]) }
-          let data = initPrintAllData(_printData,'ysd.rdlx');
+          let data = initPrintAllData(_printData,'ysd.rdlx',false,false,true);
           this.Print(data).then(()=>{
             // 记录已打印接口，打印成功后刷新页面
             putawayPrintUpdateRemark(this.propsData.id)