From 1108f3c4e8684b78928d60e615efc51ae07cb34f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 10 Apr 2024 11:30:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E6=9D=BF=E5=92=8C?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E7=9A=84=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionScheme/addForm.vue              | 22 ++++++++++++------
 .../inspectionTemplate/addForm.vue            | 23 +++++++++++++------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue b/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
index 956c79747..f6d67ae35 100644
--- a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
@@ -436,7 +436,7 @@
                     <el-select
                       v-model="item.inspectionCharacteristicsBaseVO.featureType"
                       placeholder="请选择特征类型"
-                      @change="changeFeatureType"
+                      @change="changeFeatureType($event,item)"
                       :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     >
                       <el-option
@@ -971,13 +971,21 @@ if (props.footButttondata) {
   ]
 }
 // 选择特征类型
-const changeFeatureType = (e) => {
+const changeFeatureType = (e,item) => {
+  item.inspectionCharacteristicsBaseVO.quantifyIsCapping = false
+  item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit = false
+  item.inspectionCharacteristicsBaseVO.quantifyIsTarget = false
+  item.inspectionCharacteristicsBaseVO.quantifyCapping = ''
+  item.inspectionCharacteristicsBaseVO.quantifyLowlimit = ''
+  item.inspectionCharacteristicsBaseVO.quantifyTarget= ''
+  item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode= ''
+  item.inspectionCharacteristicsBaseVO.quantifyQuantifyName= ''
   console.log(e)
-  // if (e) {
-  //   rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true
-  // } else {
-  //   rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = false
-  // }
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = false
+  }
 }
 const searchTableRef = ref()
 const opensearchTable = (
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index 9efcb93b5..a57e0d20b 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -257,7 +257,7 @@
                   <el-select
                     v-model="item.inspectionCharacteristicsBaseVO.featureType"
                     placeholder="请选择特征类型"
-                    @change="changeFeatureType"
+                    @change="changeFeatureType($event,item)"
                   >
                     <el-option
                       v-for="dict in getStrDictOptions(
@@ -766,6 +766,7 @@ const submitForm = async () => {
       // 上限值，下限值，目标值都存在时，上限值应大于目标值大于下限值
       (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && ((item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyLowlimit)||(item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyTarget)||(item.inspectionCharacteristicsBaseVO.quantifyLowlimit >= item.inspectionCharacteristicsBaseVO.quantifyTarget)))
     )
+    console.log(99,arr2)
     if (arr2 && arr2.length > 0) {
       const str = arr2.map((item) => item.description).join(',')
       message.error(`${str}上限值应大目标值大于下限值`)
@@ -793,13 +794,21 @@ if (props.footButttondata) {
   ]
 }
 // 选择特征类型
-const changeFeatureType = (e) => {
+const changeFeatureType = (e,item) => {
+  item.inspectionCharacteristicsBaseVO.quantifyIsCapping = false
+  item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit = false
+  item.inspectionCharacteristicsBaseVO.quantifyIsTarget = false
+  item.inspectionCharacteristicsBaseVO.quantifyCapping = ''
+  item.inspectionCharacteristicsBaseVO.quantifyLowlimit = ''
+  item.inspectionCharacteristicsBaseVO.quantifyTarget= ''
+  item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode= ''
+  item.inspectionCharacteristicsBaseVO.quantifyQuantifyName= ''
   console.log(e)
-  // if (e) {
-  //   rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true
-  // } else {
-  //   rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = false
-  // }
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = false
+  }
 }
 const searchTableRef = ref()
 const opensearchTable = (