From 94841c5712967ab84adc1d7c699d86e8099ac29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Thu, 29 May 2025 21:06:16 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=97=A0=E6=9D=A5=E6=BA=90=E8=BD=AC?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stocked/NoOrMoveLibrary/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/stocked/NoOrMoveLibrary/index.vue b/src/views/stocked/NoOrMoveLibrary/index.vue index 7c08dcb..138b207 100644 --- a/src/views/stocked/NoOrMoveLibrary/index.vue +++ b/src/views/stocked/NoOrMoveLibrary/index.vue @@ -273,7 +273,7 @@
Date: Thu, 29 May 2025 21:15:38 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=BA=93=E5=86=85=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stocked/NoOrMoveLibraryWork/index.vue | 2 +- src/views/stocked/holdAndRelease/index.vue | 4 ++-- src/views/stocked/locationMovePage/index.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/stocked/NoOrMoveLibraryWork/index.vue b/src/views/stocked/NoOrMoveLibraryWork/index.vue index 72f91de..e119191 100644 --- a/src/views/stocked/NoOrMoveLibraryWork/index.vue +++ b/src/views/stocked/NoOrMoveLibraryWork/index.vue @@ -273,7 +273,7 @@
- 冻结 - 释放
diff --git a/src/views/stocked/locationMovePage/index.vue b/src/views/stocked/locationMovePage/index.vue index 0c3eddd..5a40791 100644 --- a/src/views/stocked/locationMovePage/index.vue +++ b/src/views/stocked/locationMovePage/index.vue @@ -244,7 +244,7 @@
提交 Date: Fri, 30 May 2025 09:45:20 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stockOut/PurReturn/index.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/stockOut/PurReturn/index.vue b/src/views/stockOut/PurReturn/index.vue index 3e8ba33..6cabcca 100644 --- a/src/views/stockOut/PurReturn/index.vue +++ b/src/views/stockOut/PurReturn/index.vue @@ -71,11 +71,11 @@
- + - + @@ -435,6 +435,7 @@ async function LeftIn() { }; AssignAndDessign(param).then((res: any) => { if (IFTRUE(res)) { + state.MaterialPackingList = [] handle(tempRow, tempevent, tempcolumn); handleQuery(); state.loading = false; @@ -442,7 +443,7 @@ async function LeftIn() { ElMessageBox.alert(res.data.RETURNCODE + '->' + res.data.RETURNMESSAGE, '', { confirmButtonText: 'OK', }) - state.loading2 = false; + state.loading = false; } @@ -459,7 +460,7 @@ async function LeftIn() { }) } - state.loading = false; + // state.loading = false; } @@ -483,6 +484,7 @@ async function RightIn() { }; AssignAndDessign(param).then((res: any) => { if (IFTRUE(res)) { + state.MaterialPackingUsername = [] handle(tempRow, tempevent, tempcolumn); handleQuery(); state.loading2 = false; From 024c6dd479f138d0e5118b12d1bd38d1ad3ef83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 30 May 2025 10:30:35 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=BE=85=E6=9D=90=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/auxiliaryManage/auxiliaryOut/index.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/auxiliaryManage/auxiliaryOut/index.vue b/src/views/auxiliaryManage/auxiliaryOut/index.vue index 7018e18..31286f7 100644 --- a/src/views/auxiliaryManage/auxiliaryOut/index.vue +++ b/src/views/auxiliaryManage/auxiliaryOut/index.vue @@ -106,7 +106,7 @@
- 出库 + 出库
@@ -626,12 +626,12 @@ function confimStockOut() { confirmButtonText: 'OK', }) } else { - /*state.button_state = false; - state.loading = false;*/ ElMessageBox.alert('辅材出库失败，' + res.message, '', { confirmButtonText: 'OK', }) } + state.button_state = false; + state.loading = false; }).catch((error: any) => { ElMessageBox.alert('辅材出库失败，' + error, '提示框', { confirmButtonText: 'OK', @@ -639,8 +639,6 @@ function confimStockOut() { state.button_state = false; state.loading = false; }); - state.button_state = false; - state.loading = false; } From 2719c45725ea3af82e0fd71e654c9fa6c27e2cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 30 May 2025 10:51:58 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=8B=E4=BD=93?= =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/buildWareHouse/MaturationLibrary/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/buildWareHouse/MaturationLibrary/index.vue b/src/views/buildWareHouse/MaturationLibrary/index.vue index 080c37e..cc419b0 100644 --- a/src/views/buildWareHouse/MaturationLibrary/index.vue +++ b/src/views/buildWareHouse/MaturationLibrary/index.vue @@ -179,7 +179,7 @@ type="primary" @click="submit" :disabled="state.button_state" - v-loading="state.loadings" + v-loading.fullscreen.lock="state.loadings" >确认 @@ -608,8 +608,8 @@ function submit() { state.button_state = false state.loadings = false } - state.button_state = false - state.loadings = false + // state.button_state = false + // state.loadings = false } catch (error) { ElMessageBox.alert('运行错误', '提醒框', { confirmButtonText: 'OK' @@ -617,9 +617,9 @@ function submit() { state.button_state = false state.loadings = false } finally { - state.loading = false - state.button_state = false - state.loadings = false + // state.loading = false + // state.button_state = false + // state.loadings = false } } From 0d82446c75d55726d64174c5936f9ebf6d41b4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 30 May 2025 11:02:04 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=8B=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/buildWareHouse/MaturationLibraryToERP/index.vue | 2 +- src/views/buildWareHouse/locationMove/index.vue | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/buildWareHouse/MaturationLibraryToERP/index.vue b/src/views/buildWareHouse/MaturationLibraryToERP/index.vue index 5ab0c31..830d953 100644 --- a/src/views/buildWareHouse/MaturationLibraryToERP/index.vue +++ b/src/views/buildWareHouse/MaturationLibraryToERP/index.vue @@ -187,7 +187,7 @@
- 提交 + 提交
@@ -496,8 +496,6 @@ function submit() { state.button_state = false state.loading2 = false } - state.loading2 = false - state.button_state = false } //查询库区 const handQuery = () => { From 7637b25a4cf62370aaeee5f7fb6377f3fc0ea7b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 30 May 2025 13:36:13 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=86=85?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stocked/MoveLibrary/index.vue | 1 - src/views/stocked/MoveTransformation/index.vue | 9 ++++----- src/views/stocked/holdAndRelease/index.vue | 2 -- src/views/stocked/locationMovePage/index.vue | 1 - 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/views/stocked/MoveLibrary/index.vue b/src/views/stocked/MoveLibrary/index.vue index 86d9ff3..8f1f3fa 100644 --- a/src/views/stocked/MoveLibrary/index.vue +++ b/src/views/stocked/MoveLibrary/index.vue @@ -596,7 +596,6 @@ async function LeftIn() { }) } - state.loading3 = false } async function RightIn() { diff --git a/src/views/stocked/MoveTransformation/index.vue b/src/views/stocked/MoveTransformation/index.vue index 82aaeef..1cb68d6 100644 --- a/src/views/stocked/MoveTransformation/index.vue +++ b/src/views/stocked/MoveTransformation/index.vue @@ -585,29 +585,28 @@ async function RightIn() { materialSpecName: state.queryParams.params.MATERIALSPECNAME, opType: 'Dessign', }; - state.loading = true; + state.loading2 = true; AssignOrDessignShipRequest(params).then((res: any) => { if (res.code == 200) { handleQuery(); - state.loading = false; + state.loading2 = false; } else { ElMessageBox.alert('操作失败：' + res.message, '提醒框', { confirmButtonText: 'OK', }) - state.loading = false; + state.loading2 = false; } }).catch((err: any) => { ElMessageBox.alert('操作失败:' + err.response.data.message, '提醒框', { confirmButtonText: 'OK', }) - state.loading = false; + state.loading2 = false; }) } else { ElMessageBox.alert('勾选的数据不能为空！', '提示框', { confirmButtonText: 'OK', }) } - state.loading = false; } function handleStockOut() { diff --git a/src/views/stocked/holdAndRelease/index.vue b/src/views/stocked/holdAndRelease/index.vue index d696dc7..5f764a8 100644 --- a/src/views/stocked/holdAndRelease/index.vue +++ b/src/views/stocked/holdAndRelease/index.vue @@ -389,8 +389,6 @@ function Release() { state.Button_state2 = false state.loading3 = false }); - state.loading3 = false - state.Button_state2 = false } function resetQuery() { queryFormRef.value.resetFields(); diff --git a/src/views/stocked/locationMovePage/index.vue b/src/views/stocked/locationMovePage/index.vue index 5a40791..8a55ea9 100644 --- a/src/views/stocked/locationMovePage/index.vue +++ b/src/views/stocked/locationMovePage/index.vue @@ -716,7 +716,6 @@ async function submit() { confirmButtonText: 'OK' }) } - state.loading2 = false state.Button_state = false } /* From 5827be1c27ed59eddcf100bdef4100e9eeaf0fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 30 May 2025 13:55:27 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stockOut/PurReturn/index.vue | 10 ---------- src/views/stockOut/shipRequestByTC/index.vue | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/views/stockOut/PurReturn/index.vue b/src/views/stockOut/PurReturn/index.vue index 6cabcca..d33359b 100644 --- a/src/views/stockOut/PurReturn/index.vue +++ b/src/views/stockOut/PurReturn/index.vue @@ -531,8 +531,6 @@ async function handleStockOut() { // handleQuery(); console.log(res) if (IFTRUE(res)) { - state.loading = false; - state.loading2 = false; ElMessageBox.alert('出库完成', '提示框', { confirmButtonText: 'OK', }) @@ -551,15 +549,9 @@ async function handleStockOut() { ElMessageBox.alert(error, '提示框', { confirmButtonText: 'OK', }) - state.loading = false - state.loading2 = false; state.button_state = false state.button_loadings = false; }); - state.loading = false; - state.loading2 = false; - state.button_state = false - state.button_loadings = false; } else { ElMessageBox.alert("请先选择要采购退货的标签", '提示框', { confirmButtonText: 'OK', @@ -567,8 +559,6 @@ async function handleStockOut() { state.button_state = false state.button_loadings = false; } - state.button_state = false - state.button_loadings = false; } diff --git a/src/views/stockOut/shipRequestByTC/index.vue b/src/views/stockOut/shipRequestByTC/index.vue index f7370b9..ecc2e0b 100644 --- a/src/views/stockOut/shipRequestByTC/index.vue +++ b/src/views/stockOut/shipRequestByTC/index.vue @@ -634,7 +634,7 @@ async function LeftIn() { confirmButtonText: 'OK', }) } - state.loading = false; + // state.loading = false; // if (state.MaterialPackingList.length > 0 && state.column4.length > 0) { // state.loading = true; @@ -882,7 +882,7 @@ async function RightIn() { confirmButtonText: 'OK', }) } - state.loading2 = false; + // state.loading2 = false; // if (state.column3.length > 0) { // state.loading2 = true; // state.ChangeParams.header.MESSAGENAME = 'DeassignShipRequestFromBox'; From d8d1b001a4ab1bdeb40505f4a20081642a9f0f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 30 May 2025 14:12:26 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=BE=85=E6=9D=90=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auxiliaryManage/auxiliaryOut/index.vue | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/views/auxiliaryManage/auxiliaryOut/index.vue b/src/views/auxiliaryManage/auxiliaryOut/index.vue index 31286f7..bb852f8 100644 --- a/src/views/auxiliaryManage/auxiliaryOut/index.vue +++ b/src/views/auxiliaryManage/auxiliaryOut/index.vue @@ -71,8 +71,8 @@
- 取消备货 - 确认备货 + 取消备货 + 确认备货
@@ -144,6 +144,8 @@ const state: any = reactive({ LShipType: '', button_state: false, button_state2: false, + button_stateFn: false, + button_stateUp: false, STOCKSELECT: [], AleardyBooking: false, IFCompleteStockUp: false,//用于判断是否完成备货 @@ -463,8 +465,7 @@ function confimStockUp () { ElMessageBox.alert('没有单据明细，请确认') return } - state.loading = true - state.button_state = true + state.button_stateUp = true AuxiliaryReserve({ commitDate : state.commitDate, USER : localStorage.get("userId"), @@ -482,15 +483,13 @@ function confimStockUp () { confirmButtonText: 'OK', }) } + state.button_stateUp = false }).catch((error: any) => { ElMessageBox.alert('备货失败，' + error, '提示框', { confirmButtonText: 'OK', }) - state.button_state = false; - state.loading = false; + state.button_stateUp = false; }); - state.button_state = false; - state.loading = false; } @@ -502,8 +501,7 @@ function cancelHandleFn() { ElMessageBox.alert('没有单据明细，请确认') return } - state.loading = true - state.button_state = true + state.button_stateFn = true AuxiliaryDessign({ commitDate : state.commitDate, USER : localStorage.get("userId"), @@ -522,15 +520,13 @@ function cancelHandleFn() { confirmButtonText: 'OK', }) } + state.button_stateFn = false }).catch((error: any) => { ElMessageBox.alert('取消备货失败，' + error, '提示框', { confirmButtonText: 'OK', }) - state.button_state = false; - state.loading = false; + state.button_stateFn = false; }); - state.button_state = false; - state.loading = false; } function resetQuery() { @@ -601,7 +597,6 @@ function confimStockOut() { ElMessageBox.alert('辅材出库失败，没有出库明细，请确认') return } - state.loading = true state.button_state = true /* state.ReserveParams.SITENAME = localStorage.getItem("siteName") == null ? "SDK" : localStorage.getItem("siteName"); @@ -631,13 +626,11 @@ function confimStockOut() { }) } state.button_state = false; - state.loading = false; }).catch((error: any) => { ElMessageBox.alert('辅材出库失败，' + error, '提示框', { confirmButtonText: 'OK', }) state.button_state = false; - state.loading = false; }); } From 38fc7ff5c2496ec1e21e29a70abcf137f9319e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 30 May 2025 15:48:20 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stocked/MoveLibrary/index.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/stocked/MoveLibrary/index.vue b/src/views/stocked/MoveLibrary/index.vue index 8f1f3fa..745c5b6 100644 --- a/src/views/stocked/MoveLibrary/index.vue +++ b/src/views/stocked/MoveLibrary/index.vue @@ -188,7 +188,7 @@ type="primary" @click="handleReserve" :disabled="state.Button_state" - v-loading="state.button_loading" + v-loading.fullscreen.lock="state.button_loading" >确定
@@ -500,8 +500,6 @@ async function handleReserve() { state.button_loading = false } state.loading = false - state.Button_state = false - state.button_loading = false } function handleSelectionChange(selection: any) {