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/workorder/data.ts | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/src/views/mes/pro/workorder/data.ts b/src/views/mes/pro/workorder/data.ts
index add9af7..85e98cf 100644
--- a/src/views/mes/pro/workorder/data.ts
+++ b/src/views/mes/pro/workorder/data.ts
@@ -1,6 +1,7 @@
-锘縤mport type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import { type MesProWorkOrderApi, getWorkOrderApproveProcessList } from '#/api/mes/pro/workorder';
+import { getSimpleRoleList } from '#/api/system/role';
import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
import type { MesProWorkOrderProcessApi } from '#/api/mes/pro/workorder/process';
@@ -232,10 +233,60 @@
disabled: headerReadonly,
format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨闇�姹傛棩鏈�',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
},
+ {
+ fieldName: 'feedbackRole',
+ label: '鎶ュ伐瑙掕壊',
+ component: 'ApiSelect',
+ componentProps: {
+ api: getSimpleRoleList,
+ disabled: headerReadonly,
+ labelField: 'name',
+ valueField: 'code',
+ mode: 'multiple',
+ placeholder: '璇烽�夋嫨鎶ュ伐瑙掕壊',
+ },
+ rules: 'selectRequired',
+ },
+ {
+ fieldName: 'feedbackApprove',
+ label: '鏄惁鎶ュ伐瀹℃壒',
+ component: 'Switch',
+ componentProps: {
+ class: '!w-auto',
+ checkedChildren: '鏄�',
+ unCheckedChildren: '鍚�',
+ disabled: headerReadonly,
+ },
+ defaultValue: false,
+ rules: 'required',
+ },
+ {
+ fieldName: 'processDefinitionKey',
+ label: '瀹℃壒娴佺▼',
+ component: 'ApiSelect',
+ componentProps: {
+ api: getWorkOrderApproveProcessList,
+ disabled: headerReadonly,
+ labelField: 'name',
+ valueField: 'key',
+ placeholder: '璇烽�夋嫨瀹℃壒娴佺▼',
+ },
+ dependencies: {
+ triggerFields: ['feedbackApprove'],
+ show: (values) => !!values.feedbackApprove,
+ rules(values) {
+ if (values.feedbackApprove) {
+ return 'selectRequired';
+ }
+ return undefined;
+ },
+ },
+ },
+
{
fieldName: 'remark',
label: '澶囨敞',
@@ -411,6 +462,27 @@
name: 'CellDict',
props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
},
+ },
+ {
+ field: 'productionStatus',
+ title: '鐢熶骇鐘舵��',
+ width: 100,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.ORDER_PRODUCTION_STATUS },
+ },
+ },
+ {
+ field: 'processProgressList',
+ title: '宸ュ簭鐢熶骇杩涘害',
+ width: 350,
+ slots: { default: 'processProgressList' },
+ },
+ {
+ field: 'completionProgress',
+ title: '瀹屾垚杩涘害',
+ width: 200,
+ slots: { default: 'completionProgress' },
},
{
field: 'createTime',
@@ -686,14 +758,9 @@
slots: { default: 'backflushFlag' },
},
{
- field: 'outputItemCode',
- title: '浜у嚭鐗╂枡缂栫爜',
- width: 120,
- },
- {
- field: 'outputItemName',
- title: '浜у嚭鐗╂枡鍚嶇О',
- width: 120,
+ field: 'outputItemNames',
+ title: '浜у嚭鐗╂枡',
+ width: 160,
},
{
field: 'remark',
--
Gitblit v1.9.3