From 728cf8eca0fca50abeb081b458871fe5a3d0f933 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Tue, 9 Apr 2024 08:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionPlan/addForm.vue                |  1 -
 .../inspectionPlan/inspectionPlan.data.ts     | 11 +++++++
 .../inspectionTemplate/addForm.vue            | 30 +++++++++----------
 .../inspectionTemplate.data.ts                |  5 ++++
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index 3c09b3f7a..71089d8c5 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -213,7 +213,6 @@
         </el-form>
         <el-tabs
           v-model="editableTabsValue"
-          editable
           class="demo-tabs"
           @edit="handleTabsEdit"
           type="border-card"
diff --git a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
index d09caed25..ce47fa895 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
+++ b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
@@ -85,6 +85,15 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch:true,
+  },
   {
     label: '物料编码',
     field: 'itemCode',
@@ -103,6 +112,8 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
   },{
     label: '检验类型编码',
     field: 'testTypeCode',
+    dictType: DICT_TYPE.INSPECTION_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index b97f28bdd..7964107f1 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -27,14 +27,14 @@
           </el-col>
           <el-col :span="12">
                 <el-form-item
-                  label="动态修改规则编码"
+                  label="动态修改规则"
                   prop="dynamicUpdateCode"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
                       v-model="data.dynamicUpdateName"
                       disabled
-                      placeholder="请选择动态修改规则编码"
+                      placeholder="请选择动态修改规则"
                     />
                     <el-button
                       type="info"
@@ -44,7 +44,7 @@
                         opensearchTable(
                           'dynamicUpdateCode',
                           null,
-                          '动态修改规则编码',
+                          '动态修改规则',
                           DynamicRule.allSchemas,
                           DynamicRuleApi.getDynamicRulePage,
                           [
@@ -97,7 +97,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="检验方案模板编码">
+                <el-form-item label="检验方案模板">
                   <el-input
                     v-model="item.inspectionCode"
                     placeholder="根据系统生成"
@@ -116,7 +116,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="检验特性编码">
+                <el-form-item label="检验特性">
                   <el-input
                     v-model="item.inspectionCharCode"
                     placeholder="根据系统生成"
@@ -192,7 +192,7 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.samplingProcessName"
                       disabled
-                      placeholder="请选择采样过程编码"
+                      placeholder="请选择采样过程"
                     />
                     <el-button
                       type="info"
@@ -202,7 +202,7 @@
                         opensearchTable(
                           'samplingProcessCode',
                           null,
-                          '采样过程编码',
+                          '采样过程',
                           SamplingProcess.allSchemas,
                           SamplingProcessApi.getSamplingProcessPage,
                           [
@@ -349,7 +349,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item
-                  label="选择集编码"
+                  label="选择集"
                   prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
                   v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
                 >
@@ -357,7 +357,7 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyName"
                       disabled
-                      placeholder="请选择选择集编码"
+                      placeholder="请选择选择集"
                     />
                     <el-button
                       type="info"
@@ -367,7 +367,7 @@
                         opensearchTable(
                           'quantifyQuantifyCode',
                           null,
-                          '选择集编码',
+                          '选择集',
                           SelectedSet.allSchemas,
                           SelectedSetApi.getSelectedSetPage,
                           [
@@ -493,17 +493,17 @@ if (props.basicFormWidth) {
 const rules = ref({
   description: [{ required: true, message: '请填写描述', trigger: 'blur' }],
   version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
-  inspectionCode: [{ required: true, message: '请选择检验方案模板编码', trigger: 'blur' }],
+  inspectionCode: [{ required: true, message: '请选择检验方案模板', trigger: 'blur' }],
   sequenceCode: [{ required: true, message: '请填写顺序号', trigger: 'blur' }],
-  inspectionCharCode: [{ required: true, message: '请选择检验特性编码', trigger: 'blur' }],
+  inspectionCharCode: [{ required: true, message: '请选择检验特性', trigger: 'blur' }],
   'inspectionCharacteristicsBaseVO.description': [
     { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
   ],
   'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
-    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+    { required: true, message: '请选择检验方法', trigger: 'blur' }
   ],
   dynamicUpdateCode: [
-    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
+    { required: true, message: '请选择动态修改规则', trigger: ['blur', 'change'] }
   ],
   'inspectionCharacteristicsBaseVO.samplingProcessCode': [
     { required: true, message: '请选择采样过程', trigger: ['blur', 'change'] }
@@ -530,7 +530,7 @@ const rules = ref({
     { required: true, message: '请输入小数位', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
-    { required: true, message: '请输入选择集编码', trigger: 'blur' }
+    { required: true, message: '请输入选择集', trigger: 'blur' }
   ]
 })
 /** 打开弹窗 */
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
index b5958e6bb..425576ac8 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
+++ b/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
@@ -86,6 +86,11 @@ export const InspectionTemplateMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'description',
     sort: 'custom',
   },{
+    label: '动态修改规则',
+    field: 'dynamicUpdateName',
+    sort: 'custom',
+  },
+  ,{
     label: '版本',
     field: 'version',
     sort: 'custom',