diff --git a/src/api/mes/dv/machinery/index.ts b/src/api/mes/dv/machinery/index.ts
index 7a22bb997..8ba539d3f 100644
--- a/src/api/mes/dv/machinery/index.ts
+++ b/src/api/mes/dv/machinery/index.ts
@@ -44,6 +44,11 @@ export const DvMachineryApi = {
return await request.delete({ url: `/mes/dv/machinery/delete?id=` + id })
},
+ // 获得设备精简列表(下拉选项用)
+ getSimpleList: async () => {
+ return await request.get({ url: `/mes/dv/machinery/simple-list` })
+ },
+
// 导出设备台账 Excel
exportMachinery: async (params: any) => {
return await request.download({ url: `/mes/dv/machinery/export-excel`, params })
diff --git a/src/api/mes/dv/subject/index.ts b/src/api/mes/dv/subject/index.ts
index a6cce69f0..7bf4e1095 100644
--- a/src/api/mes/dv/subject/index.ts
+++ b/src/api/mes/dv/subject/index.ts
@@ -39,6 +39,11 @@ export const DvSubjectApi = {
return await request.delete({ url: `/mes/dv/subject/delete?id=` + id })
},
+ // 获得点检保养项目精简列表(下拉选项用)
+ getSimpleList: async () => {
+ return await request.get({ url: `/mes/dv/subject/simple-list` })
+ },
+
// 导出点检保养项目 Excel
exportSubject: async (params: any) => {
return await request.download({ url: `/mes/dv/subject/export-excel`, params })
diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 258e2611d..402c3d0a5 100644
--- a/src/api/mes/pro/workorder/index.ts
+++ b/src/api/mes/pro/workorder/index.ts
@@ -23,6 +23,8 @@ export interface ProWorkOrderVO {
clientName: string // 客户名称
vendorId: number // 供应商编号
vendorName: string // 供应商名称
+ vendorCode: string // 供应商编码
+ batchCode: string // 批次号
requestDate: Date // 需求日期
parentId: number // 父工单编号
parentCode: string // 父工单编码
diff --git a/src/views/mes/pro/workorder/WorkorderForm.vue b/src/views/mes/pro/workorder/WorkorderForm.vue
index de72828c8..241d68247 100644
--- a/src/views/mes/pro/workorder/WorkorderForm.vue
+++ b/src/views/mes/pro/workorder/WorkorderForm.vue
@@ -110,6 +110,15 @@
+
+
+
+
+
{
quantity: undefined,
clientId: undefined,
vendorId: undefined,
+ batchCode: undefined,
requestDate: undefined,
status: undefined,
remark: undefined
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 3df656021..039c703a4 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -63,6 +63,15 @@
/>
+
+
+
+
+
{
for (const item of Object.values(MesItemOrProductEnum)) {