Browse Source

去掉采样总数量

master_hella_20240701
zhang_li 7 months ago
parent
commit
43ebbcd93b
  1. 20
      src/views/qms/inspection/inspectionJob/addForm.vue
  2. 28
      src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
  3. 20
      src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts

20
src/views/qms/inspection/inspectionJob/addForm.vue

@ -529,15 +529,15 @@ const submitForm = async () => {
if(data.value.packageList?.length>0){ if(data.value.packageList?.length>0){
const validateForm1 = await tableFormRef.value.validateForm() const validateForm1 = await tableFormRef.value.validateForm()
if (!validateForm1) return if (!validateForm1) return
let number = 0 // let number = 0
data.value.packageList.forEach(cur=>{ // data.value.packageList.forEach(cur=>{
number += parseFloat(cur.sampleAmount) // number += parseFloat(cur.sampleAmount)
}) // })
number = number.toFixed('2') // number = number.toFixed('2')
if(number != data.value.sampleTotalAmount){ // if(number != data.value.sampleTotalAmount){
message.error(`采样数量之和必须等于采样总数量`) // message.error(``)
return // return
} // }
} }
const bol2 = await validateForm(formFeaturesRef.value) const bol2 = await validateForm(formFeaturesRef.value)
@ -783,7 +783,7 @@ const resultEntryMethodChange = (e, item) => {
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
if (e == 0) { if (e == 0) {
// rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true // 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({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', // inspectionValue: '', //
qualitativeCode: '', // qualitativeCode: '', //

28
src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts

@ -219,20 +219,20 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
} }
}, },
{ // {
label: '采样总数量', // label: '采样总数量',
field: 'sampleTotalAmount', // field: 'sampleTotalAmount',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
form: { // form: {
componentProps:{ // componentProps:{
disabled:true // disabled:true
} // }
}, // },
table: { // table: {
width: 150 // width: 150
} // }
}, // },
{ {
label: '检验类型', label: '检验类型',
field: 'inspectionType', field: 'inspectionType',

20
src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts

@ -134,16 +134,16 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
} }
}, },
{ // {
label: '采样总数量', // label: '采样总数量',
field: 'sampleTotalAmount', // field: 'sampleTotalAmount',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
isForm:false, // isForm:false,
table: { // table: {
width: 150 // width: 150
} // }
}, // },
{ {
label: '检验类型', label: '检验类型',
field: 'inspectionType', field: 'inspectionType',

Loading…
Cancel
Save