diff --git a/src/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage.ts b/src/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage.ts new file mode 100644 index 000000000..ff82af696 --- /dev/null +++ b/src/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage.ts @@ -0,0 +1,13 @@ +import request from '@/config/axios' +export interface InspectionRequestPackageVO { + number: string + packageCode: string + packageSpecificationCode: string + amount: string + measuringUnit: string +} + +//查询包装列表 +export const getInspectionJobPackageList = async (id: number) => { + return await request.get({ url: `/qms/inspection-job-package/list?masterId=` + id }) +} diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts index 372fef2dc..2b59a7401 100644 --- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts +++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts @@ -55,8 +55,5 @@ export const exportInspectionJobMain = async (params) => { export const importTemplate = () => { return request.download({ url: '/qms/inspection-job-main/get-import-template' }) } -//查询包装列表 -export const getInspectionJobPackageList = async (id: number) => { -   return await request.get({ url: `/qms/inspection-job-package/list?masterId=` + id }) -} + \ No newline at end of file diff --git a/src/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage.ts b/src/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage.ts new file mode 100644 index 000000000..cb0c2e6aa --- /dev/null +++ b/src/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage.ts @@ -0,0 +1,13 @@ +import request from '@/config/axios' +export interface InspectionRequestPackageVO { + number: string + packageCode: string + packageSpecificationCode: string + amount: string + measuringUnit: string +} + +//查询包装列表 +export const getInspectionRecordPackageList = async (id: number) => { + return await request.get({ url: `/qms/inspection-record-package/list?masterId=` + id }) +} diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts index 8214ed279..2f5215b03 100644 --- a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts +++ b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts @@ -67,7 +67,3 @@ export const importTemplate = () => { export const publishInspectionRecordMain = async (id) => { return await request.put({ url: `/qms/inspection-record-main/publish?id=`+id }) } -//查询包装列表 -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/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index df1937da2..fd6a47a7e 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/src/views/qms/inspection/inspectionJob/addForm.vue @@ -171,6 +171,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail' import { SearchTable } from '@/components/SearchTable' import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain' +import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage' const { proxy } = getCurrentInstance() @@ -337,7 +338,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any // await InspectionJobMainApi.acceptInspectionJobMain(row.id) let list = [] list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id) - data.value.packageList = await InspectionJobMainApi.getInspectionJobPackageList(row.id) + data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id) list.forEach((item, index) => { editableTabsValue.value = index + 1 item.name = index + 1 diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue index 5b6e79114..1c3b1f33b 100644 --- a/src/views/qms/inspection/inspectionJob/index.vue +++ b/src/views/qms/inspection/inspectionJob/index.vue @@ -51,7 +51,9 @@ :isShowAddBtn="false" :detailButtonIsShow="true" /> - +