From d54de7a4a2379dd201fdc5af31b61b65200e49b9 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 1 Jul 2024 16:45:37 +0800 Subject: [PATCH] =?UTF-8?q?7/1=20=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/receive/DialogNewReceive.vue | 23 +++++++++---- .../inout/receive/receiveAuditDetail.vue | 18 +++++++++-- .../purchase/purApply/purApplyEditDiaolog.vue | 20 +++++++++--- .../purApply/pureApplyDetailDialog.vue | 32 +++++++++++++++---- .../purContract/purContractDetailDialog.vue | 31 ++++++++++++++---- .../purContract/purContractEditDialog.vue | 28 +++++++++++++--- .../purOrder/purOrderDetailDialog.vue | 23 ++++++++++--- .../purchase/purOrder/purOrderEditDialog.vue | 30 ++++++++++++++--- .../purchase/purPlan/purPlanDetailDialog.vue | 31 ++++++++++++++---- .../purchase/purPlan/purPlanEditDialog.vue | 30 ++++++++++++++--- 10 files changed, 216 insertions(+), 50 deletions(-) diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue index 601e5b86..7e53aa0d 100644 --- a/src/views/inout/receive/DialogNewReceive.vue +++ b/src/views/inout/receive/DialogNewReceive.vue @@ -6,14 +6,14 @@ 草稿保存 提交单据 @@ -275,6 +275,8 @@ export default { fromOptions: [], total: 0, loading: false, + draftLoading: false, + submitLoading: false, index: null, formLoading: false, formVisible: false, @@ -397,7 +399,9 @@ export default { } } } - + if (status == "1"){ + this.draftLoading = true + } if (status == "1") { this.submitFunction(status); } else { @@ -407,10 +411,11 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { + this.submitLoading = true this.submitFunction(status); - this.loading = false }).catch(() => { - this.loading = false; + this.draftLoading = false + this.submitLoading = false }); } @@ -428,6 +433,11 @@ export default { tQuery.thirdPartyDate = 2; updateReceive(tQuery) .then(response => { + if (status == "1"){ + this.draftLoading = false + }else { + this.submitLoading = false + } if (response.code === 20000) { this.$message.success(tMessage + "成功"); this.closeDialog(true); @@ -436,7 +446,8 @@ export default { } }) .catch(() => { - this.loading = false; + this.draftLoading = false + this.submitLoading = false }) }, selectProductFunction(event) { diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue index b9429190..14be5010 100644 --- a/src/views/inout/receive/receiveAuditDetail.vue +++ b/src/views/inout/receive/receiveAuditDetail.vue @@ -8,7 +8,7 @@ v-show="!this.sysApprovalFlowConfig" type="primary" @click.native="saveOrder('3')" - :loading="loading" + :loading="passLoading" >审核通过 @@ -16,7 +16,7 @@ v-show="!this.sysApprovalFlowConfig" type="primary" @click.native="saveOrder('4')" - :loading="loading" + :loading="noPassLoading" >审核拒绝 @@ -151,6 +151,8 @@ export default { page: 1, limit: 10, }, + passLoading: false, + noPassLoading: false, }; }, components: { @@ -194,7 +196,19 @@ export default { status: val, auditRemark: this.formData.auditRemark }; + if (val == '3'){ + //审核通过btn + this.passLoading = true + }else { + //审核拒绝 + this.noPassLoading = true + } getAudit(data).then((res => { + if (val == '3'){ + this.passLoading = false + }else { + this.noPassLoading = false + } if (res.code == 20000) { this.closeDialog(); } else { diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue index 7e379c14..79b5f80e 100644 --- a/src/views/purchase/purApply/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue @@ -3,8 +3,8 @@ - 草稿保存 - 提交单据 + 草稿保存 + 提交单据 @@ -274,6 +274,8 @@ export default { codeArray: [], total: 0, loading: false, + draftLoading: false, + submitLoading: false, index: null, formLoading: false, formVisible: false, @@ -350,6 +352,7 @@ export default { } } if (status == "1") { + this.draftLoading = true this.submitFunction(status); } else { let tip = "是否确定提交订单?"; @@ -358,9 +361,11 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { + this.submitLoading = true this.submitFunction(status); }).catch(() => { - this.loading = false; + this.draftLoading = false + this.submitLoading = false }); } } @@ -384,7 +389,11 @@ export default { } inserThrOrderWeb(tQuery) .then(response => { - this.loading = false; + if (status == "1") { + this.draftLoading = false + }else { + this.submitLoading = false + } if (response.code === 20000) { this.$message.success(tMessage + "成功"); this.closeDialog(true); @@ -393,7 +402,8 @@ export default { } }) .catch(() => { - this.loading = false; + this.draftLoading = false + this.submitLoading = false }) }, setWarehouseName(obj) { diff --git a/src/views/purchase/purApply/pureApplyDetailDialog.vue b/src/views/purchase/purApply/pureApplyDetailDialog.vue index ba7a929f..c917f919 100644 --- a/src/views/purchase/purApply/pureApplyDetailDialog.vue +++ b/src/views/purchase/purApply/pureApplyDetailDialog.vue @@ -8,7 +8,7 @@ v-show="!this.sysApprovalFlowConfig" type="primary" @click.native="saveOrder('3')" - :loading="loading" + :loading="passLoading" >审核通过 @@ -16,7 +16,7 @@ v-show="!this.sysApprovalFlowConfig" type="primary" @click.native="saveOrder('4')" - :loading="loading" + :loading="noPassLoading" >审核拒绝 @@ -236,6 +236,8 @@ export default { codeArray: [], total: 0, loading: false, + passLoading: false, + noPassLoading: false, index: null, formLoading: false, formVisible: false, @@ -326,17 +328,31 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { + if (status == "3"){ + this.passLoading = true + }else { + this.noPassLoading = true + } this.submitFunction(status); }).catch(() => { - this.loading = false; + if (status == '3'){ + this.passLoading = false + }else { + this.noPassLoading = false + } }); }, submitFunction(status) { - this.loading = true; + // this.loading = true; this.formData.status = status; auditOrder(this.formData)//更新方法接口路径 .then(response => { - this.loading = false; + if (status == '3'){ + this.passLoading = false + }else { + this.noPassLoading = false + } + // this.loading = false; if (response.code === 20000) { this.$message.success("更新成功！"); this.closeDialog(true); @@ -345,7 +361,11 @@ export default { } }) .catch(() => { - this.loading = false; + if (status == '3'){ + this.passLoading = false + }else { + this.noPassLoading = false + } }) }, selectProductFunction() { diff --git a/src/views/purchase/purContract/purContractDetailDialog.vue b/src/views/purchase/purContract/purContractDetailDialog.vue index a1c3bd02..8d5d0711 100644 --- a/src/views/purchase/purContract/purContractDetailDialog.vue +++ b/src/views/purchase/purContract/purContractDetailDialog.vue @@ -4,8 +4,8 @@ - 审核通过 - 拒绝申请 + 审核通过 + 拒绝申请 @@ -307,6 +307,8 @@ export default { codeArray: [], total: 0, loading: false, + passLoading: false, + noPassLoading: false, index: null, formLoading: false, formVisible: false, @@ -387,13 +389,22 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { + if (status == "3"){ + this.passLoading = true + }else { + this.noPassLoading = true + } this.submitFunction(status); }).catch(() => { - this.loading = false; + if (status == "3"){ + this.passLoading = false + }else { + this.noPassLoading = false + } }); }, submitFunction(status) { - this.loading = true; + // this.loading = true; this.formData.pageType = this.pageType let tQuery = { status:status, @@ -401,7 +412,11 @@ export default { } auditOrder(tQuery) .then(response => { - this.loading = false; + if (status == "3"){ + this.passLoading = false + }else { + this.noPassLoading = false + } if (response.code === 20000) { this.$message.success("审批成功"); this.closeDialog(true); @@ -410,7 +425,11 @@ export default { } }) .catch(() => { - this.loading = false; + if (status == "3"){ + this.passLoading = false + }else { + this.noPassLoading = false + } }) }, selectProductFunction() { diff --git a/src/views/purchase/purContract/purContractEditDialog.vue b/src/views/purchase/purContract/purContractEditDialog.vue index c0fa5000..f55c76e8 100644 --- a/src/views/purchase/purContract/purContractEditDialog.vue +++ b/src/views/purchase/purContract/purContractEditDialog.vue @@ -3,8 +3,8 @@ - 草稿保存 - 提交单据 + 草稿保存 + 提交单据 @@ -366,6 +366,8 @@ export default { stockOrderLists: [], total: 0, loading: false, + draftLoading: false, + submitLoading: false, index: null, formLoading: false, formVisible: false, @@ -477,9 +479,14 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { + this.submitLoading = true this.submitFunction(status); }).catch(() => { - this.loading = false; + if (status == '1'){ + this.draftLoading = false + }else { + this.submitLoading = false + } }); } } @@ -504,9 +511,16 @@ submitFunction(status) subErpOrders: this.codeArray, type: 1, } + if (status == '1'){ + this.draftLoading = true + } inserThrOrderWeb(tQuery) .then(response => { - this.loading = false; + if (status == '1'){ + this.draftLoading = false + }else { + this.submitLoading = false + } if (response.code === 20000) { this.$message.success(tMessage + "成功"); this.closeDialog(true); @@ -515,7 +529,11 @@ submitFunction(status) } }) .catch(() => { - this.loading = false; + if (status == '1'){ + this.draftLoading = false + }else { + this.submitLoading = false + } }) } , diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue index e4537c4d..f28f3b0d 100644 --- a/src/views/purchase/purOrder/purOrderDetailDialog.vue +++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue @@ -8,7 +8,7 @@ v-show="!this.sysApprovalFlowConfig" type="primary" @click.native="saveOrder('3')" - :loading="loading" + :loading="passLoading" >审核通过 @@ -16,7 +16,7 @@ v-show="!this.sysApprovalFlowConfig" type="primary" @click.native="saveOrder('4')" - :loading="loading" + :loading="noPassLoading" >审核拒绝 @@ -268,6 +268,8 @@ export default { codeArray: [], total: 0, loading: false, + passLoading: false, + noPassLoading: false, index: null, formLoading: false, formVisible: false, @@ -334,6 +336,11 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { + if (status == "3"){ + this.passLoading = true + }else { + this.noPassLoading = true + } this.submitFunction(status); }).catch(() => { this.loading = false; @@ -354,7 +361,11 @@ export default { } auditOrder(tQuery) .then(response => { - this.loading = false; + if (status == "3"){ + this.passLoading = false + }else { + this.noPassLoading = false + } if (response.code === 20000) { this.$message.success(tMessage + "成功"); this.closeDialog(true); @@ -363,7 +374,11 @@ export default { } }) .catch(() => { - this.loading = false; + if (status == "3"){ + this.passLoading = false + }else { + this.noPassLoading = false + } }) }, selectProductFunction() { diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue index 0792598a..e08b61c9 100644 --- a/src/views/purchase/purOrder/purOrderEditDialog.vue +++ b/src/views/purchase/purOrder/purOrderEditDialog.vue @@ -3,8 +3,8 @@ - 草稿保存 - 提交单据 + 草稿保存 + 提交单据 @@ -308,6 +308,8 @@ export default { codeArray: [], total: 0, loading: false, + draftLoading: false, + submitLoading: false, index: null, formLoading: false, formVisible: false, @@ -408,6 +410,7 @@ export default { return this.$message.error('请选择产品对应供应商'); } } + this.submitFunction(status); } else { let tip = "是否确定提交订单?"; @@ -416,9 +419,14 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { + this.submitLoading = true this.submitFunction(status); }).catch(() => { - this.loading = false; + if (status == '1'){ + this.draftLoading = false + }else { + this.submitLoading = false + } }); } } @@ -435,9 +443,17 @@ export default { subErpOrders: this.codeArray, type: 1, } + if (status == '1'){ + this.draftLoading = true + } inserThrOrderWeb(tQuery) .then(response => { - this.loading = false; + if (status == '1'){ + this.draftLoading = false + }else { + this.submitLoading = false + } + // this.loading = false; if (response.code === 20000) { this.$message.success(tMessage + "成功"); this.closeDialog(true); @@ -446,7 +462,11 @@ export default { } }) .catch(() => { - this.loading = false; + if (status == '1'){ + this.draftLoading = false + }else { + this.submitLoading = false + } }) }, selectProductFunction() { diff --git a/src/views/purchase/purPlan/purPlanDetailDialog.vue b/src/views/purchase/purPlan/purPlanDetailDialog.vue index 56e718f8..84aab2ba 100644 --- a/src/views/purchase/purPlan/purPlanDetailDialog.vue +++ b/src/views/purchase/purPlan/purPlanDetailDialog.vue @@ -8,7 +8,7 @@ v-show="!this.sysApprovalFlowConfig" type="primary" @click.native="saveOrder('3')" - :loading="loading" + :loading="passLoading" >审核通过 @@ -16,7 +16,7 @@ v-show="!this.sysApprovalFlowConfig" type="primary" @click.native="saveOrder('4')" - :loading="loading" + :loading="noPassLoading" >审核拒绝 @@ -284,7 +284,8 @@ export default { subInvList: [], tarSubList: [], invQueryData: {}, - + passLoading: false, + noPassLoading: false, }; }, @@ -322,9 +323,18 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { + if (status == "3"){ + this.passLoading = true + }else { + this.noPassLoading = true + } this.submitFunction(status); }).catch(() => { - this.loading = false; + if (status == "3"){ + this.passLoading = false + }else { + this.noPassLoading = false + } }); }, submitFunction(status) { @@ -342,7 +352,12 @@ export default { } auditOrder(tQuery) .then(response => { - this.loading = false; + if (status == "3"){ + this.passLoading = false + }else { + this.noPassLoading = false + } + // this.loading = false; if (response.code === 20000) { this.$message.success(tMessage + "成功"); this.closeDialog(true); @@ -351,7 +366,11 @@ export default { } }) .catch(() => { - this.loading = false; + if (status == "3"){ + this.passLoading = false + }else { + this.noPassLoading = false + } }) }, selectProductFunction() { diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue index ae8a2b59..3880dddd 100644 --- a/src/views/purchase/purPlan/purPlanEditDialog.vue +++ b/src/views/purchase/purPlan/purPlanEditDialog.vue @@ -3,8 +3,8 @@ - 草稿保存 - 提交单据 + 草稿保存 + 提交单据 @@ -256,6 +256,8 @@ export default { codeArray: [], total: 0, loading: false, + draftLoading: false, + submitLoading: false, index: null, formLoading: false, formVisible: false, @@ -352,6 +354,7 @@ export default { if (this.formData.arrivalTime { + this.submitLoading = true this.submitFunction(status); }).catch(() => { - this.loading = false; + if (status == '1'){ + this.draftLoading = false + }else { + this.submitLoading = false + } }); } } @@ -382,9 +390,17 @@ export default { subErpOrders: this.codeArray, type: 1, } + if (status == '1'){ + this.draftLoading = true + } inserThrOrderWeb(tQuery) .then(response => { - this.loading = false; + if (status == '1'){ + this.draftLoading = false + }else { + this.submitLoading = false + } + // this.loading = false; if (response.code === 20000) { this.$message.success(tMessage + "成功"); this.closeDialog(true); @@ -393,7 +409,11 @@ export default { } }) .catch(() => { - this.loading = false; + if (status == '1'){ + this.draftLoading = false + }else { + this.submitLoading = false + } }) }, selectProductFunction() {