From c90c14a7d868525b08b4e74aa9fe7bf4b88ce200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 15 Jun 2023 16:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=94=9F=E4=BA=A7=E9=A2=86=E9=80=80?= =?UTF-8?q?=E6=96=99=EF=BC=8C=E6=89=93=E5=8D=B0=E6=B7=BB=E5=8A=A0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/version.json | 2 +- fe/PC/src/mixins/printMixin.js | 2 +- .../nonproductive/materialReturnRequest.vue | 34 +++++++++++++++++-- .../nonproductive/pickingRequest.vue | 34 +++++++++++++++++-- 4 files changed, 66 insertions(+), 6 deletions(-) diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index c783cd894..6d16616ad 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.26" + "version": "1.0.27" } \ No newline at end of file diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js index 44e91ba35..1ec0019f0 100644 --- a/fe/PC/src/mixins/printMixin.js +++ b/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) diff --git a/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue b/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue index 645ec13f4..19e6fe30c 100644 --- a/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue +++ b/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) } diff --git a/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue b/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue index a25b7f584..34e29cd02 100644 --- a/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue +++ b/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) }