diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts index 96170650a..289854b37 100644 --- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts +++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts @@ -1,27 +1,5 @@ import request from '@/config/axios' -export interface InspectionJobMainVO { - number: string - applicationDate: localdate - applicationTime: Date - requestStartTime: Date - requestEndTime: Date - finishTime: Date - supplierCode: string - materialCode: string - batch: string - requestInspectionNum: number - referenceOrderCode: string - referenceOrderRow: number - referenceCertificateCode: string - referenceCertificateRow: number - inspectionSchemeCode: string - inspectionStageCode: string - applicationPackageCode: string - inspectionLevel: string - aqlValue: number - available: string -} // 查询检验申请列表 export const getInspectionJobMainPage = async (params) => { @@ -40,15 +18,18 @@ export const getInspectionJobMain = async (id: number) => { } // 新增检验申请 -export const createInspectionJobMain = async (data: InspectionJobMainVO) => { +export const createInspectionJobMain = async (data) => { return await request.post({ url: `/qms/inspection-job-main/create`, data }) } // 修改检验申请 -export const updateInspectionJobMain = async (data: InspectionJobMainVO) => { +export const updateInspectionJobMain = async (data) => { return await request.put({ url: `/qms/inspection-job-main/update`, data }) } - +// 执行检验申请 +export const executeInspectionJobMain = async (data) => { + return await request.put({ url: `/qms/inspection-job-main/execute`, data }) +} // 删除检验申请 export const deleteInspectionJobMain = async (id: number) => { return await request.delete({ url: `/qms/inspection-job-main/delete?id=` + id }) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 950cbeaf7..77b9adec3 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -69,6 +69,7 @@ - - + +
-
-
-
@@ -220,11 +144,13 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -519,7 +361,7 @@ const data = ref({ effectiveDate: '', expirationDate: '', available: 'TRUE', - process: [] + subList: [] }) const dialogVisibleName = ref(false) @@ -534,40 +376,40 @@ if (props.basicFormWidth) { } const rules = ref({ ...props.rules, - 'inspectionCharacteristicsBaseVO.description': [ + 'inspectionJobCharacteristicsUpdateReqVO.description': [ { required: true, message: '请填写描述', trigger: ['blur', 'change'] } ], - 'inspectionCharacteristicsBaseVO.inspectionMethodCode': [ + 'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [ { required: true, message: '请选择检验方法编码', trigger: 'blur' } ], - 'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [ + 'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [ { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] } ], - 'inspectionCharacteristicsBaseVO.inspectionMethod': [ + 'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [ { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] } ], - 'inspectionCharacteristicsBaseVO.resultEntryMethod': [ + 'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [ { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] } ], - 'inspectionCharacteristicsBaseVO.featureType': [ + 'inspectionJobCharacteristicsUpdateReqVO.featureType': [ { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] } ], - 'inspectionCharacteristicsBaseVO.quantifyTarget': [ + 'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [ { required: true, message: '请输入目标值', trigger: 'blur' } ], - 'inspectionCharacteristicsBaseVO.quantifyCapping': [ + 'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [ { required: true, message: '请输入上限值', trigger: 'blur' } ], - 'inspectionCharacteristicsBaseVO.quantifyLowlimit': [ + 'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [ { required: true, message: '请输入下限值', trigger: 'blur' } ], - 'inspectionCharacteristicsBaseVO.quantifyUom': [ + 'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [ { required: true, message: '请选择计量单位', trigger: 'blur' } ], - 'inspectionCharacteristicsBaseVO.quantifyDecimal': [ + 'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [ { required: true, message: '请输入小数位', trigger: 'blur' } ], - 'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [ + 'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [ { required: true, message: '请输入选择集编码', trigger: 'blur' } ] }) @@ -583,40 +425,40 @@ const rules = ref({ // inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }], // effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change'] }], // expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change'] }], -// 'inspectionCharacteristicsBaseVO.description': [ +// 'inspectionJobCharacteristicsUpdateReqVO.description': [ // { required: true, message: '请填写描述', trigger: ['blur', 'change'] } // ], -// 'inspectionCharacteristicsBaseVO.inspectionMethodCode': [ +// 'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [ // { required: true, message: '请选择检验方法编码', trigger: 'blur' } // ], -// 'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [ +// 'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [ // { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] } // ], -// 'inspectionCharacteristicsBaseVO.inspectionMethod': [ +// 'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [ // { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] } // ], -// 'inspectionCharacteristicsBaseVO.resultEntryMethod': [ +// 'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [ // { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] } // ], -// 'inspectionCharacteristicsBaseVO.featureType': [ +// 'inspectionJobCharacteristicsUpdateReqVO.featureType': [ // { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] } // ], -// 'inspectionCharacteristicsBaseVO.quantifyTarget': [ +// 'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [ // { required: true, message: '请输入目标值', trigger: 'blur' } // ], -// 'inspectionCharacteristicsBaseVO.quantifyCapping': [ +// 'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [ // { required: true, message: '请输入上限值', trigger: 'blur' } // ], -// 'inspectionCharacteristicsBaseVO.quantifyLowlimit': [ +// 'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [ // { required: true, message: '请输入下限值', trigger: 'blur' } // ], -// 'inspectionCharacteristicsBaseVO.quantifyUom': [ +// 'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [ // { required: true, message: '请选择计量单位', trigger: 'blur' } // ], -// 'inspectionCharacteristicsBaseVO.quantifyDecimal': [ +// 'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [ // { required: true, message: '请输入小数位', trigger: 'blur' } // ], -// 'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [ +// 'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [ // { required: true, message: '请输入选择集编码', trigger: 'blur' } // ] // }) @@ -633,37 +475,56 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any formType.value = type if (row) { data.value = JSON.parse(JSON.stringify(row)) + console.log(data.value) let list = [] list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id) - // if (row.inspectionSchemeJson) { - // list = JSON.parse(JSON.parse(row.inspectionSchemeJson)) - // } else { - // list = await InspectionJobDetailPageApi.getListByTempleteCode(row.programmeTemplateCode) - // } -console.log(list) -console.log(typeof list) list.forEach((item, index) => { editableTabsValue.value = index + 1 item.name = index + 1 - item.inspectionCharacteristicsBaseVO = item.inspectionJobCharacteristicsRespVO + item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList=[] + // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true + if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod==0) { + // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true + for(let i=0;i { @@ -708,7 +569,7 @@ const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | }) } editableTabsValue.value = activeName - data.value.process = tabs.filter((tab) => tab.name !== targetName) + data.value.subList = tabs.filter((tab) => tab.name !== targetName) } } /** 修改名称时间 */ @@ -719,13 +580,13 @@ const buttonBaseClick1 = (val) => { nameRef.value.validate((valid, fields) => { if (valid) { const newTabName = `${++tabIndex}` - data.value.process.push({ + data.value.subList.push({ description: nameForm.value.name, name: newTabName, inspectionCode: '', sequenceCode: '', inspectionCharCode: '', - inspectionJobCharacteristicsRespVO: { + inspectionJobCharacteristicsUpdateReqVO: { describe: '', inspectionMethodCode: '', dynamicUpdateCode: '', @@ -745,7 +606,7 @@ const buttonBaseClick1 = (val) => { quantifyQuantifyCode: '' } }) - console.log(data.value.process) + console.log(data.value.subList) editableTabsValue.value = newTabName dialogVisibleName.value = false @@ -787,36 +648,36 @@ const validateForm = (formRef) => { const submitForm = async () => { try { const validateForm1 = await validateForm(formProcessRef.value) - console.log(validateForm1) - await formMainRef.value.validate() - if (!data.value.process || data.value.process.length == 0) { - message.error(`请添加工序`) - return - } - const bol1 = await validateForm(formProcessRef.value) - const bol2 = await validateForm(formFeaturesRef.value) - if (!bol1 || !bol2) { - message.error(`模板中有检验工序和检验特性未填写完全`) - return - } - const arr = data.value.process.filter( - (item) => - !item.inspectionCharacteristicsBaseVO.quantifyIsCapping && - !item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && - !item.inspectionCharacteristicsBaseVO.quantifyIsTarget && - item.inspectionCharacteristicsBaseVO.featureType == 0 - ) - console.log(arr) - if (arr && arr.length > 0) { - const str = arr.map((item) => item.description).join(',') - message.error(`${str}是否设定上线,是否设定下限,是否是定目标值至少一项为是`) - return - } + // console.log(validateForm1) + // await formMainRef.value.validate() + // if (!data.value.process || data.value.process.length == 0) { + // message.error(`请添加工序`) + // return + // } + // const bol1 = await validateForm(formProcessRef.value) + // const bol2 = await validateForm(formFeaturesRef.value) + // if (!bol1 || !bol2) { + // message.error(`模板中有检验工序和检验特性未填写完全`) + // return + // } + // const arr = data.value.process.filter( + // (item) => + // !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && + // !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && + // !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && + // item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 + // ) + // console.log(arr) + // if (arr && arr.length > 0) { + // const str = arr.map((item) => item.description).join(',') + // message.error(`${str}是否设定上线,是否设定下限,是否是定目标值至少一项为是`) + // return + // } if (formType.value == 'create') { // 主子表——提交请求 emit('submitForm', formType.value, data.value) } else { - // 编辑 + // 编辑/执行 emit('submitForm', formType.value, data.value) } } catch { @@ -837,9 +698,9 @@ if (props.footButttondata) { const changeFeatureType = (e) => { console.log(e) // if (e) { - // rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true + // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = true // } else { - // rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = false + // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = false // } } const searchTableRef = ref() @@ -921,13 +782,13 @@ const opensearchTable = ( // val ： 弹层列表row 数据 const searchTableSuccess = async (formField, searchField, val, type, row) => { if(type == 'features'){ - row.inspectionCharacteristicsBaseVO[formField] = val[0].code + row.inspectionJobCharacteristicsUpdateReqVO[formField] = val[0].code if(formField == 'inspectionMethodCode'){ - row.inspectionCharacteristicsBaseVO.inspectionMethodName = val[0].description + row.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName = val[0].description }else if(formField == 'dynamicUpdateCode'){ - row.inspectionCharacteristicsBaseVO.dynamicUpdateName = val[0].description + row.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName = val[0].description }else if(formField == 'inspectionMethod'){ - row.inspectionCharacteristicsBaseVO.inspectionName = val[0].description + row.inspectionJobCharacteristicsUpdateReqVO.inspectionName = val[0].description } } else if(type == 'main'){ data.value[formField] = val[0].code @@ -944,51 +805,61 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => { editableTabsValue.value = index + 1 item.name = index + 1 // 编辑判断上限下限目标值是否必填 - if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) { - rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true + if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) { + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true } else { - rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false } - if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) { - rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true + if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) { + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true } else { - rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false } - if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) { - rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true + if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) { + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true } else { - rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false } }) - data.value.process = list + data.value.subList = list } } // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row) } -// 选择是否设定上限值 -const changeIsCapping = (e) => { - if (e) { - rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true - } else { - rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false - } -} -// 选择是否设定下限值 -const changeLowlimit = (e) => { - if (e) { - rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true +// 请选择结果录入方式 +const resultEntryMethodChange = (e,item) => { + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList =[] + if (e==0) { + // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true + for(let i=0;i { - if (e) { - rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true - } else { - rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false - } +// 选择选定级 +const changeQualitativeCode= (e,item,cur)=>{ + let obj = item.selectedProjectRespVOList.find(cur=>cur.dictionaryValue==e) + console.log(obj) + cur.defectLevel = obj.defectLevel }