Browse Source

检验记录任务小修改

master_hella_20240701
zhang_li 7 months ago
parent
commit
a460dfcc13
  1. 2
      src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
  2. 18
      src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
  3. 17
      src/views/qms/inspection/inspectionRecord/addForm.vue
  4. 27
      src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts

2
src/api/qms/inspectionRecord/inspectionRecordMain/index.ts

@ -67,7 +67,7 @@ export const importTemplate = () => {
export const publishInspectionRecordMain = async (data ) => {
return await request.put({ url: `/qms/inspection-record-main/publish`, data })
}
//查询检验申请列表
//查询包装列表
export const getInspectionRecordPackageList = async (id: number) => {
return await request.get({ url: `/qms/inspection-record-package/list?masterId=` + id })
}

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

@ -539,6 +539,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -548,6 +551,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -557,6 +563,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -570,6 +579,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive<CrudSchema[]>([
},
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -579,6 +591,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -586,6 +601,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive<CrudSchema[]>([
field: 'sampleAmount',
sort: 'custom',
isSearch: true,
table:{
width:150
}
},
]))
//表单校验

17
src/views/qms/inspection/inspectionRecord/addForm.vue

@ -41,21 +41,8 @@
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { getCurrentInstance } from 'vue'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail'
import { SearchTable } from '@/components/SearchTable'
import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
// import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data'
// import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate'
// import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
// import * as ItemBasicApi from '@/api/wms/itembasic'
import * as SamplingProcessApi from '@/api/qms/samplingProcess' //
import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //
import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //
import * as DynamicRuleApi from '@/api/qms/dynamicRule' //
import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //
import * as SelectedSetApi from '@/api/qms/selectedSet' //
import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //
import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
const { proxy } = getCurrentInstance()
@ -145,7 +132,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
formType.value = type
if (row) {
data.value = JSON.parse(JSON.stringify(row))
data.value.packageList = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
data.value.packageList = await InspectionRecordMainApi.getInspectionRecordPackageList(row.id)
data.value.packageList.forEach(item=>{
item.qualifiedAmount =0
item.noQualifiedAmount =0

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

@ -573,6 +573,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -582,6 +585,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -595,6 +601,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
},
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -604,6 +613,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -613,6 +625,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -622,6 +637,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -631,6 +649,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -640,6 +661,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
},
{
@ -649,6 +673,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
tableForm:{
disabled:true
},
table:{
width:150
}
}
]))

Loading…
Cancel
Save