Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

master_hella_20240701
gaojs 7 months ago
parent
commit
cb07f3c5c9
  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){
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: '', //

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

@ -219,20 +219,20 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
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',

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

@ -134,16 +134,16 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
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',

Loading…
Cancel
Save