From da9a35e66b31de7fea564658c6d5b4a373116326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 11 Jun 2024 17:31:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91pad=E9=80=80=E5=87=BA?= =?UTF-8?q?=E8=81=94=E8=B0=83+=E4=B8=8D=E5=90=88=E6=A0=BC=E8=BD=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9+=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/detailsTableColumns/index.js | 32 +++++++++---------- .../views/padManage/isPadForKittingPack.vue | 7 ++-- .../quality/unqualifiedToQualified.vue | 12 +++---- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 997cfe865..d5bd1bf5d 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -2694,15 +2694,15 @@ export const IssueRequestZS = [ { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, - { label: "请求数", prop: 'qty' }, + { label: "请求数/箱", prop: 'qty' }, { label: "已发数", prop: "receivedQty" }, - { label: "未生成任务数", prop: "notFinishQty" }, - { label: "请求箱数量", prop: "boxQty" }, + { label: "未生成任务数/箱", prop: "notFinishQty" }, { label: "目标库位", prop: 'toLocationCode' }, { label: "位置码", prop: 'positionCode' }, { label: "生产线", prop: 'prodLine' }, // { label: "单位", prop: "uom" }, // { label: "数量", prop: "qty" }, + // { label: "请求箱数量", prop: "boxQty" }, // { label: "申请数量", prop: 'issuedQty' }, // { label: "已收数量", prop: 'receivedQty' }, // { label: "已发未收", prop: "toBeReceivedQty" }, @@ -2727,6 +2727,7 @@ export const IssueJobZS = [ { label: "请求库位代码", prop: 'requestLocationCode' }, { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, { label: "请求数量", prop: 'requestQty' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, { label: "实际目标批次", prop: 'handledToLot' }, @@ -2739,7 +2740,6 @@ export const IssueJobZS = [ // { label: "在途库位", prop: 'onTheWayLocationCode' }, // { label: "推荐来源数量", prop: 'recommendFromQty' }, // { label: "推荐目标数量", prop: 'recommendToQty' }, - // { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, // { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, // { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, // { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, @@ -2902,10 +2902,9 @@ export const IssueRequestPT = [ { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, - { label: "请求数", prop: 'qty' }, + { label: "请求数/箱", prop: 'qty' }, { label: "已发数", prop: "receivedQty" }, - { label: "未生成任务数", prop: "notFinishQty" }, - { label: "请求箱数量", prop: "boxQty" }, + { label: "未生成任务数/箱", prop: "notFinishQty" }, { label: "目标库位", prop: 'toLocationCode' }, { label: "位置码", prop: 'positionCode' }, { label: "生产线", prop: 'prodLine' }, @@ -2921,6 +2920,7 @@ export const IssueJobPT = [ { label: "请求库位代码", prop: 'requestLocationCode' }, { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, { label: "请求数量", prop: 'requestQty' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, { label: "实际目标批次", prop: 'handledToLot' }, @@ -2954,10 +2954,9 @@ export const IssueRequestZP = [ { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, - { label: "请求数", prop: 'qty' }, + { label: "请求数/箱", prop: 'qty' }, { label: "已发数", prop: "receivedQty" }, - { label: "未生成任务数", prop: "notFinishQty" }, - { label: "请求箱数量", prop: "boxQty" }, + { label: "未生成任务数/箱", prop: "notFinishQty" }, { label: "目标库位", prop: 'toLocationCode' }, { label: "位置码", prop: 'positionCode' }, { label: "生产线", prop: 'prodLine' }, @@ -2973,6 +2972,7 @@ export const IssueJobZP = [ { label: "请求库位代码", prop: 'requestLocationCode' }, { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, { label: "请求数量", prop: 'requestQty' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, { label: "实际目标批次", prop: 'handledToLot' }, @@ -3006,10 +3006,9 @@ export const IssueRequestBP = [ { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, - { label: "请求数", prop: 'qty' }, + { label: "请求数/箱", prop: 'qty' }, { label: "已发数", prop: "receivedQty" }, - { label: "未生成任务数", prop: "notFinishQty" }, - { label: "请求箱数量", prop: "boxQty" }, + { label: "未生成任务数/箱", prop: "notFinishQty" }, { label: "目标库位", prop: 'toLocationCode' }, { label: "位置码", prop: 'positionCode' }, { label: "生产线", prop: 'prodLine' }, @@ -3025,6 +3024,7 @@ export const IssueJobBP = [ { label: "请求库位代码", prop: 'requestLocationCode' }, { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, { label: "请求数量", prop: 'requestQty' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, { label: "实际目标批次", prop: 'handledToLot' }, @@ -3058,10 +3058,9 @@ export const KittingIssueRequest = [ { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, - { label: "请求数", prop: 'qty' }, + { label: "请求数/箱", prop: 'qty' }, { label: "已发数", prop: "receivedQty" }, - { label: "未生成任务数", prop: "notFinishQty" }, - { label: "请求箱数量", prop: "boxQty" }, + { label: "未生成任务数/箱", prop: "notFinishQty" }, { label: "目标库位", prop: 'toLocationCode' }, { label: "位置码", prop: 'positionCode' }, { label: "生产线", prop: 'prodLine' }, @@ -3077,6 +3076,7 @@ export const KittingIssueJob = [ { label: "请求库位代码", prop: 'requestLocationCode' }, { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, { label: "请求数量", prop: 'requestQty' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, { label: "实际目标批次", prop: 'handledToLot' }, diff --git a/fe/PC/src/views/padManage/isPadForKittingPack.vue b/fe/PC/src/views/padManage/isPadForKittingPack.vue index 5ba3cb928..4c63b925e 100644 --- a/fe/PC/src/views/padManage/isPadForKittingPack.vue +++ b/fe/PC/src/views/padManage/isPadForKittingPack.vue @@ -265,9 +265,10 @@ export default { if(_https == _currentUserLockList.items.length){ this.loading = false; this.currentKittingInfo = null; - this.$nextTick(()=>{ - this.initData() - }) + // 账号已释放并退出登录，跳转登录页 + await this.$store.dispatch("user/logout"); + this.$router.push(`/loginPad?redirect=${this.$route.fullPath}`); + window.android.takePhoto(); } }, // 退出登录http交互 diff --git a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue index a1dd51744..15b7fbc34 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue @@ -148,20 +148,20 @@ export default { // status 3 // tenantId null this.selectionData.forEach(item => { - // 20230407 - item.stdPackQty = 0 + // 20240611 + item.stdPackQty = item.stdPackQty item.fromPackingCode = item.packingCode item.toPackingCode = item.packingCode item.fromLot = item.lot item.toLot = item.lot item.fromLocationCode = item.locationCode - item.toLocationCode = item.locationCode + item.toLocationCode = 'INSPECT' item.fromLocationGroup = item.locationGroup - item.toLocationGroup = item.locationGroup + item.toLocationGroup = 'INSPECT' item.fromLocationArea = item.locationArea - item.toLocationArea = item.locationArea + item.toLocationArea = 'INSPECT' item.fromLocationErpCode = item.locationErpCode - item.toLocationErpCode = item.locationErpCode + item.toLocationErpCode = 'INSPECT' item.fromWarehouseCode = item.warehouseCode item.toWarehouseCode = item.warehouseCode item.fromStatus = 3