From 0ade0f1b4902968bbab7adcc91116825061a2d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 28 Jun 2024 17:32:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E6=8A=A5=E8=A1=A8=E3=80=91?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=95=B4=E7=90=86=E6=A0=87=E6=B3=A8=E6=9B=B4?= =?UTF-8?q?=E6=94=B9+=E5=9B=9E=E6=94=B6=E6=96=99=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=8D=95=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ThirdLocationManage/ThirdLocationJob.vue | 2 +- .../ThirdLocationRequest.vue | 4 +- .../inventoryManage/Count/CountPlan-ms.vue | 2 +- .../recycledMaterials/materialsAdjustment.vue | 45 +++++++++---------- .../padManage/isPadForTransferLibJob.vue | 6 +-- fe/PC/src/views/systemManage/pageLock.vue | 1 - 6 files changed, 28 insertions(+), 32 deletions(-) diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue index 6ea22cba0..7e12e8c7b 100644 --- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue +++ b/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' }, diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue index d617cfd9f..bdbb14d39 100644 --- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue +++ b/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' }, diff --git a/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue b/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue index 9ed29a9dc..79f37dd49 100644 --- a/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue +++ b/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", }, ] diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue index 71e81bf2c..ca857cbb6 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue +++ b/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) } }, diff --git a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue b/fe/PC/src/views/padManage/isPadForTransferLibJob.vue index 57e50c32a..f26723ae2 100644 --- a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue +++ b/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' }, ], diff --git a/fe/PC/src/views/systemManage/pageLock.vue b/fe/PC/src/views/systemManage/pageLock.vue index 1ac530ee9..694218fad 100644 --- a/fe/PC/src/views/systemManage/pageLock.vue +++ b/fe/PC/src/views/systemManage/pageLock.vue @@ -85,7 +85,6 @@ export default { }; }, mounted() { - // todo:删除未测试 this.paging(); }, };