检验模板方案

src/views/qms/basicDataManage/inspectionPlan/addForm.vue

@@ -162,7 +162,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="是否可用" prop="available">
-              <el-switch v-model="data.available" />
+              <el-switch v-model="data.available" active-value="TRUE" inactive-value='FALSE'/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -606,7 +606,7 @@ const data = ref({
   inspectionLevel:'',
   effectiveDate:'',
   expirationDate:'',
-  available: true,
+  available: 'TRUE',
   process: []
 })
 
@@ -642,24 +642,12 @@ const rules = ref({
   'inspectionCharacteristicsBaseVO.inspectionMethod': [
     { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
   ],
-  'inspectionCharacteristicsBaseVO.isCanUpdate': [
-    { required: true, message: '请选择是否允许修改特征值', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.isDestructionInspection': [
-    { required: true, message: '请选择是否破坏性检验', trigger: ['blur', 'change'] }
-  ],
   'inspectionCharacteristicsBaseVO.resultEntryMethod': [
     { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
   ],
   'inspectionCharacteristicsBaseVO.featureType': [
     { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
   ],
-  'inspectionCharacteristicsBaseVO.quantifyIsCapping': [
-    { required: true, message: '请选择是否设定上限', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.quantifyIsLowlimit': [
-    { required: true, message: '请选择是否设定下限', trigger: ['blur', 'change'] }
-  ],
   'inspectionCharacteristicsBaseVO.quantifyIsTarget': [
     { required: true, message: '请选择是否设定目标值', trigger: ['blur', 'change'] }
   ],
@@ -695,8 +683,13 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   formType.value = type
   if (row) {
     data.value = row
-
-    let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
+    let list =[]
+    if(row.content){
+      list = JSON.parse(row.content)
+    }else{
+      list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
+    }
+    
     list.forEach((item, index) => {
       editableTabsValue.value = index + 1
       item.name = index + 1
@@ -721,7 +714,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   } else {
     data.value = {
       code: '',
-      description: '',
+      itemCode: '',
       version: '',
       testTypeCode:'',
       programmeTemplateCode:'',
@@ -730,7 +723,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       inspectionLevel:'',
       effectiveDate:'',
       expirationDate:'',
-      available: true,
+      available: 'TRUE',
       process: []
     }
   }

src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts

@@ -127,14 +127,30 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生效时间',
     field: 'effectiveDate',
     sort: 'custom',
+    formatter: dateFormatter,
   },{
     label: '失效时间',
     field: 'expirationDate',
     sort: 'custom',
+    formatter: dateFormatter,
   },{
     label: '是否可用',
     field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
   },
   {
     label: '操作',

src/views/qms/basicDataManage/inspectionTemplate/addForm.vue

@@ -502,28 +502,12 @@ const rules = ref({
   'inspectionCharacteristicsBaseVO.inspectionMethod': [
     { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
   ],
-  'inspectionCharacteristicsBaseVO.isCanUpdate': [
-    { required: true, message: '请选择是否允许修改特征值', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.isDestructionInspection': [
-    { required: true, message: '请选择是否破坏性检验', trigger: ['blur', 'change'] }
-  ],
   'inspectionCharacteristicsBaseVO.resultEntryMethod': [
     { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
   ],
   'inspectionCharacteristicsBaseVO.featureType': [
     { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
   ],
-  'inspectionCharacteristicsBaseVO.quantifyIsCapping': [
-    { required: true, message: '请选择是否设定上限', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.quantifyIsLowlimit': [
-    { required: true, message: '请选择是否设定下限', trigger: ['blur', 'change'] }
-  ],
-  'inspectionCharacteristicsBaseVO.quantifyIsTarget': [
-    { required: true, message: '请选择是否设定目标值', trigger: ['blur', 'change'] }
-  ],
-
   'inspectionCharacteristicsBaseVO.quantifyTarget': [
     { required: true, message: '请输入目标值', trigger: 'blur' }
   ],