From 0cf4485f619a89d70cee7abff0fea03c1cf3d582 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, 28 May 2024 11:22:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev=E3=80=91=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/detailsTableColumns/index.js | 2 +- fe/PC/src/utils/summaryTableColumns/index.js | 2 +- .../recycledMaterials/materialsAdjustmentFunc.vue | 3 +-- fe/PC/src/views/padManage/isPadForTransferLibJob.vue | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index d97906387..e3733af58 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -260,7 +260,7 @@ export const InspectRequest = [ { label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, { label: "库位", prop: 'locationCode' }, { label: "ERP储位", prop: 'locationErpCode' }, - { label: "检验单号", prop: "number" }, + { label: "任务单号", prop: "number" }, // ----------------------------------------------------------------------- { label: "计量单位", prop: 'uom' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js index c0650c5ad..bb5351e08 100644 --- a/fe/PC/src/utils/summaryTableColumns/index.js +++ b/fe/PC/src/utils/summaryTableColumns/index.js @@ -16,7 +16,7 @@ export const InspectRequest = [ { label: "不合格数量", prop: 'failedQty' }, // ----------------------------------------------------------------------- { label: "检验人", prop: 'inspectUser' }, - { label: "检验单号", prop: "number" }, + { label: "任务单号", prop: "number" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, { label: "状态", prop: "summaryInspectStatus", type: "filter", filters: "summaryInspectStatus" }, diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue index a43dfa1a8..0a6b0b64a 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue @@ -438,7 +438,7 @@ export default { toProduceDate: _toData_new.produceDate || null, toExpireDate: _toData_new.expireDate || null, toLot: _toData_new.lot || null, - toStatus: 1, + toStatus: 2, toLocationCode: _toData.locationCode || null, toLocationArea: _toLocationInfo.areaCode || null, toLocationGroup: _toLocationInfo.locationGroupCode || null, @@ -493,7 +493,6 @@ export default { details:_details, recDetails:_recDetail } - itemTransformNewCreate(_finalData) .then(item=>{ this.Loading.appMainLoading = false diff --git a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue b/fe/PC/src/views/padManage/isPadForTransferLibJob.vue index 3f132df0d..080b89ae9 100644 --- a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue +++ b/fe/PC/src/views/padManage/isPadForTransferLibJob.vue @@ -56,10 +56,10 @@ 确 定 - + @@ -248,7 +248,7 @@ export default { }, // 当前行数据 currentRowData:null, - // 查看余额显隐 + // 查看库存余额显隐 showInventoryVisible:false, showInventoryLoading:false, inventoryTableData:[], @@ -395,7 +395,7 @@ export default { } }); }, - // 查看余额关闭 + // 查看库存余额关闭 inventoryCloseHandle(){ this.showInventoryVisible = false this.inventoryTableData = []