From 42249b7213ba331e4cac41c437cde3e0768e4a14 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Apr 2024 15:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E9=87=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C=E5=8C=85=E8=A3=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspection/inspectionJob/addForm.vue  | 48 ++++++++++---------
 .../qms/inspection/inspectionJob/detail.vue   |  4 +-
 .../inspectionJob/inspectionJobMain.data.ts   | 10 +++-
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
index bfe5c5543..d1217fd2b 100644
--- a/src/views/qms/inspection/inspectionJob/addForm.vue
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -18,23 +18,19 @@
           :is-col="true"
           @opensearchTable="opensearchTable"
         />
+        <div class="small-title">包装列表</div>
         <div style="border:1px solid #dedede;margin-bottom:20px;display: flex;">
-        <TableForm
-        ref="tableFormRef"
-        style="width:100%;"
-        :maxHeight = "490"
-        :tableFields="tableAllSchemas.tableFormColumns"
-        :tableFormRules="tableFormRules"
-        :tableData="data.packageVOList"
-        :isShowButton="false"
-        :isShowReduceButton="false"
-      >
-
-      <template v-slot="{row}">
-        <slot :row="row"></slot>
-      </template>
-    </TableForm>
-  </div>
+          <TableForm
+            ref="tableFormRef"
+            style="width:100%;"
+            :maxHeight = "490"
+            :tableFields="tableAllSchemas.tableFormColumns"
+            :tableFormRules="tableFormRules"
+            :tableData="data.packageVOList"
+            :isShowButton="false"
+            :isShowReduceButton="false"
+          />
+        </div>
         <el-tabs
           v-model="editableTabsValue"
           class="demo-tabs"
@@ -131,11 +127,11 @@
                 <el-col :span="12">
                   <el-form-item
                     label="采样过程编码"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethod"
+                    prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
                   >
                     <div style="display: flex; width: 100%">
                       <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionName"
+                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName"
                         disabled
                         placeholder="请选择采样过程编码"
                       />
@@ -715,17 +711,26 @@ const validateForm = (formRef) => {
       return false
     })
 }
-
+const tableFormRef = ref()
 const submitForm = async () => {
   try {
     console.log(data.value.subList)
-    // const validateForm1 = await validateForm(formMainRef.value)
     const elForm = unref(formMainRef)?.getElFormRef()
     // 校验表单
     if (!elForm) return
     const valid = await elForm.validate()
     if (!valid) return
-    // const bol1 = await validateForm(formProcessRef.value)
+    // 校验包装列表
+    const validateForm1 = await tableFormRef.value.validateForm()
+    if (!validateForm1) return
+    let number = 0
+    data.value.packageVOList.forEach(cur=>{
+      number += parseFloat(cur.sampleAmount)
+    })
+    if(number > data.value.sampleTotalAmount){
+      message.error(`采样数量之和不可以大于总数量`)
+      return
+    }
     const bol2 = await validateForm(formFeaturesRef.value)
     if (!bol2) {
       message.error(`模板中有检验工序和检验特性未填写完全`)
@@ -785,7 +790,6 @@ const submitForm = async () => {
       message.error('检验特性中有开始时间大于结束时间')
       return;
     }
-    return;
     if (formType.value == 'create') {
       // 主子表——提交请求
       emit('submitForm', formType.value, data.value)
diff --git a/src/views/qms/inspection/inspectionJob/detail.vue b/src/views/qms/inspection/inspectionJob/detail.vue
index 5c401950d..cb2d9d51c 100644
--- a/src/views/qms/inspection/inspectionJob/detail.vue
+++ b/src/views/qms/inspection/inspectionJob/detail.vue
@@ -110,11 +110,11 @@
               <el-col :span="12">
                 <el-form-item
                   label="采样过程编码"
-                  prop="inspectionJobCharacteristicsRespVO.inspectionMethod"
+                  prop="inspectionJobCharacteristicsRespVO.samplingProcessCode"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionJobCharacteristicsRespVO.inspectionName"
+                      v-model="item.inspectionJobCharacteristicsRespVO.samplingProcessName"
                       disabled
                       placeholder="请选择采样过程编码"
                     />
diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
index 2b3f7af27..cfbacc86e 100644
--- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
@@ -2,6 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter2 } from '@/utils/formatTime'
 import { validateHanset, validateEmail } from '@/utils/validator'
 import { dateFormatter } from '@/utils/formatTime'
+import { validateTwoNum } from '@/utils/validator'
 const { t } = useI18n() // 国际化
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 const resultEntryMethodList =  getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)
@@ -484,11 +485,11 @@ export const InspectionJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },{
     label: '检验方法',
-    field: 'inspectionJobCharacteristicsRespVO.inspectionMethodName',
+    field: 'inspectionJobCharacteristicsRespVO.inspectionMethodCode',
     sort: 'custom',
   },{
     label: '采样过程编码',
-    field: 'inspectionJobCharacteristicsRespVO.inspectionMethod',
+    field: 'inspectionJobCharacteristicsRespVO.samplingProcessCode',
     sort: 'custom',
   },{
     label: '动态修改规则编码',
@@ -587,3 +588,8 @@ export const InspectionJobPackage = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
 ]))
+//表单校验
+export const InspectionJobPackageRules = reactive({
+  sampleAmount: [required,
+    { validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}]
+})