From 889d8ddf4c13c1b1bdbabd04c2d80b904020151e Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 19 八月 2026 12:49:24 +0800
Subject: [PATCH] 生产订单与报工模块改造汇总 (Git Commit 文档) feat(mes-pro): 生产订单及报工模块审批流与批次填报改造 1. 生产订单功能增强 (Work Order)
---
src/views/mes/pro/feedback/data.ts | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index 29b244a..8e2580a 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -2,6 +2,7 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
import type { MesProTaskApi } from '#/api/mes/pro/task';
+import type { DescriptionItemSchema } from '#/components/description';
import { h, markRaw } from 'vue';
@@ -23,6 +24,7 @@
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
import { ProTaskSelect } from '#/views/mes/pro/task/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import { DictTag } from '#/components/dict-tag';
/** 鐢熶骇鎶ュ伐琛ㄥ崟绫诲瀷 */
export type FormType = 'approve' | 'create' | 'detail' | 'submit' | 'update';
@@ -601,3 +603,34 @@
},
];
}
+
+/** 鐢熶骇鎶ュ伐璇︽儏鎽樿 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+ return [
+ { field: 'code', label: '鎶ヨ鍗曞彿' },
+ {
+ field: 'type',
+ label: '鎶ュ伐绫诲瀷',
+ render: (val) =>
+ h(DictTag, { type: DICT_TYPE.MES_PRO_FEEDBACK_TYPE, value: val }),
+ },
+ { field: 'workOrderId', label: '鐢熶骇璁㈠崟', render: (_val, data) => data.workOrderCode },
+ { field: 'taskId', label: '鐢熶骇浠诲姟', render: (_val, data) => data.taskCode },
+ { field: 'workstationName', label: '宸ヤ綔绔�' },
+ { field: 'itemCode', label: '浜у搧缂栫爜' },
+ { field: 'itemName', label: '浜у搧鍚嶇О' },
+ { field: 'unitMeasureName', label: '鍗曚綅' },
+ { field: 'itemSpecification', label: '瑙勬牸' },
+ { field: 'reportableQuantity', label: '鍙姤宸ユ暟閲�' },
+ { field: 'feedbackQuantity', label: '鎶ュ伐鏁伴噺' },
+ { field: 'qualifiedQuantity', label: '鍚堟牸鍝佹暟閲�' },
+ { field: 'unqualifiedQuantity', label: '涓嶈壇鍝佹暟閲�' },
+ { field: 'laborScrapQuantity', label: '宸ュ簾鏁伴噺' },
+ { field: 'materialScrapQuantity', label: '鏂欏簾鏁伴噺' },
+ { field: 'otherScrapQuantity', label: '鍏朵粬搴熷搧' },
+ { field: 'feedbackUserNickname', label: '鎶ュ伐浜�' },
+ { field: 'feedbackTime', label: '鎶ュ伐鏃堕棿' },
+ { field: 'approveUserNickname', label: '瀹℃牳浜�' },
+ { field: 'remark', label: '澶囨敞' },
+ ];
+}
--
Gitblit v1.9.3