Browse Source

首件检验记录bug

hella_online_20240829
张立 6 months ago
parent
commit
3b98eaaa87
  1. 250
      src/views/qms/inspectionRecordFirst/addForm.vue

250
src/views/qms/inspectionRecordFirst/addForm.vue

@ -34,9 +34,12 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input v-model="data.itemCode" placeholder="请选择物料编码" <el-input
@blur="onBlur('item', ItemBasicApi.getItembasicPage)" v-model="data.itemCode"
@focus="onFocus"/> placeholder="请选择物料编码"
@blur="onItemBlur('itemCode', ItemBasicApi.getItembasicPage)"
@focus="onFocus"
/>
<el-button type="info" plain style="width: 40px" @click="opensearchItemsTable()" <el-button type="info" plain style="width: 40px" @click="opensearchItemsTable()"
><Icon icon="ep:search" /> ><Icon icon="ep:search" />
</el-button> </el-button>
@ -45,7 +48,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料名称" prop="itemName"> <el-form-item label="物料名称" prop="itemName">
<el-input v-model="data.itemName" placeholder="请填写描述" disabled /> <el-input v-model="data.itemName" placeholder="请填写名称" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -59,8 +62,14 @@
<el-input <el-input
v-model="data.inspectionSchemeCode" v-model="data.inspectionSchemeCode"
placeholder="请选择检验方案" placeholder="请选择检验方案"
@blur="onBlur('inspectionScheme', InspectionSchemeApi.InspectionSchemePage)" @blur="
@focus="onFocus"/> onInspectionSchemeBlur(
'inspectionSchemeCode',
InspectionSchemeApi.InspectionSchemePage
)
"
@focus="onFocus"
/>
<el-button <el-button
type="info" type="info"
plain plain
@ -194,7 +203,9 @@
> >
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
"
disabled disabled
placeholder="请选择检验方法" placeholder="请选择检验方法"
/> />
@ -208,7 +219,9 @@
> >
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
"
disabled disabled
placeholder="请选择采样过程编码" placeholder="请选择采样过程编码"
/> />
@ -216,10 +229,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="样品份数" prop="samplingProcessRespVO.sampleQty">
label="样品份数"
prop="samplingProcessRespVO.sampleQty"
>
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.samplingProcessRespVO.sampleQty" v-model="item.samplingProcessRespVO.sampleQty"
@ -450,7 +460,6 @@
v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
.recordInspectionQuantifyList" .recordInspectionQuantifyList"
:key="i" :key="i"
> >
<div <div
style=" style="
@ -458,12 +467,15 @@
border-radius: 4px; border-radius: 4px;
padding-top: 16px; padding-top: 16px;
margin-bottom: 10px; margin-bottom: 10px;
"> "
>
<el-row :gutter="20"> <el-row :gutter="20">
<!-- 汇总录入的时候显示 --> <!-- 汇总录入的时候显示 -->
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1
"
> >
<el-form-item label="合格数量" required> <el-form-item label="合格数量" required>
<el-input <el-input
@ -475,7 +487,9 @@
</el-col> </el-col>
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1
"
> >
<el-form-item label="不合格数量" required> <el-form-item label="不合格数量" required>
<el-input <el-input
@ -517,14 +531,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col <el-col :span="12">
:span="12"
>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input <el-input
v-model="cur.remark" v-model="cur.remark"
placeholder="请输入备注" placeholder="请输入备注"
type="text" maxlength="200" type="text"
maxlength="200"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -544,7 +557,6 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<template #footer> <template #footer>
<ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" :key="count" /> <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" :key="count" />
@ -581,11 +593,9 @@ import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDe
import { SearchTable } from '@/components/SearchTable' import { SearchTable } from '@/components/SearchTable'
import * as InspectionRecordDetail from '@/api/qms/inspectionRecord/inspectionRecordDetail' import * as InspectionRecordDetail from '@/api/qms/inspectionRecord/inspectionRecordDetail'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
import * as ItemBasicApi from '@/api/wms/itembasic' import * as ItemBasicApi from '@/api/wms/itembasic'
import { InspectionSchemeMain } from '@/views/qms/inspectionScheme/inspectionScheme.data' import { InspectionSchemeMain } from '@/views/qms/inspectionScheme/inspectionScheme.data'
import * as InspectionSchemeApi from '@/api/qms/InspectionScheme' import * as InspectionSchemeApi from '@/api/qms/InspectionScheme'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
@ -639,7 +649,7 @@ const props = defineProps({
type: Object, type: Object,
required: true, required: true,
default: null default: null
}, }
}) })
const { t } = useI18n() // const { t } = useI18n() //
@ -678,9 +688,7 @@ if (props.basicFormWidth) {
dialogWidth.value = props.isBusiness ? '60%' : '40%' dialogWidth.value = props.isBusiness ? '60%' : '40%'
} }
const rules = ref({ const rules = ref({
'inspectionTime': [ inspectionTime: [{ required: true, message: '请选择检验时间', trigger: 'blur' }],
{ required: true, message: '请选择检验时间', trigger: 'blur' }
],
'inspectionJobCharacteristicsUpdateReqVO.description': [ 'inspectionJobCharacteristicsUpdateReqVO.description': [
{ required: true, message: '请填写描述', trigger: ['blur', 'change'] } { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
], ],
@ -774,18 +782,17 @@ const processList =async (InspectionSchemeObj,list) => {
).toFixed(6) ).toFixed(6)
) )
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1 ? item.inspectionJobCharacteristicsUpdateReqVO.qualitativeRespVOList : item.inspectionJobCharacteristicsUpdateReqVO.quantifyRespVOList item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList =
item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1
? item.inspectionJobCharacteristicsUpdateReqVO.qualitativeRespVOList
: item.inspectionJobCharacteristicsUpdateReqVO.quantifyRespVOList
if (!item?.inspectionJobCharacteristicsUpdateReqVO?.recordInspectionQuantifyList) { if (!item?.inspectionJobCharacteristicsUpdateReqVO?.recordInspectionQuantifyList) {
// //
if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) {
// rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
for ( for (let i = 0; i < parseInt(item.samplingProcessRespVO.sampleQty); i++) {
let i = 0;
i < parseInt(item.samplingProcessRespVO.sampleQty);
i++
) {
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', // inspectionValue: '', //
qualitativeCode: '', // qualitativeCode: '', //
@ -1094,7 +1101,7 @@ const opensearchItemsTable = () => {
const opensearchInspectionTable = () => { const opensearchInspectionTable = () => {
if (!data.value.itemCode) { if (!data.value.itemCode) {
message.error(`请选择物料`) message.error(`请选择物料`)
return; return
} }
const _searchCondition = {} const _searchCondition = {}
const filters: any[] = [] const filters: any[] = []
@ -1183,11 +1190,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) {
// rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
for ( for (let i = 0; i < parseInt(item.samplingProcessRespVO.sampleQty); i++) {
let i = 0;
i < parseInt(item.samplingProcessRespVO.sampleQty);
i++
) {
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', // inspectionValue: '', //
qualitativeCode: '', // qualitativeCode: '', //
@ -1200,7 +1203,8 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
// //
console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO) console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO)
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required =
false
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', // inspectionValue: '', //
qualitativeCode: '', // qualitativeCode: '', //
@ -1225,7 +1229,8 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) { if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
} else { } else {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
false
} }
if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) { if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
@ -1264,11 +1269,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) {
// rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
for ( for (let i = 0; i < parseInt(item.samplingProcessRespVO.sampleQty); i++) {
let i = 0;
i < parseInt(item.samplingProcessRespVO.sampleQty);
i++
) {
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', // inspectionValue: '', //
qualitativeCode: '', // qualitativeCode: '', //
@ -1281,7 +1282,8 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
// //
console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO) console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO)
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required =
false
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', // inspectionValue: '', //
qualitativeCode: '', // qualitativeCode: '', //
@ -1306,7 +1308,8 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) { if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
} else { } else {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
false
} }
if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) { if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
@ -1383,15 +1386,22 @@ const boxList = ref()
// }) // })
// } // }
const inspectionValueInput = (item, cur) => { const inspectionValueInput = (item, cur) => {
for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) { for (
let i = 0;
i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
i++
) {
item.isPass = true item.isPass = true
// , // ,
if ( if (
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) .inspectionValue &&
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
) { ) {
item.isPass = false item.isPass = false
return return
@ -1401,8 +1411,11 @@ const inspectionValueInput = (item, cur) => {
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit) .inspectionValue &&
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
) { ) {
item.isPass = false item.isPass = false
return return
@ -1412,8 +1425,11 @@ const inspectionValueInput = (item, cur) => {
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) .inspectionValue &&
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
) { ) {
item.isPass = false item.isPass = false
return return
@ -1423,9 +1439,15 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || .inspectionValue &&
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) (parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
.inspectionValue
) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1435,9 +1457,12 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
(parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)|| .inspectionValue &&
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)) (parseFloat(cur.inspectionValue) >
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(cur.inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1447,8 +1472,10 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
(parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)|| (parseFloat(cur.inspectionValue) >
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
parseFloat(cur.inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1458,19 +1485,80 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
(parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || .inspectionValue &&
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) (parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
.inspectionValue
) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false
return return
} }
} }
} }
const onItemBlur = async (field, pageApi) => {
if (data.value[field]) {
const _searchCondition = {}
const filters: any[] = []
filters.push(
{
action: '==',
column: 'available',
value: 'TRUE'
},
{
column: 'type',
action: 'in',
value: 'BCP,CCP'
},
{
column: 'code',
action: '==',
value: data.value[field]?.trim()
}
)
//
_searchCondition.isSearch = true
_searchCondition.filters = filters
_searchCondition.pageNo = 1
_searchCondition.pageSize = 20
_searchCondition.by = 'ASC'
const array = await pageApi(_searchCondition)
Butttondata = [
defaultButtons.formSaveBtn(null), //
defaultButtons.formCloseBtn(null) //
]
count.value++
const obj = array.list[0]
if (obj) {
// data.value['itemName'] = obj.name
// data.value['desc1'] = obj.desc1
// const searchTableSuccess = async(formField, searchField, val, type, row)
searchTableSuccess(field,'code',array.list,'main')
} else {
message.alert('暂无数据')
data.value[field] = ''
data.value['itemName'] = ''
data.value['desc1'] = ''
data.value['inspectionSchemeCode'] = ''
data.value.subList =[]
}
} else {
data.value[field] = ''
Butttondata = [
defaultButtons.formSaveBtn(null), //
defaultButtons.formCloseBtn(null) //
]
count.value++
}
}
// //
const onBlur = async (field, pageApi, item) => { const onInspectionSchemeBlur = async (field, pageApi) => {
const dataObj = item ? item.inspectionCharacteristicsBaseVO : data.value if (data.value[field]) {
if (dataObj[field + 'Code']) {
const _searchCondition = {} const _searchCondition = {}
const filters: any[] = [] const filters: any[] = []
filters.push( filters.push(
@ -1482,12 +1570,25 @@ const onBlur = async (field, pageApi, item) => {
{ {
column: 'code', column: 'code',
action: '==', action: '==',
value: dataObj[field + 'Code']?.trim() value: data.value[field]?.trim()
},
{
column: 'itemCode',
action: '==',
value: data.value.itemCode
},
{
column: 'inspectionType',
action: '==',
value: data.value.inspectionType
} }
) )
// //
_searchCondition.isSearch = true _searchCondition.isSearch = true
_searchCondition.filters = filters _searchCondition.filters = filters
_searchCondition.pageNo = 1
_searchCondition.pageSize = 20
_searchCondition.by = 'ASC'
const array = await pageApi(_searchCondition) const array = await pageApi(_searchCondition)
Butttondata = [ Butttondata = [
defaultButtons.formSaveBtn(null), // defaultButtons.formSaveBtn(null), //
@ -1496,14 +1597,15 @@ const onBlur = async (field, pageApi, item) => {
count.value++ count.value++
const obj = array.list[0] const obj = array.list[0]
if (obj) { if (obj) {
dataObj[field + 'Name'] = obj.description searchTableSuccess(field,'code',array.list,'main')
} else { } else {
message.alert('暂无数据') message.alert('暂无数据')
dataObj[field + 'Code'] = '' data.value[field] = ''
dataObj[field + 'Name'] = '' data.value['inspectionSchemeName'] = ''
data.value.subList =[]
} }
} else { } else {
dataObj[field + 'Name'] = '' data.value['inspectionSchemeName'] = ''
Butttondata = [ Butttondata = [
defaultButtons.formSaveBtn(null), // defaultButtons.formSaveBtn(null), //
defaultButtons.formCloseBtn(null) // defaultButtons.formCloseBtn(null) //

Loading…
Cancel
Save