From c4d3155181e1e159b8227c41d8e6c1856e5c32cc Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 6 Aug 2024 11:57:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E5=80=BC=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue       | 27 ++++++++++---------
 src/views/qms/inspectionRecord/addForm.vue    | 20 +++++++-------
 .../qms/inspectionRecordFirst/addForm.vue     | 24 ++++++++---------
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 1607c4db5..2a44e6eb0 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -478,10 +478,10 @@
                                 "
                               >
                                 <el-form-item label="检验值" required>
-                                  <el-input
+                                  <el-input-number
                                     v-model="cur.inspectionValue"
-                                    placeholder="请输入检验值"
-                                    type="number"
+                                    :min="0"
+                                    @change="inspectionValueInput(item, cur)"
                                     @blur="inspectionValueInput(item, cur)"
                                   />
                                 </el-form-item>
@@ -643,7 +643,7 @@ const formProcessRef = ref()
 const formSchema = ref(props.formAllSchemas?.formSchema)
 const tableAllSchemas = ref(props.tableAllSchemas)
 const tableFormRules = ref(props.tableFormRules)
-const collapseShow = ref(['1','2','3'])
+const collapseShow = ref(['1', '2', '3'])
 
 const data = ref({
   code: '',
@@ -773,7 +773,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
             inspectionValue: '', //检验值
             qualitativeCode: '', //定性字典项值
             defectLevel: '', //缺陷级别
-            qualifiedQuantity:parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量
+            qualifiedQuantity: parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量
             unqualifiedQuantity: '0' //不合格数量
           })
         }
@@ -1412,6 +1412,9 @@ const inspectionValueInput = (item, cur) => {
     i++
   ) {
     item.isPass = true
+     item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit  = false
+     item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget  = 10
+     item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping  = 10.1
     //  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
     if (
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
@@ -1479,22 +1482,22 @@ const inspectionValueInput = (item, cur) => {
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
       item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
         .inspectionValue &&
-      (parseFloat(cur.inspectionValue) >
+      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
         parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(cur.inspectionValue) <
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
           parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
     ) {
       item.isPass = false
       return
     }
-    // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标
     if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      (parseFloat(cur.inspectionValue) >
+      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
         parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
-        parseFloat(cur.inspectionValue) <
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
           parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
     ) {
       item.isPass = false
diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue
index 337ae5b8d..030c4d595 100644
--- a/src/views/qms/inspectionRecord/addForm.vue
+++ b/src/views/qms/inspectionRecord/addForm.vue
@@ -478,10 +478,10 @@
                                 "
                               >
                                 <el-form-item label="检验值" required>
-                                  <el-input
+                                  <el-input-number
                                     v-model="cur.inspectionValue"
-                                    placeholder="请输入检验值"
-                                    type="number"
+                                    :min="0"
+                                    @change="inspectionValueInput(item, cur)"
                                     @blur="inspectionValueInput(item, cur)"
                                   />
                                 </el-form-item>
@@ -1492,22 +1492,22 @@ const inspectionValueInput = (item, cur) => {
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
       item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
         .inspectionValue &&
-      (parseFloat(cur.inspectionValue) >
+      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
         parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(cur.inspectionValue) <
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
           parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
     ) {
       item.isPass = false
       return
     }
-    // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标
     if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      (parseFloat(cur.inspectionValue) >
+      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
         parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
-        parseFloat(cur.inspectionValue) <
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
           parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
     ) {
       item.isPass = false
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index ad2321b7e..d3c12f30a 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -535,10 +535,10 @@
                             v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'"
                           >
                             <el-form-item label="检验值" required>
-                              <el-input
+                              <el-input-number
                                 v-model="cur.inspectionValue"
-                                placeholder="请输入检验值"
-                                type="number"
+                                :min="0"
+                                @change="inspectionValueInput(item, cur)"
                                 @blur="inspectionValueInput(item, cur)"
                               />
                             </el-form-item>
@@ -693,7 +693,7 @@ const formMainRef = ref()
 const formFeaturesRef = ref()
 const formProcessRef = ref()
 const formSchema = ref(props.formAllSchemas?.formSchema)
-const collapseShow = ref(['1','2','3'])
+const collapseShow = ref(['1', '2', '3'])
 
 const data = ref({
   code: '',
@@ -842,7 +842,7 @@ const processList = async (InspectionSchemeObj, list) => {
           inspectionValue: '', //检验值
           qualitativeCode: '', //定性字典项值
           defectLevel: '', //缺陷级别
-          qualifiedQuantity:parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量
+          qualifiedQuantity: parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量
           unqualifiedQuantity: '0' //不合格数量
         })
       }
@@ -1485,22 +1485,22 @@ const inspectionValueInput = (item, cur) => {
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
       item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
         .inspectionValue &&
-      (parseFloat(cur.inspectionValue) >
+      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
         parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-        parseFloat(cur.inspectionValue) <
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
           parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
     ) {
       item.isPass = false
       return
     }
-    // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标
     if (
-      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      (parseFloat(cur.inspectionValue) >
+      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
         parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
-        parseFloat(cur.inspectionValue) <
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
           parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
     ) {
       item.isPass = false