From bb0bd5c333b84836d64d374c65322d93b6ff4810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Mon, 26 May 2025 19:45:48 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=97=A0?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../materialBoxStockedQuery/index.vue | 1 + src/views/Query/StockQuery/UnDoInfo/index.vue | 4 ++- .../label/printingOfWithoutSource/index.vue | 36 +++++++++---------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue b/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue index 9af24f5..4e956ea 100644 --- a/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue +++ b/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue @@ -444,6 +444,7 @@ { header: "货位编码", field: "LOCATIONNAME", hide: false }, { header: "货位名称", field: "LOCATIONNAMEDESC", hide: false }, { header: "物料编号", field: "MATERIALSPECNAME", hide: false }, + { header: "NC物料编号", field: "OLDMATERIALSPECNAME", hide: false }, { header: "阶段", field: "PHASE", hide: false }, { header: "品名", field: "DESC_CN", hide: false }, { header: "系统规格", field: "DESCRIPTION", hide: false }, diff --git a/src/views/Query/StockQuery/UnDoInfo/index.vue b/src/views/Query/StockQuery/UnDoInfo/index.vue index 3b4f79c..7f4f7c1 100644 --- a/src/views/Query/StockQuery/UnDoInfo/index.vue +++ b/src/views/Query/StockQuery/UnDoInfo/index.vue @@ -133,8 +133,10 @@ const state = reactive({ { value: 'B', label: '出库' }, { value: '调拨出库', label: '调拨出库' }, { value: '采购入库', label: '采购入库' }, - { value: '自动转库', label: '转库' }, + { value: '自动转库', label: '自动转库' }, { value: 'QMS质检', label: '质检结果' }, + { value: 'FGStockIn', label: '成品入库' }, + { value: '无来源转库', label: '转现场仓及无来源转库' } ], page: { pageNum: 1, diff --git a/src/views/label/printingOfWithoutSource/index.vue b/src/views/label/printingOfWithoutSource/index.vue index 44ec3b9..b26497d 100644 --- a/src/views/label/printingOfWithoutSource/index.vue +++ b/src/views/label/printingOfWithoutSource/index.vue @@ -257,25 +257,25 @@ function getpows() { } // if('1' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1) || '2' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1)){ if('6' == state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1)) { - if ('' == state.queryParam.materialreceiveAct.PHASE) { - ElMessageBox.alert('请输入阶段', { - confirmButtonText: 'OK' - }) - return - } + // if ('' == state.queryParam.materialreceiveAct.PHASE) { + // ElMessageBox.alert('请输入阶段', { + // confirmButtonText: 'OK' + // }) + // return + // } } else if ('3' == state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0, 1) || '4' == state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0, 1)) { - if ('' == state.queryParam.materialreceiveAct.sdkid) { - ElMessageBox.alert('请输入规格', { - confirmButtonText: 'OK' - }) - return - } - if ('' == state.queryParam.materialreceiveAct.PHASE) { - ElMessageBox.alert('请输入阶段', { - confirmButtonText: 'OK' - }) - return - } + // if ('' == state.queryParam.materialreceiveAct.sdkid) { + // ElMessageBox.alert('请输入规格', { + // confirmButtonText: 'OK' + // }) + // return + // } + // if ('' == state.queryParam.materialreceiveAct.PHASE) { + // ElMessageBox.alert('请输入阶段', { + // confirmButtonText: 'OK' + // }) + // return + // } } if('NaN-NaN-NaN' == state.queryParam.materialreceiveAct.MAKEDATE){ ElMessageBox.alert('请输入生产日期', {