diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue index 8dcf9e3..035a858 100644 --- a/src/views/resource/customer/examine/detail.vue +++ b/src/views/resource/customer/examine/detail.vue @@ -91,18 +91,18 @@ createUserName: '', createTime: '', }) -const measureMethodTypeArray = ref>([]) +// const measureMethodTypeArray = ref>([]) // 校验方法 -const methodTypeValidator = (rule: any, value: string, callback: any) => { - if (measureMethodTypeArray.value.length === 0) { - return callback(new Error('测试、校准或检定方法类型不能为空,请勾选')) - } - else { - examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',') - callback() - } -} +// const methodTypeValidator = (rule: any, value: string, callback: any) => { +// if (measureMethodTypeArray.value.length === 0) { +// return callback(new Error('测试、校准或检定方法类型不能为空,请勾选')) +// } +// else { +// examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',') +// callback() +// } +// } const examineRules = ref({ labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }], @@ -116,7 +116,8 @@ numberOfPeople: [{ required: true, message: '检定人员人数不能为空', trigger: 'blur' }], staffCert: [{ required: true, message: '人员持证情况不能为空', trigger: 'blur' }], measureMethodName: [{ required: true, message: '方法名称不能为空', trigger: 'blur' }], - measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }], + measureMethodType: [{ required: true, message: '测试、校准或检定方法类型不能为空', trigger: 'blur' }], + // measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }], measureMethodControlled: [{ required: true, message: '方法是否受控不能为空', trigger: ['change', 'blur'] }], measureMethodConfirm: [{ required: true, message: '方法是否确认不能为空', trigger: ['change', 'blur'] }], }) // 表单验证规则 @@ -408,7 +409,7 @@ } if (row.measureMethodType !== undefined && row.measureMethodType !== null && row.measureMethodType !== '') { examineInfo.value.measureMethodType = row.measureMethodType - measureMethodTypeArray.value = row.measureMethodType.split(',') + // measureMethodTypeArray.value = row.measureMethodType.split(',') examineMethodForm.value.validateField('measureMethodType') } if (row.measureMethodControlled !== undefined && row.measureMethodControlled !== null && `${row.measureMethodControlled}` !== '') { @@ -593,7 +594,7 @@ }) getExamineDetail({ id: id.value }).then((res) => { examineInfo.value = res.data - measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',') + // measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',') loading.close() }).catch(() => { loading.close() @@ -923,11 +924,16 @@ - + + + + {{ item.name }} + + diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue index 8dcf9e3..035a858 100644 --- a/src/views/resource/customer/examine/detail.vue +++ b/src/views/resource/customer/examine/detail.vue @@ -91,18 +91,18 @@ createUserName: '', createTime: '', }) -const measureMethodTypeArray = ref>([]) +// const measureMethodTypeArray = ref>([]) // 校验方法 -const methodTypeValidator = (rule: any, value: string, callback: any) => { - if (measureMethodTypeArray.value.length === 0) { - return callback(new Error('测试、校准或检定方法类型不能为空,请勾选')) - } - else { - examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',') - callback() - } -} +// const methodTypeValidator = (rule: any, value: string, callback: any) => { +// if (measureMethodTypeArray.value.length === 0) { +// return callback(new Error('测试、校准或检定方法类型不能为空,请勾选')) +// } +// else { +// examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',') +// callback() +// } +// } const examineRules = ref({ labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }], @@ -116,7 +116,8 @@ numberOfPeople: [{ required: true, message: '检定人员人数不能为空', trigger: 'blur' }], staffCert: [{ required: true, message: '人员持证情况不能为空', trigger: 'blur' }], measureMethodName: [{ required: true, message: '方法名称不能为空', trigger: 'blur' }], - measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }], + measureMethodType: [{ required: true, message: '测试、校准或检定方法类型不能为空', trigger: 'blur' }], + // measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }], measureMethodControlled: [{ required: true, message: '方法是否受控不能为空', trigger: ['change', 'blur'] }], measureMethodConfirm: [{ required: true, message: '方法是否确认不能为空', trigger: ['change', 'blur'] }], }) // 表单验证规则 @@ -408,7 +409,7 @@ } if (row.measureMethodType !== undefined && row.measureMethodType !== null && row.measureMethodType !== '') { examineInfo.value.measureMethodType = row.measureMethodType - measureMethodTypeArray.value = row.measureMethodType.split(',') + // measureMethodTypeArray.value = row.measureMethodType.split(',') examineMethodForm.value.validateField('measureMethodType') } if (row.measureMethodControlled !== undefined && row.measureMethodControlled !== null && `${row.measureMethodControlled}` !== '') { @@ -593,7 +594,7 @@ }) getExamineDetail({ id: id.value }).then((res) => { examineInfo.value = res.data - measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',') + // measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',') loading.close() }).catch(() => { loading.close() @@ -923,11 +924,16 @@ - + + + + {{ item.name }} + + diff --git a/src/views/system/baseInfo/templateRegister/detail.vue b/src/views/system/baseInfo/templateRegister/detail.vue index 2041333..9ce5745 100644 --- a/src/views/system/baseInfo/templateRegister/detail.vue +++ b/src/views/system/baseInfo/templateRegister/detail.vue @@ -332,7 +332,7 @@