From e5701c0032a2cb2abb63c0e7e109708c07529b59 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 18 Dec 2023 13:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4showloading=20=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/issue/request/issueRequest.vue                 | 10 +++++-----
 pages/productPutaway/request/putawayRequest.vue      | 10 +++++-----
 .../productionReturn/coms/comReturnCommonRequest.vue | 10 +++++-----
 pages/purchaseReturn/request/returnRequest.vue       | 10 +++++-----
 pages/scrap/request/scrapRrequest.vue                | 10 +++++-----
 pages/unPlanned/request/issueRequest.vue             | 12 +++++++-----
 pages/unPlanned/request/receiptRequest.vue           | 11 ++++++-----
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/pages/issue/request/issueRequest.vue b/pages/issue/request/issueRequest.vue
index c09f2418..62eda712 100644
--- a/pages/issue/request/issueRequest.vue
+++ b/pages/issue/request/issueRequest.vue
@@ -293,10 +293,10 @@
 			issueRequestSubmitApprove(id) {
 				issueRequestSubmitApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -310,10 +310,10 @@
 			issueRequestClose(id) {
 				issueRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -326,10 +326,10 @@
 			issueRequestSubmitApproveAgree(id) {
 				issueRequestSubmitApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -342,10 +342,10 @@
 			issueRequestSubmitApproveRefused(id) {
 				issueRequestSubmitApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -358,10 +358,10 @@
 			issueRequestHandle(id) {
 				issueRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}
diff --git a/pages/productPutaway/request/putawayRequest.vue b/pages/productPutaway/request/putawayRequest.vue
index 964a3725..ab696cd3 100644
--- a/pages/productPutaway/request/putawayRequest.vue
+++ b/pages/productPutaway/request/putawayRequest.vue
@@ -297,10 +297,10 @@
 			productPutawayRequestApprove(id) {
 				productPutawayRequestApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -314,10 +314,10 @@
 			productPutawayRequestClose(id) {
 				productPutawayRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -329,10 +329,10 @@
 			productPutawayRequestApproveAgree(id) {
 				productPutawayRequestApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -344,10 +344,10 @@
 			productPutawayRequestApproveRefused(id) {
 				productPutawayRequestApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -359,10 +359,10 @@
 			productPutawayRequestHandle(id) {
 				productPutawayRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}
diff --git a/pages/productionReturn/coms/comReturnCommonRequest.vue b/pages/productionReturn/coms/comReturnCommonRequest.vue
index 01667f18..2cf2958f 100644
--- a/pages/productionReturn/coms/comReturnCommonRequest.vue
+++ b/pages/productionReturn/coms/comReturnCommonRequest.vue
@@ -326,10 +326,10 @@
 			productionReturnRequestSubmitApprove(id) {
 				productionReturnRequestSubmitApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -342,10 +342,10 @@
 			productionReturnRequestClose(id) {
 				productionReturnRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -357,10 +357,10 @@
 			productionReturnRequestSubmitApproveAgree(id) {
 				productionReturnRequestSubmitApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -372,10 +372,10 @@
 			productionReturnRequestSubmitApproveRefused(id) {
 				productionReturnRequestSubmitApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -387,10 +387,10 @@
 			productionReturnRequestHandle(id) {
 				productionReturnRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}
diff --git a/pages/purchaseReturn/request/returnRequest.vue b/pages/purchaseReturn/request/returnRequest.vue
index 6633e215..a751475e 100644
--- a/pages/purchaseReturn/request/returnRequest.vue
+++ b/pages/purchaseReturn/request/returnRequest.vue
@@ -293,10 +293,10 @@
 			purchaseReturnRequestApprove(id) {
 				purchaseReturnRequestApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -310,10 +310,10 @@
 			purchaseReturnRequestClose(id) {
 				purchaseReturnRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -325,10 +325,10 @@
 			purchaseReturnRequestApproveAgree(id) {
 				purchaseReturnRequestApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -340,10 +340,10 @@
 			purchaseReturnRequestApproveRefused(id) {
 				purchaseReturnRequestApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -355,10 +355,10 @@
 			purchaseReturnRequestHandle(id) {
 				purchaseReturnRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}
diff --git a/pages/scrap/request/scrapRrequest.vue b/pages/scrap/request/scrapRrequest.vue
index 74b31979..7af80876 100644
--- a/pages/scrap/request/scrapRrequest.vue
+++ b/pages/scrap/request/scrapRrequest.vue
@@ -287,10 +287,10 @@
 			scrapRequestApprove(id) {
 				scrapRequestApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -304,10 +304,10 @@
 			scrapRequestClose(id) {
 				scrapRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -319,10 +319,10 @@
 			scrapRequestApproveAgree(id) {
 				scrapRequestApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -334,10 +334,10 @@
 			scrapRequestApproveRefused(id) {
 				scrapRequestApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -349,10 +349,10 @@
 			scrapRequestHandle(id) {
 				scrapRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}
diff --git a/pages/unPlanned/request/issueRequest.vue b/pages/unPlanned/request/issueRequest.vue
index 7d974e7d..4895f0a1 100644
--- a/pages/unPlanned/request/issueRequest.vue
+++ b/pages/unPlanned/request/issueRequest.vue
@@ -295,10 +295,10 @@
 			unPlannedIssueRequestApprove(id) {
 				unPlannedIssueRequestApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -312,10 +312,11 @@
 			unPlannedIssueRequestClose(id) {
 				unPlannedIssueRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
+						
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -327,10 +328,11 @@
 			unPlannedIssueRequestApproveAgree(id) {
 				unPlannedIssueRequestApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
+						
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -342,10 +344,10 @@
 			unPlannedIssueRequestApproveRefused(id) {
 				unPlannedIssueRequestApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -357,10 +359,10 @@
 			unPlannedIssueRequestHandle(id) {
 				unPlannedIssueRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}
diff --git a/pages/unPlanned/request/receiptRequest.vue b/pages/unPlanned/request/receiptRequest.vue
index 600eaddc..77dacb7a 100644
--- a/pages/unPlanned/request/receiptRequest.vue
+++ b/pages/unPlanned/request/receiptRequest.vue
@@ -293,10 +293,10 @@
 			unPlannedReceiptRequestApprove(id) {
 				unPlannedReceiptRequestApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -310,10 +310,10 @@
 			unPlannedReceiptRequestClose(id) {
 				unPlannedReceiptRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -325,10 +325,11 @@
 			unPlannedReceiptRequestApproveAgree(id) {
 				unPlannedReceiptRequestApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
+						
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -340,10 +341,10 @@
 			unPlannedReceiptRequestApproveRefused(id) {
 				unPlannedReceiptRequestApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -355,10 +356,10 @@
 			unPlannedReceiptRequestHandle(id) {
 				unPlannedReceiptRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}