From 8d8f917e4419db8f6bb6d89e2829a1cbc8f43109 Mon Sep 17 00:00:00 2001
From: Ledo <Watch13755@#.>
Date: Thu, 10 Jul 2025 09:22:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assembleReport/assembleReport-detail.vue   | 13 ++++++++-----
 .../assembleReport/components/dataItem.vue     | 18 +++++++++---------
 .../productionReport/components/dataItem.vue   | 18 +++++++++---------
 .../productionReport-detail.vue                | 10 +++++++---
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue b/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue
index 6e982c5..26bf8d6 100644
--- a/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue
+++ b/mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue
@@ -79,17 +79,20 @@
 		historyList.value = data.list
 		isShowEnd.value = true;
 		isShowStart.value = true
-		if (historyList.value.length) {
+if (historyList.value.length) {
 			const obj = historyList.value[0]
-			console.log('s')
-			if (!obj?.amount) {
-				isShowStart.value = false
+			if (obj.amount !=null && obj.amount >= 0 ) {
+				isShowStart.value = true
+			}else{
+					isShowStart.value = false
 			}
 		}
 		if (historyList.value.length) {
 			const obj = historyList.value[0]
-			if (obj?.amount) {
+			if (obj.amount !=null && obj.amount >= 0 ) {
 				isShowEnd.value = false
+			}else{
+					isShowEnd.value = true
 			}
 		} else {
 			isShowEnd.value = false
diff --git a/mes-ui/mini-app/src/pages/assembleReport/components/dataItem.vue b/mes-ui/mini-app/src/pages/assembleReport/components/dataItem.vue
index bf6d38b..6f17305 100644
--- a/mes-ui/mini-app/src/pages/assembleReport/components/dataItem.vue
+++ b/mes-ui/mini-app/src/pages/assembleReport/components/dataItem.vue
@@ -86,15 +86,15 @@ onShow(async () => {
 })
 
 const handleDetail = async(item) => {
-	var isoverBefore=	await	isOverBeforeProcedure(item.id);
-	if(isoverBefore == true){
-		    uni.showToast({
-		      title: '上一道工序尚未完成报工！',
-		      icon: 'none',
-		      duration: 2000,
-		    })
-		  return
-	}
+	// var isoverBefore=	await	isOverBeforeProcedure(item.id);
+	// if(isoverBefore == true){
+	// 	    uni.showToast({
+	// 	      title: '上一道工序尚未完成报工！',
+	// 	      icon: 'none',
+	// 	      duration: 2000,
+	// 	    })
+	// 	  return
+	// }
   const url = `/pages/assembleReport/assembleReport-detail?id=${item.id}`
   uni.navigateTo({ url })
 }
diff --git a/mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue b/mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue
index 52e3fef..30c1987 100644
--- a/mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue
+++ b/mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue
@@ -105,15 +105,15 @@ onShow(async () => {
 });
 
 const handleDetail = async (item) => {
-  var isoverBefore = await isOverBeforeProcedure(item.id);
-  if (isoverBefore == true) {
-    uni.showToast({
-      title: noticeMsg.value,
-      icon: "none",
-      duration: 2000,
-    });
-    return;
-  }
+  // var isoverBefore = await isOverBeforeProcedure(item.id);
+  // if (isoverBefore == true) {
+  //   uni.showToast({
+  //     title: noticeMsg.value,
+  //     icon: "none",
+  //     duration: 2000,
+  //   });
+  //   return;
+  // }
   const url = `/pages/productionReport/productionReport-detail?id=${item.id}`;
   uni.navigateTo({ url });
 };
diff --git a/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue b/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue
index da39859..0bdd336 100644
--- a/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue
+++ b/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue
@@ -84,14 +84,18 @@
 		isShowStart.value = true
 		if (historyList.value.length) {
 			const obj = historyList.value[0]
-			if (!obj?.amount) {
-				isShowStart.value = false
+			if (obj.amount !=null && obj.amount >= 0 ) {
+				isShowStart.value = true
+			}else{
+					isShowStart.value = false
 			}
 		}
 		if (historyList.value.length) {
 			const obj = historyList.value[0]
-			if (obj?.amount) {
+			if (obj.amount !=null && obj.amount >= 0 ) {
 				isShowEnd.value = false
+			}else{
+					isShowEnd.value = true
 			}
 		} else {
 			isShowEnd.value = false