sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

检验任务检验值判断问题

linshi20240813
zhang_li 4 months ago
parent
3e38753dbb
commit
c4d3155181
3 changed files with 37 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      src/views/qms/inspectionJob/addForm.vue
  2. 20
      src/views/qms/inspectionRecord/addForm.vue
  3. 24
      src/views/qms/inspectionRecordFirst/addForm.vue

27
src/views/qms/inspectionJob/addForm.vue
View File

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

20
src/views/qms/inspectionRecord/addForm.vue
View File

@ -478,10 +478,10 @@
" "
> >
<el-form-item label="检验值" required> <el-form-item label="检验值" required>
<el-input <el-input-number
v-model="cur.inspectionValue" v-model="cur.inspectionValue"
placeholder="请输入检验值" :min="0"
type="number" @change="inspectionValueInput(item, cur)"
@blur="inspectionValueInput(item, cur)" @blur="inspectionValueInput(item, cur)"
/> />
</el-form-item> </el-form-item>
@ -1492,22 +1492,22 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
.inspectionValue && .inspectionValue &&
(parseFloat(cur.inspectionValue) > (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)) parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
) { ) {
item.isPass = false item.isPass = false
return return
} }
// 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标 // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标
if ( if (
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
(parseFloat(cur.inspectionValue) > (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) || parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false

24
src/views/qms/inspectionRecordFirst/addForm.vue
View File

@ -535,10 +535,10 @@
v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'"
> >
<el-form-item label="检验值" required> <el-form-item label="检验值" required>
<el-input <el-input-number
v-model="cur.inspectionValue" v-model="cur.inspectionValue"
placeholder="请输入检验值" :min="0"
type="number" @change="inspectionValueInput(item, cur)"
@blur="inspectionValueInput(item, cur)" @blur="inspectionValueInput(item, cur)"
/> />
</el-form-item> </el-form-item>
@ -693,7 +693,7 @@ const formMainRef = ref()
const formFeaturesRef = ref() const formFeaturesRef = ref()
const formProcessRef = ref() const formProcessRef = ref()
const formSchema = ref(props.formAllSchemas?.formSchema) const formSchema = ref(props.formAllSchemas?.formSchema)
const collapseShow = ref(['1','2','3']) const collapseShow = ref(['1', '2', '3'])
const data = ref({ const data = ref({
code: '', code: '',
@ -842,7 +842,7 @@ const processList = async (InspectionSchemeObj, list) => {
inspectionValue: '', //检验值 inspectionValue: '', //检验值
qualitativeCode: '', //定性字典项值 qualitativeCode: '', //定性字典项值
defectLevel: '', //缺陷级别 defectLevel: '', //缺陷级别
qualifiedQuantity:parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量 qualifiedQuantity: parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量
unqualifiedQuantity: '0' //不合格数量 unqualifiedQuantity: '0' //不合格数量
}) })
} }
@ -1485,22 +1485,22 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
.inspectionValue && .inspectionValue &&
(parseFloat(cur.inspectionValue) > (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)) parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
) { ) {
item.isPass = false item.isPass = false
return return
} }
// 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标 // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标
if ( if (
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
(parseFloat(cur.inspectionValue) > (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) >
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) || parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false

Write Preview
Loading…
Cancel
Save