|
|
@ -478,10 +478,10 @@ |
|
|
|
" |
|
|
|
> |
|
|
|
<el-form-item label="检验值" required> |
|
|
|
<el-input |
|
|
|
<el-input-number |
|
|
|
v-model="cur.inspectionValue" |
|
|
|
placeholder="请输入检验值" |
|
|
|
type="number" |
|
|
|
:min="0" |
|
|
|
@change="inspectionValueInput(item, cur)" |
|
|
|
@blur="inspectionValueInput(item, cur)" |
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
@ -643,7 +643,7 @@ const formProcessRef = ref() |
|
|
|
const formSchema = ref(props.formAllSchemas?.formSchema) |
|
|
|
const tableAllSchemas = ref(props.tableAllSchemas) |
|
|
|
const tableFormRules = ref(props.tableFormRules) |
|
|
|
const collapseShow = ref(['1','2','3']) |
|
|
|
const collapseShow = ref(['1', '2', '3']) |
|
|
|
|
|
|
|
const data = ref({ |
|
|
|
code: '', |
|
|
@ -773,7 +773,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any |
|
|
|
inspectionValue: '', //检验值 |
|
|
|
qualitativeCode: '', //定性字典项值 |
|
|
|
defectLevel: '', //缺陷级别 |
|
|
|
qualifiedQuantity:parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量 |
|
|
|
qualifiedQuantity: parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量 |
|
|
|
unqualifiedQuantity: '0' //不合格数量 |
|
|
|
}) |
|
|
|
} |
|
|
@ -1412,6 +1412,9 @@ const inspectionValueInput = (item, cur) => { |
|
|
|
i++ |
|
|
|
) { |
|
|
|
item.isPass = true |
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit = false |
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget = 10 |
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping = 10.1 |
|
|
|
// 如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标 |
|
|
|
if ( |
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && |
|
|
@ -1479,22 +1482,22 @@ const inspectionValueInput = (item, cur) => { |
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && |
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i] |
|
|
|
.inspectionValue && |
|
|
|
(parseFloat(cur.inspectionValue) > |
|
|
|
(parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > |
|
|
|
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || |
|
|
|
parseFloat(cur.inspectionValue) < |
|
|
|
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < |
|
|
|
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)) |
|
|
|
) { |
|
|
|
item.isPass = false |
|
|
|
return |
|
|
|
} |
|
|
|
// 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标 |
|
|
|
// 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标 |
|
|
|
if ( |
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && |
|
|
|
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && |
|
|
|
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && |
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && |
|
|
|
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && |
|
|
|
(parseFloat(cur.inspectionValue) > |
|
|
|
(parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > |
|
|
|
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) || |
|
|
|
parseFloat(cur.inspectionValue) < |
|
|
|
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < |
|
|
|
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) |
|
|
|
) { |
|
|
|
item.isPass = false |
|
|
|