|
@ -257,7 +257,7 @@ |
|
|
<el-select |
|
|
<el-select |
|
|
v-model="item.inspectionCharacteristicsBaseVO.featureType" |
|
|
v-model="item.inspectionCharacteristicsBaseVO.featureType" |
|
|
placeholder="请选择特征类型" |
|
|
placeholder="请选择特征类型" |
|
|
@change="changeFeatureType" |
|
|
@change="changeFeatureType($event,item)" |
|
|
> |
|
|
> |
|
|
<el-option |
|
|
<el-option |
|
|
v-for="dict in getStrDictOptions( |
|
|
v-for="dict in getStrDictOptions( |
|
@ -766,6 +766,7 @@ const submitForm = async () => { |
|
|
// 上限值,下限值,目标值都存在时,上限值应大于目标值大于下限值 |
|
|
// 上限值,下限值,目标值都存在时,上限值应大于目标值大于下限值 |
|
|
(item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && ((item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyLowlimit)||(item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyTarget)||(item.inspectionCharacteristicsBaseVO.quantifyLowlimit >= item.inspectionCharacteristicsBaseVO.quantifyTarget))) |
|
|
(item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && ((item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyLowlimit)||(item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyTarget)||(item.inspectionCharacteristicsBaseVO.quantifyLowlimit >= item.inspectionCharacteristicsBaseVO.quantifyTarget))) |
|
|
) |
|
|
) |
|
|
|
|
|
console.log(99,arr2) |
|
|
if (arr2 && arr2.length > 0) { |
|
|
if (arr2 && arr2.length > 0) { |
|
|
const str = arr2.map((item) => item.description).join(',') |
|
|
const str = arr2.map((item) => item.description).join(',') |
|
|
message.error(`${str}上限值应大目标值大于下限值`) |
|
|
message.error(`${str}上限值应大目标值大于下限值`) |
|
@ -793,13 +794,21 @@ if (props.footButttondata) { |
|
|
] |
|
|
] |
|
|
} |
|
|
} |
|
|
// 选择特征类型 |
|
|
// 选择特征类型 |
|
|
const changeFeatureType = (e) => { |
|
|
const changeFeatureType = (e,item) => { |
|
|
|
|
|
item.inspectionCharacteristicsBaseVO.quantifyIsCapping = false |
|
|
|
|
|
item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit = false |
|
|
|
|
|
item.inspectionCharacteristicsBaseVO.quantifyIsTarget = false |
|
|
|
|
|
item.inspectionCharacteristicsBaseVO.quantifyCapping = '' |
|
|
|
|
|
item.inspectionCharacteristicsBaseVO.quantifyLowlimit = '' |
|
|
|
|
|
item.inspectionCharacteristicsBaseVO.quantifyTarget= '' |
|
|
|
|
|
item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode= '' |
|
|
|
|
|
item.inspectionCharacteristicsBaseVO.quantifyQuantifyName= '' |
|
|
console.log(e) |
|
|
console.log(e) |
|
|
// if (e) { |
|
|
if (e) { |
|
|
// rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true |
|
|
rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true |
|
|
// } else { |
|
|
} else { |
|
|
// rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = false |
|
|
rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = false |
|
|
// } |
|
|
} |
|
|
} |
|
|
} |
|
|
const searchTableRef = ref() |
|
|
const searchTableRef = ref() |
|
|
const opensearchTable = ( |
|
|
const opensearchTable = ( |
|
|