From a460dfcc1396aec26ae0bd201269c3eea347d121 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 10 Apr 2024 09:39:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionRecordMain/index.ts | 2 +- .../inspectionJob/inspectionJobMain.data.ts | 18 +++++++++++++ .../inspection/inspectionRecord/addForm.vue | 17 ++---------- .../inspectionRecordMain.data.ts | 27 +++++++++++++++++++ 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts index db265c38d..aeb223f30 100644 --- a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts +++ b/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 }) } \ No newline at end of file diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts index cfbacc86e..c9df5d35f 100644 --- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts @@ -539,6 +539,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -548,6 +551,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -557,6 +563,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -570,6 +579,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ }, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -579,6 +591,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -586,6 +601,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ field: 'sampleAmount', sort: 'custom', isSearch: true, + table:{ + width:150 + } }, ])) //表单校验 diff --git a/src/views/qms/inspection/inspectionRecord/addForm.vue b/src/views/qms/inspection/inspectionRecord/addForm.vue index 3a30687dd..b3863abd0 100644 --- a/src/views/qms/inspection/inspectionRecord/addForm.vue +++ b/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 diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts index c927a4210..c1d7e440c 100644 --- a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts @@ -573,6 +573,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -582,6 +585,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -595,6 +601,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ }, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -604,6 +613,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -613,6 +625,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -622,6 +637,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -631,6 +649,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -640,6 +661,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -649,6 +673,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } } ]))