|
|
@ -52,7 +52,7 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="检验类型" prop="testTypeCode"> |
|
|
|
<el-form-item label="检验类型" prop="inspectionType"> |
|
|
|
<!-- <div style="display: flex; width: 100%"> |
|
|
|
<el-input v-model="data.testTypeName" disabled placeholder="请选择检验类型" /> |
|
|
|
<el-button |
|
|
@ -75,7 +75,7 @@ |
|
|
|
><Icon icon="ep:search" /> |
|
|
|
</el-button> |
|
|
|
</div> --> |
|
|
|
<el-select v-model="data.testTypeCode" placeholder="请选择检验类型"> |
|
|
|
<el-select v-model="data.inspectionType" placeholder="请选择检验类型"> |
|
|
|
<el-option |
|
|
|
v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_TYPE)" |
|
|
|
:key="dict.value" |
|
|
@ -691,7 +691,7 @@ const data = ref({ |
|
|
|
code: '', |
|
|
|
itemCode: '', |
|
|
|
version: '', |
|
|
|
testTypeCode: '', |
|
|
|
inspectionType:'', |
|
|
|
programmeTemplateCode: '', |
|
|
|
splitRule: '', |
|
|
|
aql: '', |
|
|
@ -717,7 +717,7 @@ if (props.basicFormWidth) { |
|
|
|
const rules = ref({ |
|
|
|
itemCode: [{ required: true, message: '请选择物料', trigger: 'blur' }], |
|
|
|
version: [{ required: true, message: '请填写版本', trigger: 'blur' }], |
|
|
|
testTypeCode: [{ required: true, message: '请选择检验类型', trigger: ['blur', 'change'] }], |
|
|
|
inspectionType: [{ required: true, message: '请选择检验类型', trigger: ['blur', 'change'] }], |
|
|
|
programmeTemplateCode: [ |
|
|
|
{ required: true, message: '请选择检验模板', trigger: ['blur', 'change'] } |
|
|
|
], |
|
|
@ -811,7 +811,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any |
|
|
|
code: '', |
|
|
|
itemCode: '', |
|
|
|
version: '', |
|
|
|
testTypeCode: '', |
|
|
|
inspectionType: '', |
|
|
|
programmeTemplateCode: '', |
|
|
|
splitRule: '', |
|
|
|
aql: '', |
|
|
@ -1081,7 +1081,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => { |
|
|
|
data.value[formField] = val[0].code |
|
|
|
if (formField == 'itemCode') { |
|
|
|
data.value.itemName = val[0].name |
|
|
|
} else if (formField == 'testTypeCode') { |
|
|
|
} else if (formField == 'inspectionType') { |
|
|
|
data.value.testTypeName = val[0].description |
|
|
|
} else if (formField == 'programmeTemplateCode') { |
|
|
|
data.value.programmeTemplateName = val[0].description |
|
|
|