From afbba5a969506f674aed3b95216703242ade91b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 1 Jul 2024 17:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E6=B3=A8=E5=A1=91?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E5=96=B7=E6=B6=82=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=81=E8=A3=85=E9=85=8D=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=A4=87?= =?UTF-8?q?=E5=93=81=E8=AE=B0=E5=BD=95=EF=BC=8Ckitting=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/mixins/printMixin.js | 12 ++++---- .../views/kittingManage/KittingIssueNote.vue | 29 ++++++++++++++++++- .../src/views/materialIssueBP/IssueNoteBP.vue | 29 ++++++++++++++++++- .../src/views/materialIssuePT/IssueNotePT.vue | 29 ++++++++++++++++++- .../src/views/materialIssueZP/IssueNoteZP.vue | 29 ++++++++++++++++++- .../src/views/materialIssueZS/IssueNoteZS.vue | 29 ++++++++++++++++++- 6 files changed, 147 insertions(+), 10 deletions(-) diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js index 1858ec056..70ede38c3 100644 --- a/fe/PC/src/mixins/printMixin.js +++ b/fe/PC/src/mixins/printMixin.js @@ -302,14 +302,16 @@ const printEnumOption = { // ERP料号:itemCode; 物品名称:itemName; 储位:locationCode; 数量:adjustQty; 原因说明:reasonStr; 参考单据:requestNumber; // xbcll.rdlx 使用参数 -// 使用位置:?自动发料任务 (automaticCallJob-msQuery.vue) | 自动发料记录 (automaticCallNote.vue) -// 使用位置:人工发料任务 (IssueJob.vue) | 人工发料记录 (IssueNote.vue) +// 使用位置:注塑记录、喷涂记录、装配记录，备品记录，kitting记录 // 单号:number; 制表日:creationTime; 部门名称:deptName; -// ERP料号:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; -// 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode; +// 物料描述:itemDesc1; 料号:itemCode; 零件号:itemDesc2; 库位:handledToLocationCode; +// 实际调拨量:handledToQty; 批次:handledToLot; 调入储位:handledToLocationErpCode; 调出储位:handledFromLocationErpCode; -// xbctl.rdlx 使用参数 xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同，除了领/退字段 +// xbctl.rdlx 使用参数 // 使用位置:生产退库记录 (productionReturn => returnNote.vue productionReturnNote) +// 单号:number; 制表日:creationTime; 部门名称:deptName; +// ERP料号:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; +// 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode; // zjfl.rdlx 使用参数 // 使用位置:直接发料记录 (directIssueNote.vue) diff --git a/fe/PC/src/views/kittingManage/KittingIssueNote.vue b/fe/PC/src/views/kittingManage/KittingIssueNote.vue index a4bd64108..b1d66673d 100644 --- a/fe/PC/src/views/kittingManage/KittingIssueNote.vue +++ b/fe/PC/src/views/kittingManage/KittingIssueNote.vue @@ -43,7 +43,8 @@ :drawer="displayDialog.detailsDialog" :propsData="propsData" :tabsDesTions="tabsDesTions" - :Butttondata="[]" + :Butttondata="DrawerButtonData" + @drawerbutton="drawerbuttonHanlde" @drawerShut="(val) => (displayDialog.detailsDialog = val)" @handleCommand="drawerHandle" @close-value="closeValue" @@ -61,6 +62,7 @@ import { drawerMixins } from "@/mixins/drawerMixins"; import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"; import { mixins } from "@/mixins/mixins"; + import { initPrintAllData } from "@/mixins/printMixin" export default { name: "KittingIssueNote", mixins: [ @@ -80,11 +82,36 @@ this.defaultFreshBtn(),//刷新 this.defaultFilterBtn(),//筛选 ], + DrawerButtonData: [ + { + type: 'info', + icon: 'el-icon-printer', + label: '打印', + hide: false, + name: "print", + size: 'mini' + }, + ], }; }, mounted() { this.paging(); }, + methods: { + drawerbuttonHanlde (val) { + // 打印 + if(val == 'print'){ + let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) + _propsData.details.forEach(item=>{ + item.handledToLot = item.handledToLot + " " + }) + let data = initPrintAllData(_propsData,'xbcll.rdlx'); + this.Print(data) + } else { + this.drawerbutton(val, this) + } + }, + } };