From c0a47a94f5c4b836b218f87ece1c399071694c9c Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Tue, 9 Apr 2024 10:59:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/basicDataManage/inspectionPlan/addForm.vue  | 13 ++++++++++++-
 .../qms/basicDataManage/inspectionPlan/index.vue    |  7 ++++---
 .../inspectionPlan/inspectionPlan.data.ts           |  4 ++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index 71089d8c5..076329a63 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -10,7 +10,7 @@
       <div style="max-height: 80vh; overflow-y: auto; padding: 0px 20px">
         <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
           <el-row gutter="20">
-            <el-col :span="12">
+            <el-col :span="12" v-if="data.code">
               <el-form-item label="编码" prop="code">
                 <el-input v-model="data.code" placeholder="根据系统生成" :disabled="true" />
               </el-form-item>
@@ -41,6 +41,11 @@
                 </div>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+            <el-form-item label="描述" prop="description">
+              <el-input v-model="data.description" placeholder="请填写描述" />
+            </el-form-item>
+          </el-col>
             <el-col :span="12">
               <el-form-item label="版本" prop="version">
                 <el-input v-model="data.version" placeholder="请填写版本" />
@@ -695,6 +700,7 @@ const data = ref({
   expirationDate: '',
   available: 'TRUE',
   dynamicUpdateCode: '',
+  description:'',
   process: []
 })
 
@@ -715,6 +721,9 @@ const rules = ref({
   programmeTemplateCode: [
     { required: true, message: '请选择检验模板', trigger: ['blur', 'change'] }
   ],
+  description: [
+    { required: true, message: '请选择描述', trigger: 'blur' }
+  ],
   splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
   aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
   inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }],
@@ -811,6 +820,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       expirationDate: '',
       available: 'TRUE',
       dynamicUpdateCode:'',
+      description:"",
       process: []
     }
   }
@@ -946,6 +956,7 @@ const submitForm = async () => {
       return
     }
     if (formType.value == 'create') {
+      
       // 主子表——提交请求
       emit('submitForm', formType.value, data.value)
     } else {
diff --git a/src/views/qms/basicDataManage/inspectionPlan/index.vue b/src/views/qms/basicDataManage/inspectionPlan/index.vue
index 3100b2887..6976a0ca5 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/index.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/index.vue
@@ -85,7 +85,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:agv-locationrelation:create'}), // 新增
+  defaultButtons.defaultAddBtn({hasPermi:'qms:type-template:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'wms:agv-locationrelation:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
@@ -119,8 +119,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'qms:inspectionTemplate:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspectionTemplate:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:type-template:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:type-template:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -156,6 +156,7 @@ const submitForm = async (formType,data) => {
     id: data.id,
     dynamicUpdateCode:data.dynamicUpdateCode,
     code: data.code,
+    description: data.description,
     itemCode: data.itemCode,
     version: data.version,
     testTypeCode: data.testTypeCode,
diff --git a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
index ce47fa895..ef9822546 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
+++ b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
@@ -102,6 +102,10 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch:true,
+  }, {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
   },{
     label: '版本',
     field: 'version',