From a3e8cffda8cc19acbec402600ff59b198833c2c9 Mon Sep 17 00:00:00 2001
From: Ledo <Watch13755@#.>
Date: Fri, 11 Jul 2025 15:00:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=9B=BE=E7=89=87=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=B8=8D=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/pgMaster/pgMaster-detail.vue    | 34 ++++++++++++-------
 .../pages/zjPgMaster/zjPgMaster-detail.vue    | 32 ++++++++++-------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue b/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue
index a80d3cf..3211cea 100644
--- a/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue
+++ b/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue
@@ -184,7 +184,7 @@
 						title: '总报工数量超出派工数量，请确认',
 						confirmText: '确认',
 						cancelText: '取消',
-						success: async(res) => {
+						success: async (res) => {
 
 							if (res.confirm) {
 								const params = {
@@ -199,17 +199,20 @@
 								const data = await postOperateAPIEnd(params)
 								if (isQua.value == 1) {
 									await imgUpload()
-								}
-						await initPage();
+								}else{
+									await getDetailData(idValue.value)
+								await getData()
 								const pages = getCurrentPages(); // 获取当前页面栈
 								const currentPage = pages[pages.length - 1]; // 当前页面
 								const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
 								uni.reLaunch({ url }); // 重新加载当前页面
+								}
+								
 							}
 						},
 
 					});
-				}else{
+				} else {
 					const params = {
 						zjMxId: detailInfo.value?.id,
 						amount: amount.value,
@@ -222,12 +225,12 @@
 					const data = await postOperateAPIEnd(params)
 					if (isQua.value == 1) {
 						await imgUpload()
+					}else{
+						const pages = getCurrentPages(); // 获取当前页面栈
+						const currentPage = pages[pages.length - 1]; // 当前页面
+						const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
+						uni.reLaunch({ url }); // 重新加载当前页面
 					}
-						await initPage();
-					const pages = getCurrentPages(); // 获取当前页面栈
-					const currentPage = pages[pages.length - 1]; // 当前页面
-					const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
-					uni.reLaunch({ url }); // 重新加载当前页面
 				}
 
 
@@ -410,7 +413,7 @@
 						id: detailId.value,
 						Authorization: token,
 						'Tenant-Id': 2,
-						'type':1,
+						'type': 1,
 					},
 					success: async (uploadFileRes) => {
 						uni.hideLoading();
@@ -420,6 +423,10 @@
 							duration: 2000
 						});
 						await initPage()
+						const pages = getCurrentPages(); // 获取当前页面栈
+						const currentPage = pages[pages.length - 1]; // 当前页面
+						const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
+						uni.reLaunch({ url }); // 重新加载当前页面
 						popup.value.close();
 
 					},
@@ -493,7 +500,8 @@
 						</view>
 					</view>
 					<!-- <view class="product-item">预计生产日期：{{ detailInfo.startTime }} ～ {{ detailInfo.entTime }}</view> -->
-					<view class="finish" v-if="isShowStart && historyList.length &&detailInfo.pgType != 1" @click="handleComplate">
+					<view class="finish" v-if="isShowStart && historyList.length &&detailInfo.pgType != 1"
+						@click="handleComplate">
 						<image class="complate-img" src="/static/images/productionReport-detail-complate.png"
 							mode="scaleToFill" />
 						质检完成
@@ -925,6 +933,7 @@
 					}
 				}
 			}
+
 			.no {
 				font-size: 32rpx;
 				margin: 20rpx auto 80rpx;
@@ -935,6 +944,7 @@
 				background-color: red;
 				color: #fff;
 			}
+
 			.ok {
 				font-size: 32rpx;
 				margin: 20rpx auto 80rpx;
@@ -947,4 +957,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/mes-ui/mini-app/src/pages/zjPgMaster/zjPgMaster-detail.vue b/mes-ui/mini-app/src/pages/zjPgMaster/zjPgMaster-detail.vue
index d1dc254..49cc5ea 100644
--- a/mes-ui/mini-app/src/pages/zjPgMaster/zjPgMaster-detail.vue
+++ b/mes-ui/mini-app/src/pages/zjPgMaster/zjPgMaster-detail.vue
@@ -191,14 +191,15 @@
 									remark: remark.value
 								}
 								const data = await postOperateAPIEnd(params)
-								if (isQua.value == 1) {
-									await imgUpload()
-								}
-
-								const pages = getCurrentPages(); // 获取当前页面栈
-								const currentPage = pages[pages.length - 1]; // 当前页面
-								const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
-								uni.reLaunch({ url }); // 重新加载当前页面
+					if (isQua.value == 1) {
+						await imgUpload()
+					}else{
+						const pages = getCurrentPages(); // 获取当前页面栈
+						const currentPage = pages[pages.length - 1]; // 当前页面
+						const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
+						uni.reLaunch({ url }); // 重新加载当前页面
+					}
+								
 							}
 						},
 
@@ -216,12 +217,12 @@
 					const data = await postOperateAPIEnd(params)
 					if (isQua.value == 1) {
 						await imgUpload()
+					}else{
+						const pages = getCurrentPages(); // 获取当前页面栈
+						const currentPage = pages[pages.length - 1]; // 当前页面
+						const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
+						uni.reLaunch({ url }); // 重新加载当前页面
 					}
-					await initPage();
-					const pages = getCurrentPages(); // 获取当前页面栈
-					const currentPage = pages[pages.length - 1]; // 当前页面
-					const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
-					uni.reLaunch({ url }); // 重新加载当前页面
 				}
 
 
@@ -396,6 +397,11 @@
 							icon: 'none', // 显示纯文本时icon设为none
 							duration: 2000
 						});
+						await initPage()
+						const pages = getCurrentPages(); // 获取当前页面栈
+						const currentPage = pages[pages.length - 1]; // 当前页面
+						const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
+						uni.reLaunch({ url }); // 重新加载当前页面
 						popup.value.close();
 
 					},