From 2793c8f2c109d485ec453cea7966ef268802c60b Mon Sep 17 00:00:00 2001 From: "juncheng.li" Date: Wed, 19 Jul 2023 10:14:55 +0800 Subject: [PATCH] =?UTF-8?q?worker=20=E8=B5=8B=E5=80=BC=E4=B8=BA=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E7=99=BB=E5=BD=95=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PDA/mycomponents/coms/task/comScanPutaway.vue | 2 +- fe/PDA/mycomponents/scan/comScanReplen.vue | 2 +- fe/PDA/pages/inventory/comTransfer.vue | 4 ++-- fe/PDA/pages/inventory/createTP.vue | 4 ++-- fe/PDA/pages/inventory/hold.vue | 6 +++--- fe/PDA/pages/inventory/merge.vue | 4 ++-- fe/PDA/pages/inventory/productionReturn_detail.vue | 2 +- fe/PDA/pages/inventory/scrap.vue | 4 ++-- fe/PDA/pages/inventory/transferIssue_detail.vue | 2 +- fe/PDA/pages/inventory/transferReceipt_detail.vue | 2 +- fe/PDA/pages/inventory/unissue.vue | 4 ++-- fe/PDA/pages/inventory/unpick.vue | 4 ++-- fe/PDA/pages/inventory/unreceipt.vue | 4 ++-- fe/PDA/pages/login/index.vue | 6 +++++- fe/PDA/pages/putaway/dyPutaway.vue | 2 +- fe/PDA/pages/putaway/purchasePutaway.vue | 2 +- fe/PDA/pages/putaway/putaway.vue | 2 +- fe/PDA/pages/putaway/rapReceipt.vue | 2 +- fe/PDA/pages/putaway/semiPutaway.vue | 2 +- fe/PDA/pages/return/returnToWarehouse.vue | 2 +- fe/PDA/pages/store/deliverFG.vue | 4 ++-- fe/PDA/pages/store/deliverRaw.vue | 4 ++-- fe/PDA/pages/store/deliverTF.vue | 4 ++-- fe/PDA/pages/store/issueDirect.vue | 2 +- fe/PDA/pages/store/receipt.vue | 4 ++-- fe/PDA/pages/store/recycle.vue | 6 +++--- fe/PDA/pages/store/tjReceipt.vue | 4 ++-- fe/PDA/pages/store/tjRecycle.vue | 6 +++--- fe/PDA/pages/task/Inspect_detail.vue | 2 +- fe/PDA/pages/task/Inspect_summary.vue | 2 +- fe/PDA/pages/task/countByItem.vue | 2 +- fe/PDA/pages/task/countByLocation.vue | 2 +- fe/PDA/pages/task/issue_detail.vue | 4 ++-- fe/PDA/pages/task/putaway_detail.vue | 2 +- fe/PDA/pages/task/receipt_result.vue | 2 +- fe/PDA/pages/task/replen.vue | 2 +- 36 files changed, 59 insertions(+), 55 deletions(-) diff --git a/fe/PDA/mycomponents/coms/task/comScanPutaway.vue b/fe/PDA/mycomponents/coms/task/comScanPutaway.vue index 906b268ba..a4c8015ad 100644 --- a/fe/PDA/mycomponents/coms/task/comScanPutaway.vue +++ b/fe/PDA/mycomponents/coms/task/comScanPutaway.vue @@ -253,7 +253,7 @@ }; r.qty.uom = r.basicUom, r.toLocationCode = that.locationCode; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN }) this.$emit('confirm', this.itemList, this.locationCode) } diff --git a/fe/PDA/mycomponents/scan/comScanReplen.vue b/fe/PDA/mycomponents/scan/comScanReplen.vue index 4defbfffa..849a6de14 100644 --- a/fe/PDA/mycomponents/scan/comScanReplen.vue +++ b/fe/PDA/mycomponents/scan/comScanReplen.vue @@ -264,7 +264,7 @@ }; r.qty.uom = r.basicUom, r.toLocationCode = that.locationCode; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN }) this.closeScanPopup(); this.$emit('confirm', this.prodLine, this.itemList) diff --git a/fe/PDA/pages/inventory/comTransfer.vue b/fe/PDA/pages/inventory/comTransfer.vue index b7e60c9ab..431616d9f 100644 --- a/fe/PDA/pages/inventory/comTransfer.vue +++ b/fe/PDA/pages/inventory/comTransfer.vue @@ -349,7 +349,7 @@ mask: true }); let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, jobNumber: "", supplierCode: "", @@ -363,7 +363,7 @@ r.toLocationCode = that.toLocationCode; r.toLocationErpCode = this.toLocationErpCode - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN item.details.push(r); }) diff --git a/fe/PDA/pages/inventory/createTP.vue b/fe/PDA/pages/inventory/createTP.vue index 5e1b7e029..a7cd2cc20 100644 --- a/fe/PDA/pages/inventory/createTP.vue +++ b/fe/PDA/pages/inventory/createTP.vue @@ -164,7 +164,7 @@ mask: true }); let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: "", jobNumber: "", supplierCode: "", @@ -175,7 +175,7 @@ that.itemList.forEach(r => { r.toContainerCode = that.toContainerCode; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN item.details.push(r); }) diff --git a/fe/PDA/pages/inventory/hold.vue b/fe/PDA/pages/inventory/hold.vue index 7998d1d22..01b2b93ee 100644 --- a/fe/PDA/pages/inventory/hold.vue +++ b/fe/PDA/pages/inventory/hold.vue @@ -248,7 +248,7 @@ mask: true }); let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, jobNumber: "", supplierCode: "", @@ -274,7 +274,7 @@ status: 2, locationCode: that.toLocationCode, reasonCode: '0', - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, } item.details.push(detail); }) @@ -301,7 +301,7 @@ }); let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, jobNumber: "", supplierCode: "", diff --git a/fe/PDA/pages/inventory/merge.vue b/fe/PDA/pages/inventory/merge.vue index a38a9a393..9e5b02e05 100644 --- a/fe/PDA/pages/inventory/merge.vue +++ b/fe/PDA/pages/inventory/merge.vue @@ -272,7 +272,7 @@ handleInventoryTransfer() { let that = this; let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: "", jobNumber: "", supplierCode: "", @@ -284,7 +284,7 @@ that.itemList.forEach(r => { r.toContainerCode = that.toContainerCode; r.containerCode = that.toContainerCode; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN item.details.push(r); }) let params = JSON.stringify(item); diff --git a/fe/PDA/pages/inventory/productionReturn_detail.vue b/fe/PDA/pages/inventory/productionReturn_detail.vue index 9a81f030f..1b176d042 100644 --- a/fe/PDA/pages/inventory/productionReturn_detail.vue +++ b/fe/PDA/pages/inventory/productionReturn_detail.vue @@ -336,7 +336,7 @@ r.handledBatch = r.recommendBatch; r.handledLot = r.recommendLot; r.handledLocationCode = r.recommendLocationCode; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN }); let params = JSON.stringify(this.dataContent); diff --git a/fe/PDA/pages/inventory/scrap.vue b/fe/PDA/pages/inventory/scrap.vue index a1ce753e0..c00fa6cb5 100644 --- a/fe/PDA/pages/inventory/scrap.vue +++ b/fe/PDA/pages/inventory/scrap.vue @@ -354,7 +354,7 @@ }); let that = this; let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, company: localStorage.company, jobNumber: "", @@ -367,7 +367,7 @@ that.itemList.forEach(r => { r.toLocationCode = that.toLocationCode r.toLocationErpCode = that.toLocationErpCode - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN r.reasonCode = this.scrapReason item.details.push(r); }) diff --git a/fe/PDA/pages/inventory/transferIssue_detail.vue b/fe/PDA/pages/inventory/transferIssue_detail.vue index 12c042319..fcb6c08b9 100644 --- a/fe/PDA/pages/inventory/transferIssue_detail.vue +++ b/fe/PDA/pages/inventory/transferIssue_detail.vue @@ -299,7 +299,7 @@ r.handledBatch = r.recommendBatch; r.handledLot = r.recommendLot; r.handledLocationCode = r.recommendLocationCode; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN }); let params = JSON.stringify(this.detail); diff --git a/fe/PDA/pages/inventory/transferReceipt_detail.vue b/fe/PDA/pages/inventory/transferReceipt_detail.vue index c2f09509a..3961620a1 100644 --- a/fe/PDA/pages/inventory/transferReceipt_detail.vue +++ b/fe/PDA/pages/inventory/transferReceipt_detail.vue @@ -293,7 +293,7 @@ r.handledBatch = r.recommendBatch; r.handledLot = r.recommendLot; r.handledLocationCode = r.recommendLocationCode; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN }); let params = JSON.stringify(this.detail); diff --git a/fe/PDA/pages/inventory/unissue.vue b/fe/PDA/pages/inventory/unissue.vue index babfdca98..d65f7aecd 100644 --- a/fe/PDA/pages/inventory/unissue.vue +++ b/fe/PDA/pages/inventory/unissue.vue @@ -242,7 +242,7 @@ mask: true }); let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, jobNumber: "", supplierCode: "", @@ -264,7 +264,7 @@ status: r.status, locationCode: r.locationCode, reasonCode: that.issueReason, - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, } item.details.push(detail); }) diff --git a/fe/PDA/pages/inventory/unpick.vue b/fe/PDA/pages/inventory/unpick.vue index 6c300e3bc..381b9558a 100644 --- a/fe/PDA/pages/inventory/unpick.vue +++ b/fe/PDA/pages/inventory/unpick.vue @@ -120,7 +120,7 @@ mask: true }); let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, jobNumber: "", supplierCode: "", @@ -131,7 +131,7 @@ items.forEach(r => { r.toContainerCode = ''; - r.worker = localStorage.userName; + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; item.details.push(r); }) diff --git a/fe/PDA/pages/inventory/unreceipt.vue b/fe/PDA/pages/inventory/unreceipt.vue index a08ce39e9..24b392c8f 100644 --- a/fe/PDA/pages/inventory/unreceipt.vue +++ b/fe/PDA/pages/inventory/unreceipt.vue @@ -206,7 +206,7 @@ }); let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN == "" ?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, jobNumber: "", supplierCode: "", @@ -231,7 +231,7 @@ locationCode: that.toLocationCode, reasonCode: that.receiptReason, inventoryStatus: 2, - worker: localStorage.userName + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN } item.details.push(detail); }) diff --git a/fe/PDA/pages/login/index.vue b/fe/PDA/pages/login/index.vue index 008b95a28..ea466c74a 100644 --- a/fe/PDA/pages/login/index.vue +++ b/fe/PDA/pages/login/index.vue @@ -187,7 +187,11 @@ localStorage.setItem('company', this.$companyCode); localStorage.setItem('warehouseCode', this.$warehouseCode); var decode = jwtDecode(localStorage.getItem('token_type')) - localStorage.setItem('userId', decode.sub); + if(decode){ + var userName_CN = decode['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname']; + localStorage.setItem('userId', decode.sub); + localStorage.setItem('userName_CN', userName_CN); + } }, clearStorage(res) { sessionStorage.setItem('isLogin', 0); //登录判断 diff --git a/fe/PDA/pages/putaway/dyPutaway.vue b/fe/PDA/pages/putaway/dyPutaway.vue index 8d41cbc64..38343edbd 100644 --- a/fe/PDA/pages/putaway/dyPutaway.vue +++ b/fe/PDA/pages/putaway/dyPutaway.vue @@ -127,7 +127,7 @@ mask: true }) let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, company: localStorage.company, warehouseCode: localStorage.warehouseCode, details: that.itemList diff --git a/fe/PDA/pages/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue index 1801d1d5d..6bef617a6 100644 --- a/fe/PDA/pages/putaway/purchasePutaway.vue +++ b/fe/PDA/pages/putaway/purchasePutaway.vue @@ -441,7 +441,7 @@ let item = { number: "", - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, jobNumber: "", details: [] } diff --git a/fe/PDA/pages/putaway/putaway.vue b/fe/PDA/pages/putaway/putaway.vue index 68cc54d2d..6773cbb91 100644 --- a/fe/PDA/pages/putaway/putaway.vue +++ b/fe/PDA/pages/putaway/putaway.vue @@ -126,7 +126,7 @@ mask: true }) let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, company: localStorage.company, warehouseCode: localStorage.warehouseCode, details: that.itemList diff --git a/fe/PDA/pages/putaway/rapReceipt.vue b/fe/PDA/pages/putaway/rapReceipt.vue index 987145128..dcb1148df 100644 --- a/fe/PDA/pages/putaway/rapReceipt.vue +++ b/fe/PDA/pages/putaway/rapReceipt.vue @@ -276,7 +276,7 @@ mask: true }) let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, // details: that.itemList }; that.itemList.forEach(r => { diff --git a/fe/PDA/pages/putaway/semiPutaway.vue b/fe/PDA/pages/putaway/semiPutaway.vue index ca5fad9c3..d27e3e127 100644 --- a/fe/PDA/pages/putaway/semiPutaway.vue +++ b/fe/PDA/pages/putaway/semiPutaway.vue @@ -393,7 +393,7 @@ let item = { number: "", - worker: localStorage.userName, + worker: localStorage.userName_CN, jobNumber: "", putawayType: 2, diff --git a/fe/PDA/pages/return/returnToWarehouse.vue b/fe/PDA/pages/return/returnToWarehouse.vue index f39c7e13d..67169541f 100644 --- a/fe/PDA/pages/return/returnToWarehouse.vue +++ b/fe/PDA/pages/return/returnToWarehouse.vue @@ -492,7 +492,7 @@ let that = this; let item = { number: "", - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, putawayType: 2, details: [] } diff --git a/fe/PDA/pages/store/deliverFG.vue b/fe/PDA/pages/store/deliverFG.vue index db8c32ac2..3bbb4080d 100644 --- a/fe/PDA/pages/store/deliverFG.vue +++ b/fe/PDA/pages/store/deliverFG.vue @@ -185,7 +185,7 @@ title: "提交中..." }); let deliverItem = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, Company: localStorage.company, company: localStorage.company, @@ -217,7 +217,7 @@ fromStatus: data.status, toStatus: data.status, - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, }; deliverItem.details[i] = detail; diff --git a/fe/PDA/pages/store/deliverRaw.vue b/fe/PDA/pages/store/deliverRaw.vue index 02542c36a..e2a77d46b 100644 --- a/fe/PDA/pages/store/deliverRaw.vue +++ b/fe/PDA/pages/store/deliverRaw.vue @@ -424,7 +424,7 @@ jobNumber: '', deliverPlanNumber: '', deliverRequestNumber: '', - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, details: [] } @@ -442,7 +442,7 @@ r.handledFromLocationErpCode = that.toLocation.erpLocationCode; r.handledQty =r.qty; r.recommendQty =r.handledQty; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN item.details.push(r); }) }) diff --git a/fe/PDA/pages/store/deliverTF.vue b/fe/PDA/pages/store/deliverTF.vue index f80a552d4..e90651d35 100644 --- a/fe/PDA/pages/store/deliverTF.vue +++ b/fe/PDA/pages/store/deliverTF.vue @@ -140,7 +140,7 @@ }); let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, jobNumber: "", supplierCode: "", @@ -162,7 +162,7 @@ r.toContainerCode = r.containerCode; r.fromWarehouseCode = r.warehouseCode; r.toWarehouseCode = that.location.warehouseCode; - r.worker = localStorage.userName; + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; item.details.push(r); }) diff --git a/fe/PDA/pages/store/issueDirect.vue b/fe/PDA/pages/store/issueDirect.vue index 37519c463..c6c42c059 100644 --- a/fe/PDA/pages/store/issueDirect.vue +++ b/fe/PDA/pages/store/issueDirect.vue @@ -454,7 +454,7 @@ let item = { company: localStorage.company, number: "", - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, jobNumber: "abc", useOnTheWayLocation: false, diff --git a/fe/PDA/pages/store/receipt.vue b/fe/PDA/pages/store/receipt.vue index 0c4a9693c..daf10315f 100644 --- a/fe/PDA/pages/store/receipt.vue +++ b/fe/PDA/pages/store/receipt.vue @@ -376,7 +376,7 @@ }); let receiptItem = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, number: "", productionPlanNumber: "", @@ -405,7 +405,7 @@ shift: r.shift, prodLine: r.prodLine, status: 2, - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, // bomVersion: r.bomVersion }; receiptItem.details[i] = detail; diff --git a/fe/PDA/pages/store/recycle.vue b/fe/PDA/pages/store/recycle.vue index dbcda56f1..4b52e024f 100644 --- a/fe/PDA/pages/store/recycle.vue +++ b/fe/PDA/pages/store/recycle.vue @@ -318,9 +318,9 @@ }); let receiptItem = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: "", - number: localStorage.userName, + number: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, productionPlanNumber: "", jobNumber: "", completeTime: new Date(), @@ -347,7 +347,7 @@ shift: r.shift, prodLine: r.prodLine, status: 2, - worker: localStorage.userName + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN // bomVersion: r.bomVersion }; receiptItem.details[i] = detail; diff --git a/fe/PDA/pages/store/tjReceipt.vue b/fe/PDA/pages/store/tjReceipt.vue index 7f7f351cc..cc3aa9c39 100644 --- a/fe/PDA/pages/store/tjReceipt.vue +++ b/fe/PDA/pages/store/tjReceipt.vue @@ -185,7 +185,7 @@ }) let receiptItem = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, number: "", productionPlanNumber: "", @@ -251,7 +251,7 @@ bomVersion: '', locationCode: this.prodLine.productLocation, rawLocation: this.prodLine.rawLocation, //线边 - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, status: 2 //默认赋值成合格 // locationCode: that.prodLine.value, // rawLocation: that.prodLine.value1, diff --git a/fe/PDA/pages/store/tjRecycle.vue b/fe/PDA/pages/store/tjRecycle.vue index b19cc324a..f107f79c1 100644 --- a/fe/PDA/pages/store/tjRecycle.vue +++ b/fe/PDA/pages/store/tjRecycle.vue @@ -298,9 +298,9 @@ }); let receiptItem = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, warehouseCode: localStorage.warehouseCode, - number: localStorage.userName, + number: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, productionPlanNumber: "", jobNumber: "", completeTime: new Date(), @@ -326,7 +326,7 @@ rawLocation: r.rawLocation, shift: r.shift, prodLine: r.prodLine, - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, // bomVersion: r.bomVersion }; receiptItem.details[i] = detail; diff --git a/fe/PDA/pages/task/Inspect_detail.vue b/fe/PDA/pages/task/Inspect_detail.vue index 0abae84ab..bb0ce9877 100644 --- a/fe/PDA/pages/task/Inspect_detail.vue +++ b/fe/PDA/pages/task/Inspect_detail.vue @@ -375,7 +375,7 @@ r.notPassedQty = r.failedQty; } r.nextAction = that.summaryDetail.nextAction; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN }); let params = JSON.stringify(that.datacontent); diff --git a/fe/PDA/pages/task/Inspect_summary.vue b/fe/PDA/pages/task/Inspect_summary.vue index c7b931353..29b364b57 100644 --- a/fe/PDA/pages/task/Inspect_summary.vue +++ b/fe/PDA/pages/task/Inspect_summary.vue @@ -547,7 +547,7 @@ r.notPassedQty = that.nextStep === "整批不合格" ? r.receiveQty.qty : 0; //最终不合格数量; r.nextAction = that.summaryDetail.nextAction; // sumGoodQty = sumGoodQty + r.receiveQty.qty; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN }); // that.summaryDetail.goodQty = sumGoodQty; diff --git a/fe/PDA/pages/task/countByItem.vue b/fe/PDA/pages/task/countByItem.vue index faddf9d25..8c3c99740 100644 --- a/fe/PDA/pages/task/countByItem.vue +++ b/fe/PDA/pages/task/countByItem.vue @@ -207,7 +207,7 @@ "partCondition": itemList, "locCondition": lList, "statusList": sList, - "worker": localStorage.userName, + "worker": localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, "warehouseCode": localStorage.warehouseCode, } diff --git a/fe/PDA/pages/task/countByLocation.vue b/fe/PDA/pages/task/countByLocation.vue index e532fc0dd..7237ef685 100644 --- a/fe/PDA/pages/task/countByLocation.vue +++ b/fe/PDA/pages/task/countByLocation.vue @@ -224,7 +224,7 @@ "partCondition": iList, "locCondition": lList, "statusList": sList, - "worker": localStorage.userName, + "worker": localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, "warehouseCode": localStorage.warehouseCode, } diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue index 67b585e12..c905b927c 100644 --- a/fe/PDA/pages/task/issue_detail.vue +++ b/fe/PDA/pages/task/issue_detail.vue @@ -527,7 +527,7 @@ item.scanPackingCode = this.currentScanLebel.data.code; item.scanLot = this.currentScanLebel.data.lot; - item.worker = localStorage.userName; + item.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; item.uom = balanceItem.uom; this.details.sort(compareDesc('scanDate')); //按扫描信息排 @@ -623,7 +623,7 @@ title: "提交中...", mask: true }); - that.datacontent.worker = localStorage.userName; + that.datacontent.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; that.datacontent.details = that.details; let params = JSON.stringify(that.datacontent); finshIssueJob(that.id, params) diff --git a/fe/PDA/pages/task/putaway_detail.vue b/fe/PDA/pages/task/putaway_detail.vue index a7e8acc88..324259e7c 100644 --- a/fe/PDA/pages/task/putaway_detail.vue +++ b/fe/PDA/pages/task/putaway_detail.vue @@ -328,7 +328,7 @@ r.handledBatch = r.recommendBatch; r.handledLot = r.recommendLot; r.handledQty = r.recommendQty; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN }); let params = JSON.stringify(that.datacontent); console.log(params); diff --git a/fe/PDA/pages/task/receipt_result.vue b/fe/PDA/pages/task/receipt_result.vue index f87e77110..003d9aa9d 100644 --- a/fe/PDA/pages/task/receipt_result.vue +++ b/fe/PDA/pages/task/receipt_result.vue @@ -204,7 +204,7 @@ //赋值 that.receiptJob.details.forEach(r => { r.handledToLocationCode = r.recommendToLocationCode; - r.worker = localStorage.userName + r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN if (r.purchaseReceiptInspectStatus == 1) { r.handledArriveDate = new Date(); // r.purchaseReceiptInspectStatus = 4; //未收货 diff --git a/fe/PDA/pages/task/replen.vue b/fe/PDA/pages/task/replen.vue index 4bdd69456..9f59b9139 100644 --- a/fe/PDA/pages/task/replen.vue +++ b/fe/PDA/pages/task/replen.vue @@ -118,7 +118,7 @@ mask: true }) let item = { - worker: localStorage.userName, + worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, company: localStorage.company, details: that.itemList };