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 @@ + + +
+ + +
+
+
+
检验特性
@@ -146,11 +186,11 @@
@@ -160,7 +200,7 @@ style="width: 40px" @click=" opensearchTable( - 'inspectionMethod', + 'samplingProcessCode', null, '采样过程编码', SamplingProcess.allSchemas, @@ -182,45 +222,7 @@
- - -
- - -
-
-
+
@@ -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 } }