From acc129663201c602c9860e13d269e4305387d126 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 4 Aug 2024 20:36:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E4=BB=B6=E6=A3=80=E9=AA=8C=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=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       |  7 +----
 .../qms/inspectionRecordFirst/addForm.vue     | 28 +++----------------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index cbd83e82a..1607c4db5 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -773,12 +773,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
             inspectionValue: '', //检验值
             qualitativeCode: '', //定性字典项值
             defectLevel: '', //缺陷级别
-            qualifiedQuantity: parseFloat(
-              (
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) *
-                parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)
-              ).toFixed(6)
-            ), //合格数量
+            qualifiedQuantity:parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量
             unqualifiedQuantity: '0' //不合格数量
           })
         }
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index f44ed7bc0..ad2321b7e 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -257,7 +257,7 @@
                               <el-input
                                 v-model="data.samplePieceSize"
                                 disabled
-                                placeholder="请输入样品份数"
+                                placeholder="请输入每份样品量"
                               />
                             </div>
                           </el-form-item>
@@ -842,12 +842,7 @@ const processList = async (InspectionSchemeObj, list) => {
           inspectionValue: '', //检验值
           qualitativeCode: '', //定性字典项值
           defectLevel: '', //缺陷级别
-          qualifiedQuantity: parseFloat(
-            (
-              parseFloat(item.samplingProcessRespVO.sampleQty) *
-              parseFloat(InspectionSchemeObj.samplePieceSize)
-            ).toFixed(6)
-          ), //合格数量
+          qualifiedQuantity:parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量
           unqualifiedQuantity: '0' //不合格数量
         })
       }
@@ -1250,12 +1245,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
               inspectionValue: '', //检验值
               qualitativeCode: '', //定性字典项值
               defectLevel: '', //缺陷级别
-              qualifiedQuantity: parseFloat(
-                (
-                  parseFloat(item.samplingProcessRespVO.sampleQty) *
-                  parseFloat(InspectionSchemeObj.samplePieceSize)
-                ).toFixed(6)
-              ), //合格数量
+              qualifiedQuantity: parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量
               unqualifiedQuantity: '0' //不合格数量
             })
           }
@@ -1329,12 +1319,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
               inspectionValue: '', //检验值
               qualitativeCode: '', //定性字典项值
               defectLevel: '', //缺陷级别
-              qualifiedQuantity: parseFloat(
-                (
-                  parseFloat(item.samplingProcessRespVO.sampleQty) *
-                  parseFloat(InspectionSchemeObj.samplePieceSize)
-                ).toFixed(6)
-              ), //合格数量
+              qualifiedQuantity: parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量
               unqualifiedQuantity: '0' //不合格数量
             })
           }
@@ -1560,11 +1545,6 @@ const onItemBlur = async (field, pageApi) => {
         column: 'code',
         action: '==',
         value: data.value[field]?.trim()
-      },
-      {
-        column: 'status',
-        action: 'in',
-        value: 'ENABLE'
       }
     )
     // 参数整理