From 8cc3c8aeb33b5b6272b524eff97c65e69ae9349a Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 22 Apr 2024 16:12:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=92=8C=E6=A3=80?=
=?UTF-8?q?=E9=AA=8C=E8=AE=B0=E5=BD=95=E5=8C=85=E8=A3=85=E4=B8=8D=E5=A5=BD?=
=?UTF-8?q?=E4=BD=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../InspectionJobPackage/InspectionJobPackage.ts | 13 +++++++++++++
.../qms/inspectionJob/inspectionJobMain/index.ts | 5 +----
.../InspectionRecordPackage.ts | 13 +++++++++++++
.../inspectionRecord/inspectionRecordMain/index.ts | 4 ----
src/views/qms/inspection/inspectionJob/addForm.vue | 3 ++-
src/views/qms/inspection/inspectionJob/index.vue | 12 +++++++++---
.../qms/inspection/inspectionRecord/addForm.vue | 3 ++-
.../qms/inspection/inspectionRecord/index.vue | 14 +++++++++-----
8 files changed, 49 insertions(+), 18 deletions(-)
create mode 100644 src/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage.ts
create mode 100644 src/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage.ts
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"
/>
-
+