diff --git a/src/api/qms/inspectionJob/inspectionJobPackage/index.ts b/src/api/qms/inspectionJob/inspectionJobPackage/index.ts new file mode 100644 index 000000000..e4b98fd47 --- /dev/null +++ b/src/api/qms/inspectionJob/inspectionJobPackage/index.ts @@ -0,0 +1,6 @@ +import request from '@/config/axios' + +//查询检验申请列表 +export const getInspectionJobPackageList = async (id: number) => { + return await request.get({ url: `/qms/inspection-job-package/list?masterId=` + id }) +} \ No newline at end of file diff --git a/src/components/listTable/index.ts b/src/components/listTable/index.ts new file mode 100644 index 000000000..e95f79c43 --- /dev/null +++ b/src/components/listTable/index.ts @@ -0,0 +1,3 @@ +import ListTable from './src/ListTable.vue' + +export { ListTable } diff --git a/src/components/listTable/src/ListTable.vue b/src/components/listTable/src/ListTable.vue new file mode 100644 index 000000000..b9985a8d0 --- /dev/null +++ b/src/components/listTable/src/ListTable.vue @@ -0,0 +1,40 @@ + + + + diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 22c41afaa..05d1cd48a 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -296,6 +296,7 @@ export default { delete: 'Delete', edit: 'Edit', update: 'Update', + execute: 'Execute', preview: 'Preview', more: 'More', sync: 'Sync', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 7ab623b0b..979826038 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -297,6 +297,7 @@ export default { edit: '编辑', update: '编辑', preview: '预览', + execute: '执行', more: '更多', sync: '同步', save: '保存', diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 9095ca7e5..7f81426e2 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -691,6 +691,18 @@ export function mainListJobExeBtn(option:any) { hasPermi: '' }) } +// 主列表-包装按钮 +export function mainListPackageBtn(option:any) { + return __defaultBtnOption(option,{ + label: '包装', + name: 'mainPackage', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} // 主列表-打印 export function mainListPointBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index 3a469b564..10fa03b5c 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/src/views/qms/inspection/inspectionJob/addForm.vue @@ -27,7 +27,7 @@ :stretch="false" > - + @@ -51,12 +55,12 @@ - + - + @@ -83,39 +87,45 @@ - - + + - -
- -
- - - - -
- -
- - - - + - + - + - + @@ -219,43 +261,54 @@ - + + :value="dict.value" + /> - + - + - + - + + :value="dict.dictionaryValue" + /> - + - - + + :value="dict.value" + /> @@ -313,7 +366,6 @@ import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集 import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集 - const { proxy } = getCurrentInstance() const message = useMessage() // 消息弹窗 @@ -354,12 +406,12 @@ const props = defineProps({ required: true, default: null }, - // 校验rules - rules: { + // 校验rules + rules: { type: Object, required: true, default: null - }, + } }) const { t } = useI18n() // 国际化 @@ -400,7 +452,7 @@ if (props.basicFormWidth) { } const rules = ref({ ...props.rules, - 'inspectionJobCharacteristicsUpdateReqVO.description': [ + 'inspectionJobCharacteristicsUpdateReqVO.description': [ { required: true, message: '请填写描述', trigger: ['blur', 'change'] } ], 'inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode': [ @@ -437,22 +489,17 @@ const rules = ref({ { required: true, message: '请输入选择集编码', trigger: 'change' } ], 'inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime': [ - { required: true, message: '请输入选择开始时间', trigger: 'change'} + { required: true, message: '请输入选择开始时间', trigger: 'change' } ], 'inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime': [ { required: true, message: '请输入选择结束时间', trigger: 'blur' } -], -qualifiedQuantity: [ - { required: true, message: '请输入选择结束时间', trigger: 'blur' } -], - - + ], + qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }] }) /** 打开弹窗 */ let tabIndex = 1 const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => { - dialogVisible.value = true if (titleName) { dialogTitle.value = t('action.' + titleName) } else { @@ -468,30 +515,32 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any editableTabsValue.value = index + 1 item.name = index + 1 item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO - item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList=[] + 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 { + formMainRef.value.setValues(row) + }) } else { data.value = { code: '', @@ -528,7 +581,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any subList: [] } } - + dialogVisible.value = true tabIndex = data.value.subList.length + 1 } defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗 @@ -633,51 +686,66 @@ const validateForm = (formRef) => { const submitForm = async () => { try { - 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) - if (!bol2) { + // 校验表单 + if (!elForm) return + const valid = await elForm.validate() + if (!valid) return + // const bol1 = await validateForm(formProcessRef.value) + const bol2 = await validateForm(formFeaturesRef.value) + if (!bol2) { message.error(`模板中有检验工序和检验特性未填写完全`) return } - // 判断附加费用数组是否有未填的选项 - let arrBol = data.value.subList.map((item, index) => { - let arr1 = [] - if(item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1){ - arr1.push(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some((cur,key) =>{ - return !cur.qualifiedQuantity || !cur.unqualifiedQuantity - })) + // 判断附加费用数组是否有未填的选项 + let arrBol = data.value.subList.map((item, index) => { + let arr1 = [] + if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) { + arr1.push( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( + (cur, key) => { + return !cur.qualifiedQuantity || !cur.unqualifiedQuantity + } + ) + ) } - if(item.samplingProcessRespVO.evaluationMode == 1){ - arr1.push(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some((cur,key) =>{ - return !cur.estimateCode ||!cur.defectLevel - })) + if (item.samplingProcessRespVO.evaluationMode == 1) { + arr1.push( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( + (cur, key) => { + return !cur.estimateCode || !cur.defectLevel + } + ) + ) } - if(item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0){ - arr1.push( item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some((cur,key) =>{ - return !cur.inspectionValue - })) + if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) { + arr1.push( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( + (cur, key) => { + return !cur.inspectionValue + } + ) + ) } - if(item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1){ - arr1.push(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some((cur,key) =>{ - return !cur.qualitativeCode - })) + if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) { + arr1.push( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( + (cur, key) => { + return !cur.qualitativeCode + } + ) + ) } return arr1 - }) -// console.log(arrBol) -// let isEmpty1 = arrBol.filter(item=>item == true) -// arrBol.forEach(item=>{ -// console.log('1q1q') -// console.log(typeof item) -// }) + }) + // console.log(arrBol) + // let isEmpty1 = arrBol.filter(item=>item == true) + // arrBol.forEach(item=>{ + // console.log('1q1q') + // console.log(typeof item) + // }) // setTimeout(()=>{ // console.log(arrBol.includes(true)) // },2000) @@ -789,22 +857,22 @@ const opensearchTable = ( // 弹层确定返回所选数据 // val ： 弹层列表row 数据 const searchTableSuccess = async (formField, searchField, val, type, row) => { - if(type == 'features'){ + if (type == 'features') { row.inspectionJobCharacteristicsUpdateReqVO[formField] = val[0].code - if(formField == 'inspectionMethodCode'){ + if (formField == 'inspectionMethodCode') { row.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName = val[0].description - }else if(formField == 'dynamicUpdateCode'){ + } else if (formField == 'dynamicUpdateCode') { row.inspectionJobCharacteristicsUpdateReqVO.dynamicUpdateName = val[0].description - }else if(formField == 'inspectionMethod'){ + } else if (formField == 'inspectionMethod') { row.inspectionJobCharacteristicsUpdateReqVO.inspectionName = val[0].description } - } else if(type == 'main'){ + } else if (type == 'main') { data.value[formField] = val[0].code - if(formField == 'itemCode'){ + if (formField == 'itemCode') { data.value.itemName = val[0].name - }else if(formField == 'testTypeCode'){ + } else if (formField == 'testTypeCode') { data.value.testTypeName = val[0].description - }else if(formField == 'programmeTemplateCode'){ + } else if (formField == 'programmeTemplateCode') { data.value.programmeTemplateName = val[0].description } if (formField == 'programmeTemplateCode') { @@ -821,7 +889,8 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => { if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) { rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true } else { - rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = + false } if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) { rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true @@ -836,36 +905,38 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => { // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row) } // 请选择结果录入方式 -const resultEntryMethodChange = (e,item) => { - item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList =[] - if (e==0) { +const resultEntryMethodChange = (e, item) => { + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] + if (e == 0) { // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true - for(let i=0;i{ - let obj = item.selectedProjectRespVOList.find(cur=>cur.dictionaryValue==e) +const changeQualitativeCode = (e, item, cur) => { + let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e) console.log(obj) cur.defectLevel = obj.defectLevel } diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue index b5e4ed1cb..6f95beb7e 100644 --- a/src/views/qms/inspection/inspectionJob/index.vue +++ b/src/views/qms/inspection/inspectionJob/index.vue @@ -27,12 +27,6 @@ - + - - - - - + +