非生产领退料，打印添加配置字段

fe/PC/public/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "1.0.26"
+    "version": "1.0.27"
 }

fe/PC/src/mixins/printMixin.js

@@ -276,7 +276,7 @@ const printEnumOption = {
 // 使用位置:非生产领料申请 (pickingRequest.vue - fscll.rdlx) 
 // 使用位置:非生产退料申请 (materialReturnRequest.vue - fsctl.rdlx) 
 // 单号:number; 参考单据：？; 制表日:creationTime; 部门代码:deptCode; 部门名称:deptName; 项目分类名称:projCapacityName; 专案代码:caseCode; 说明:remark
-// 料品编号:itemCode; 品名:itemName; 单位:uom; 预计量:preQty; 实际量:qty; 储位:locationCode;
+// 料品编号:itemCode; 品名:itemName; 单位:uom; 预计量:preQty; 实际量:qty; 储位:locationCode; 配置:configuration
 
 // cwdbd.rdlx  使用参数
 // 使用位置:储位调拨记录 (interStorageAllocationNote.vue) 

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

@@ -62,6 +62,8 @@ import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import { initPrintAllData } from "@/mixins/printMixin"
+import { getPageList } from '@/api/wms-api'
+
 export default {
   name: "materialReturnRequest",
   mixins: [
@@ -119,8 +121,36 @@ export default {
     drawerbutton (val) {
       // 打印
       if(val == 'print'){
-        let data = initPrintAllData(this.propsData,'fsctl.rdlx');
-        this.Print(data)
+        // 获取物品信息的配置
+        this.PageListParams.SkipCount = 0
+        this.PageListParams.MaxResultCount= 1000
+        this.PageListParams.condition = {filters: []}
+        this.propsData.details.forEach(item=>{
+          this.PageListParams.condition.filters.push({
+            action: '==',
+            column: 'code',
+            logic: "Or",
+            value: item.itemCode,
+          })
+        })
+        this.Loading.appMainLoading = true
+        getPageList(this.PageListParams, 'basedata/item-basic').then(res => {
+          this.Loading.appMainLoading = false
+          res.items.forEach(res_item=>{
+            this.propsData.details.forEach(detail=>{
+              if(detail.itemCode == res_item.code){
+                detail.configuration = res_item.configuration
+              }
+            })
+          })
+          let data = initPrintAllData(this.propsData,'fsctl.rdlx');
+          this.Print(data)
+        }).catch(err => {
+          this.Loading.appMainLoading = false
+          this.$message.error('物品信息配置获取失败');
+          let data = initPrintAllData(this.propsData,'fsctl.rdlx');
+          this.Print(data)
+        })
       } else {
         drawerMixins.methods.drawerbutton(val, this)
       }

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

@@ -62,6 +62,8 @@ import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import { initPrintAllData } from '@/mixins/printMixin'
+import { getPageList } from '@/api/wms-api'
+
 export default {
   name: "pickingRequest",
   mixins: [
@@ -119,8 +121,36 @@ export default {
     drawerbutton (val) {
       // 打印
       if(val == 'print'){
-        let data = initPrintAllData(this.propsData,'fscll.rdlx');
-        this.Print(data)
+        // 获取物品信息的配置
+        this.PageListParams.SkipCount = 0
+        this.PageListParams.MaxResultCount= 1000
+        this.PageListParams.condition = {filters: []}
+        this.propsData.details.forEach(item=>{
+          this.PageListParams.condition.filters.push({
+            action: '==',
+            column: 'code',
+            logic: "Or",
+            value: item.itemCode,
+          })
+        })
+        this.Loading.appMainLoading = true
+        getPageList(this.PageListParams, 'basedata/item-basic').then(res => {
+          this.Loading.appMainLoading = false
+          res.items.forEach(res_item=>{
+            this.propsData.details.forEach(detail=>{
+              if(detail.itemCode == res_item.code){
+                detail.configuration = res_item.configuration
+              }
+            })
+          })
+          let data = initPrintAllData(this.propsData,'fscll.rdlx');
+          this.Print(data)
+        }).catch(err => {
+          this.Loading.appMainLoading = false
+          this.$message.error('物品信息配置获取失败');
+          let data = initPrintAllData(this.propsData,'fscll.rdlx');
+          this.Print(data)
+        })
       } else {
         drawerMixins.methods.drawerbutton(val, this)
       }