diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 4ddb4d195..c204f0772 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -300,6 +300,8 @@ export enum DICT_TYPE { DEFECT_LEVEL = "defect_level", // 缺陷级别 DICTIONARY_CLASS = "dictionary_class", // 字典分类 USAGE_DECISION = "usage_decision", // 使用决策 + INSPECTION_BATCH_SOURCE = "inspection_batch_source", // 检验批来源 + INSPECTION_TYPE = "inspection_type", // 检验类型 // ========== 业务 - mes -gaojs ========== QUALIFY_STATUS = 'qualify_status',//质检状态 diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index 4cca5460d..d6051c4d7 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/src/views/qms/inspection/inspectionJob/addForm.vue @@ -28,7 +28,7 @@ :stretch="false" > - + - + + + + + + + + + + + - + + @@ -410,58 +433,17 @@ const rules = ref({ { required: true, message: '请输入小数位', trigger: 'blur' } ], 'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [ - { required: true, message: '请输入选择集编码', trigger: 'blur' } - ] + { required: true, message: '请输入选择集编码', trigger: 'change' } + ], + 'inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime': [ + { required: true, message: '请输入选择开始时间', trigger: 'change'} + ], + 'inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime': [ + { required: true, message: '请输入选择结束时间', trigger: 'blur' } +], + + }) -// const rules = ref({ -// itemCode: [{ required: true, message: '请选择物料编码', trigger: 'blur' }], -// version: [{ required: true, message: '请填写版本', trigger: 'blur' }], -// testTypeCode: [{ required: true, message: '请选择检验类型编码', trigger: ['blur', 'change'] }], -// programmeTemplateCode: [ -// { required: true, message: '请选择检验模板编码', trigger: ['blur', 'change'] } -// ], -// splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }], -// aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }], -// inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }], -// effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change'] }], -// expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change'] }], -// 'inspectionJobCharacteristicsUpdateReqVO.description': [ -// { required: true, message: '请填写描述', trigger: ['blur', 'change'] } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [ -// { required: true, message: '请选择检验方法编码', trigger: 'blur' } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateCode': [ -// { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.inspectionMethod': [ -// { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod': [ -// { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.featureType': [ -// { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.quantifyTarget': [ -// { required: true, message: '请输入目标值', trigger: 'blur' } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.quantifyCapping': [ -// { required: true, message: '请输入上限值', trigger: 'blur' } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit': [ -// { required: true, message: '请输入下限值', trigger: 'blur' } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.quantifyUom': [ -// { required: true, message: '请选择计量单位', trigger: 'blur' } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.quantifyDecimal': [ -// { required: true, message: '请输入小数位', trigger: 'blur' } -// ], -// 'inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode': [ -// { required: true, message: '请输入选择集编码', trigger: 'blur' } -// ] -// }) /** 打开弹窗 */ let tabIndex = 1 @@ -647,9 +629,36 @@ const validateForm = (formRef) => { const submitForm = async () => { try { - const validateForm1 = await validateForm(formProcessRef.value) - // console.log(validateForm1) - // await formMainRef.value.validate() + + console.log(data.value.subList) + // const validateForm1 = await validateForm(formMainRef.value) + const elForm = unref(formMainRef)?.getElFormRef() + // 校验表单 + if (!elForm) return + const valid = await elForm.validate() + if (!valid) return + // const bol1 = await validateForm(formProcessRef.value) + // const bol2 = await validateForm(formFeaturesRef.value) + // console.log(bol2) + // if (!bol2) { + // message.error(`模板中有检验工序和检验特性未填写完全`) + // return + // } + // 判断附加费用数组是否有未填的选项 + let arrBol = data.value.subList.map((item, index) => { + if(item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1){ + return item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some((cur,key) =>{ + return !cur.qualifiedQuantity || !cur.unqualifiedQuantity + }) + } + }) + console.log(arrBol) + let isEmpty1 = arrBol.some(item=>item== true) + if (isEmpty1) { + proxy.$modal.msgError("请填写完整信息"); + return; + } + return // if (!data.value.process || data.value.process.length == 0) { // message.error(`请添加工序`) // return diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue index e74a0128d..66577f3c3 100644 --- a/src/views/qms/inspection/inspectionJob/index.vue +++ b/src/views/qms/inspection/inspectionJob/index.vue @@ -39,7 +39,7 @@ :formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas" :formAllSchemasProcess="InspectionTemplateProcess.allSchemas" :formAllSchemasMain="InspectionTemplateMain.allSchemas" - :rules="InspectionTemplateRules" + :rules="InspectionJobMainRules" :formAllSchemas="InspectionJobMain.allSchemas" @submitForm="submitForm" /> @@ -50,7 +50,7 @@ :apiUpdate="InspectionJobDetailApi.updateInspectionJobDetail" :apiPage="InspectionJobDetailApi.getInspectionJobDetailPage" :apiDelete="InspectionJobDetailApi.deleteInspectionJobDetail" @searchTableSuccessDetail="searchTableSuccessDetail" - :isShowAddBtn="false" :detailButtonIsShow="true" /> + :isShowAddBtn="false" :detailButtonIsShow="true"/> ([ field: 'inspectionType', sort: 'custom', isSearch: false, + dictType: DICT_TYPE.INSPECTION_TYPE, + dictClass: 'string', form: { component: 'Select', componentProps:{ @@ -178,6 +190,8 @@ export const InspectionJobMain = useCrudSchemas(reactive([ field: 'inspectionBatchSource', sort: 'custom', isSearch: false, + dictType: DICT_TYPE.INSPECTION_BATCH_SOURCE, + dictClass: 'string', form:{ componentProps:{ disabled:true @@ -202,6 +216,8 @@ export const InspectionJobMain = useCrudSchemas(reactive([ field: 'inspectionStringency', sort: 'custom', isSearch: false, + dictType: DICT_TYPE.INSPECTION_SEVERITY, + dictClass: 'string', form:{ componentProps:{ disabled:true @@ -281,6 +297,8 @@ export const InspectionJobMain = useCrudSchemas(reactive([ field: 'inspectionLevel', sort: 'custom', isSearch: false, + dictType: DICT_TYPE.INSPECTION_LEVEL, + dictClass: 'string', form:{ componentProps:{ disabled:true @@ -292,6 +310,8 @@ export const InspectionJobMain = useCrudSchemas(reactive([ field: 'aqlValue', sort: 'custom', isSearch: false, + dictType: DICT_TYPE.BASIC_AQL, + dictClass: 'string', form:{ componentProps:{ disabled:true @@ -312,13 +332,22 @@ export const InspectionJobMain = useCrudSchemas(reactive([ { label: '是否可用', field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, sort: 'custom', - isSearch: false, - form:{ - componentProps:{ + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', disabled:true } - } + }, }, { label: '操作', @@ -334,24 +363,7 @@ export const InspectionJobMain = useCrudSchemas(reactive([ //表单校验 export const InspectionJobMainRules = reactive({ - number: [required], - inspectionCode: [required], - supplierCode: [required], - materialCode: [required], - materialBatch: [required], - orderCode: [required], - certificateRow: [required], - inspectionSchemeCode: [required], - inspectionSchemeJson: [required], - inspectionBatch: [required], - inspectionBatchAmount: [required], - sampleTatalAmount: [required], - inspectionType: [required], - inspectionBatchSource: [required], - inspectionStage: [required], - inspectionStringency: [required], - inspectionLevel: [required], - available: [required], + usageDecision: [required], }) /** @@ -407,24 +419,35 @@ export const InspectionJobDetail = useCrudSchemas(reactive([ sort: 'custom', },{ label: '采样过程编码', - field: 'inspectionMethod', + field: 'inspectionJobCharacteristicsRespVO.inspectionMethod', sort: 'custom', },{ label: '动态修改规则编码', - field: 'dynamicUpdateCode', + field: 'inspectionJobCharacteristicsRespVO.dynamicUpdateCode', sort: 'custom', },{ label: '是否允许修改特征值', field: 'inspectionJobCharacteristicsRespVO.isCanUpdate', sort: 'custom', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return isCanUpdateList.find((account) => account.value == cellValue)?.label + }, },{ label: '结果录入方式', - field: 'resultEntryMethod', + field: 'inspectionJobCharacteristicsRespVO.resultEntryMethod', sort: 'custom', + // dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY, + // dictClass: 'string', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return resultEntryMethodList.find((account) => account.value == cellValue)?.label + }, },{ label: '特征类型', - field: 'featureType', + field: 'inspectionJobCharacteristicsRespVO.featureType', sort: 'custom', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return featureTypeList.find((account) => account.value == cellValue)?.label + }, } ]))