diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index 983e249ad..74718db60 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/src/views/qms/inspection/inspectionJob/addForm.vue @@ -529,15 +529,15 @@ const submitForm = async () => { if(data.value.packageList?.length>0){ const validateForm1 = await tableFormRef.value.validateForm() if (!validateForm1) return - let number = 0 - data.value.packageList.forEach(cur=>{ - number += parseFloat(cur.sampleAmount) - }) - number = number.toFixed('2') - if(number != data.value.sampleTotalAmount){ - message.error(`采样数量之和必须等于采样总数量`) - return - } + // let number = 0 + // data.value.packageList.forEach(cur=>{ + // number += parseFloat(cur.sampleAmount) + // }) + // number = number.toFixed('2') + // if(number != data.value.sampleTotalAmount){ + // message.error(`采样数量之和必须等于采样总数量`) + // return + // } } const bol2 = await validateForm(formFeaturesRef.value) @@ -783,7 +783,7 @@ const resultEntryMethodChange = (e, item) => { item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] if (e == 0) { // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true - for (let i = 0; i < data.value.sampleTotalAmount; i++) { + for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty); i++) { item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts index 44b6cbc1f..0a658181a 100644 --- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts @@ -219,20 +219,20 @@ export const InspectionJobMain = useCrudSchemas(reactive([ width: 150 } }, - { - label: '采样总数量', - field: 'sampleTotalAmount', - sort: 'custom', - isSearch: false, - form: { - componentProps:{ - disabled:true - } - }, - table: { - width: 150 - } - }, + // { + // label: '采样总数量', + // field: 'sampleTotalAmount', + // sort: 'custom', + // isSearch: false, + // form: { + // componentProps:{ + // disabled:true + // } + // }, + // table: { + // width: 150 + // } + // }, { label: '检验类型', field: 'inspectionType', diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts index 1d5eb9a1c..07e3085c3 100644 --- a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts @@ -134,16 +134,16 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ width: 150 } }, - { - label: '采样总数量', - field: 'sampleTotalAmount', - sort: 'custom', - isSearch: false, - isForm:false, - table: { - width: 150 - } - }, + // { + // label: '采样总数量', + // field: 'sampleTotalAmount', + // sort: 'custom', + // isSearch: false, + // isForm:false, + // table: { + // width: 150 + // } + // }, { label: '检验类型', field: 'inspectionType',