From 5b9f20c1511ed2e454cebb28056b89bb2ebec46d Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Sun, 7 Apr 2024 17:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E7=89=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionTemplate/addForm.vue            | 116 ++++++++++--------
 1 file changed, 62 insertions(+), 54 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index 2d701589d..b97f28bdd 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -25,6 +25,45 @@
               <el-input v-model="data.version" placeholder="请填写版本" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+                <el-form-item
+                  label="动态修改规则编码"
+                  prop="dynamicUpdateCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="data.dynamicUpdateName"
+                      disabled
+                      placeholder="请选择动态修改规则编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'dynamicUpdateCode',
+                          null,
+                          '动态修改规则编码',
+                          DynamicRule.allSchemas,
+                          DynamicRuleApi.getDynamicRulePage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                          false,
+                          null,
+                          data
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
         </el-row>
       </el-form>
       <el-tabs
@@ -85,6 +124,7 @@
                   />
                 </el-form-item>
               </el-col>
+              
             </el-row>
           </el-form>
           <div class="small-title">检验特性</div>
@@ -146,11 +186,11 @@
               <el-col :span="12">
                 <el-form-item
                   label="采样过程编码"
-                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
+                  prop="inspectionCharacteristicsBaseVO.samplingProcessCode"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.inspectionName"
+                      v-model="item.inspectionCharacteristicsBaseVO.samplingProcessName"
                       disabled
                       placeholder="请选择采样过程编码"
                     />
@@ -160,7 +200,7 @@
                       style="width: 40px"
                       @click="
                         opensearchTable(
-                          'inspectionMethod',
+                          'samplingProcessCode',
                           null,
                           '采样过程编码',
                           SamplingProcess.allSchemas,
@@ -182,45 +222,7 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="动态修改规则编码"
-                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
-                >
-                  <div style="display: flex; width: 100%">
-                    <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateName"
-                      disabled
-                      placeholder="请选择动态修改规则编码"
-                    />
-                    <el-button
-                      type="info"
-                      plain
-                      style="width: 40px"
-                      @click="
-                        opensearchTable(
-                          'dynamicUpdateCode',
-                          null,
-                          '动态修改规则编码',
-                          DynamicRule.allSchemas,
-                          DynamicRuleApi.getDynamicRulePage,
-                          [
-                            {
-                              key: 'available',
-                              value: 'TRUE',
-                              isMainValue: false
-                            }
-                          ],
-                          false,
-                          'features',
-                          item
-                        )
-                      "
-                      ><Icon icon="ep:search"
-                    /></el-button>
-                  </div>
-                </el-form-item>
-              </el-col>
+              
               <el-col :span="12">
                 <el-form-item
                   label="是否允许修改特征值"
@@ -353,7 +355,7 @@
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyName"
                       disabled
                       placeholder="请选择选择集编码"
                     />
@@ -376,7 +378,7 @@
                             }
                           ],
                           false,
-                          null,
+                          'features',
                           item
                         )
                       "
@@ -474,6 +476,7 @@ const data = ref({
   code: '',
   description: '',
   version: '',
+  dynamicUpdateCode:'',
   process: []
 })
 
@@ -499,12 +502,12 @@ const rules = ref({
   'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
     { required: true, message: '请选择检验方法编码', trigger: 'blur' }
   ],
-  'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [
-    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.inspectionMethod': [
+  dynamicUpdateCode: [
     { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
   ],
+  'inspectionCharacteristicsBaseVO.samplingProcessCode': [
+    { required: true, message: '请选择采样过程', trigger: ['blur', 'change'] }
+  ],
   'inspectionCharacteristicsBaseVO.resultEntryMethod': [
     { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
   ],
@@ -617,13 +620,13 @@ const buttonBaseClick1 = (val) => {
           description: nameForm.value.name,
           name: newTabName,
           inspectionCode: '',
+          dynamicUpdateCode:'',
           sequenceCode: '',
           inspectionCharCode: '',
           inspectionCharacteristicsBaseVO: {
             describe: '',
             inspectionMethodCode: '',
-            dynamicUpdateCode: '',
-            inspectionMethod: '',
+            samplingProcessCode: '',
             isCanUpdate: '',
             isDestructionInspection: '',
             resultEntryMethod: '',
@@ -821,10 +824,15 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
     row.inspectionCharacteristicsBaseVO[formField] = val[0].code
     if(formField == 'inspectionMethodCode'){
       row.inspectionCharacteristicsBaseVO.inspectionMethodName = val[0].description
-    }else if(formField == 'dynamicUpdateCode'){
-      row.inspectionCharacteristicsBaseVO.dynamicUpdateName = val[0].description
-    }else if(formField == 'inspectionMethod'){
-      row.inspectionCharacteristicsBaseVO.inspectionName = val[0].description
+    }else if(formField == 'samplingProcessCode'){
+      row.inspectionCharacteristicsBaseVO.samplingProcessName = val[0].description
+    }else if(formField == 'quantifyQuantifyCode'){
+      row.inspectionCharacteristicsBaseVO.quantifyQuantifyName = val[0].description
+    }
+  }else{
+    if(formField == 'dynamicUpdateCode'){
+      data.value[formField] = val[0].code
+      data.value.dynamicUpdateName = val[0].description
     }
   }