From 4f012abe00002e50f97f65b8958399d985e598a9 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Sat, 11 May 2024 17:05:29 +0800
Subject: [PATCH] =?UTF-8?q?MES=E2=80=94=E2=80=94>=20PDA=20=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E8=B4=A8=E6=A3=80=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workScheduling/reportWorkQualityInspection.vue | 14 ++++++++++----
 src/pages/mes/workScheduling/workScheduling.vue    |  2 +-
 .../mes/workScheduling/workSchedulingDetail.vue    |  1 -
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/mes/workScheduling/reportWorkQualityInspection.vue b/src/pages/mes/workScheduling/reportWorkQualityInspection.vue
index 1147544..4f55872 100644
--- a/src/pages/mes/workScheduling/reportWorkQualityInspection.vue
+++ b/src/pages/mes/workScheduling/reportWorkQualityInspection.vue
@@ -285,9 +285,15 @@ function calculatePass(){
 }
 
 function submitQaForm(){
-	if(form.value.qaFormNo == ''||form.value.qaFormName == ''||form.value.qaFormType == ''||
-	   form.value.qaTime == ''||form.value.qaTimes == ''||form.value.qaCount == ''||
-	   form.value.qaCountPassed == ''||form.value.qaCountNotpassed == ''||form.value.qaPassRate == ''
+	
+	if(JSON.stringify(form.value.qaFormNo) == ''||
+	   JSON.stringify(form.value.qaFormName) == ''||
+	   JSON.stringify(form.value.qaFormType) == ''||
+	   JSON.stringify(form.value.qaTimes) == ''||
+	   JSON.stringify(form.value.qaCount) == ''||
+	   JSON.stringify(form.value.qaCountPassed) == ''||
+	   JSON.stringify(form.value.qaCountNotpassed) == ''||
+	   JSON.stringify(form.value.qaPassRate) == ''
 	   ){
 		proxy.$modal.alert("还有未填项");
 		return
@@ -328,7 +334,7 @@ function submitQaForm(){
 		//报工质检状态完成
 		form.value.qaStatus = '1'
 		//报工质检单状态完成
-		form.value.status = '1'
+		form.value.status = '4'
 		qaFormApi.create(form.value).then((res) => {
 			proxy.$modal.closeLoading()
 			if (res.data) {
diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue
index dfded49..101afb5 100644
--- a/src/pages/mes/workScheduling/workScheduling.vue
+++ b/src/pages/mes/workScheduling/workScheduling.vue
@@ -348,7 +348,7 @@ function tabsChange(index) {
   }else if(index == '6'){
 	tabParams.value.status = '4'  
   }else if(index == '7'){
-	tabParams.value.status = '6'  
+	tabParams.value.status = '5'  
   }else if(index == '8'){
 	tabParams.value.status = '6'  
   }else if(index == '9'){
diff --git a/src/pages/mes/workScheduling/workSchedulingDetail.vue b/src/pages/mes/workScheduling/workSchedulingDetail.vue
index baa8171..bc4e982 100644
--- a/src/pages/mes/workScheduling/workSchedulingDetail.vue
+++ b/src/pages/mes/workScheduling/workSchedulingDetail.vue
@@ -89,7 +89,6 @@
 				  </view>
 				  <view>
 					<u-button type="primary" v-if="(item.qaStatus !=1 && (item.status == 1 || item.status == 3))" @click="openQualityInspect(item)">报工质检</u-button>
-					<u-button type="primary" v-if="item.qaStatus==1" @click="openQualityInspect(item)">报工</u-button>
 				  </view>
 			</view>
 		</view>