From 14817696a26eb142ccae03fa7c43050840e057f5 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:03 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
src/views/mes/pd/archive/data.ts | 84 +++++++++++++++++++++++-------------------
1 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/src/views/mes/pd/archive/data.ts b/src/views/mes/pd/archive/data.ts
index 7146fcf..c8e697e 100644
--- a/src/views/mes/pd/archive/data.ts
+++ b/src/views/mes/pd/archive/data.ts
@@ -1,71 +1,79 @@
-import type { VbenFormSchema } from "#/adapter/form";
-import type { VxeTableGridOptions } from "#/adapter/vxe-table";
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import { DICT_TYPE } from "#/packages/constants/src";
-import { getDictOptions } from "#/packages/effects/hooks/src";
+import { DICT_TYPE } from '#/packages/constants/src';
+import { getDictOptions } from '#/packages/effects/hooks/src';
export function useGridFormSchema(): VbenFormSchema[] {
return [
{
- fieldName: "code",
- label: "褰掓。缂栧彿",
- component: "Input",
- componentProps: { placeholder: "璇疯緭鍏ュ綊妗ｇ紪鍙�" },
+ fieldName: 'archiveCode',
+ label: '褰掓。缂栧彿',
+ component: 'Input',
+ componentProps: { placeholder: '璇疯緭鍏ュ綊妗ｇ紪鍙�' },
},
{
- fieldName: "projectCode",
- label: "浠诲姟缂栫爜",
- component: "Input",
- componentProps: { placeholder: "璇疯緭鍏ヤ换鍔＄紪鐮�" },
+ fieldName: 'productCode',
+ label: '浜у搧缂栫爜',
+ component: 'Input',
+ componentProps: { placeholder: '璇疯緭鍏ヤ骇鍝佺紪鐮�' },
},
{
- fieldName: "productCode",
- label: "浜у搧缂栫爜",
- component: "Input",
- componentProps: { placeholder: "璇疯緭鍏ヤ骇鍝佺紪鐮�" },
+ fieldName: 'productName',
+ label: '浜у搧鍚嶇О',
+ component: 'Input',
+ componentProps: { placeholder: '璇疯緭鍏ヤ骇鍝佸悕绉�' },
},
{
- fieldName: "archiveStatus",
- label: "褰掓。鐘舵��",
- component: "Select",
+ fieldName: 'archiveStatus',
+ label: '褰掓。鐘舵��',
+ component: 'Select',
componentProps: {
allowClear: true,
- options: getDictOptions(DICT_TYPE.MES_PD_ARCHIVE_STATUS, "number"),
- placeholder: "璇烽�夋嫨褰掓。鐘舵��",
+ options: getDictOptions(DICT_TYPE.MES_PD_ARCHIVE_STATUS, 'number'),
+ placeholder: '璇烽�夋嫨褰掓。鐘舵��',
},
},
];
}
-export function useGridColumns(): VxeTableGridOptions["columns"] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
return [
{
- field: "code",
- title: "褰掓。缂栧彿",
+ field: 'archiveCode',
+ title: '褰掓。缂栧彿',
minWidth: 130,
- slots: { default: "code" },
+ slots: { default: 'archiveCode' },
},
- { field: "projectCode", title: "浠诲姟缂栫爜", minWidth: 120 },
- { field: "projectName", title: "浠诲姟鍚嶇О", minWidth: 140 },
- { field: "productCode", title: "浜у搧缂栫爜", minWidth: 120 },
- { field: "productName", title: "浜у搧鍚嶇О", minWidth: 140 },
- { field: "version", title: "鐗堟湰鍙�", minWidth: 90 },
+ { field: 'productCode', title: '浜у搧缂栫爜', minWidth: 120 },
+ { field: 'productName', title: '浜у搧鍚嶇О', minWidth: 140 },
+ { field: 'taskCode', title: '浠诲姟缂栫爜', minWidth: 130 },
+ { field: 'taskName', title: '浠诲姟鍚嶇О', minWidth: 160 },
+ { field: 'archiveCount', title: '褰掓。鏁伴噺', minWidth: 90 },
{
- field: "archiveStatus",
- title: "褰掓。鐘舵��",
+ field: 'archiveStatus',
+ title: '褰掓。鐘舵��',
minWidth: 100,
cellRender: {
- name: "CellDict",
+ name: 'CellDict',
props: { type: DICT_TYPE.MES_PD_ARCHIVE_STATUS },
},
},
- { field: "documentCount", title: "璧勬枡鏁�", minWidth: 80 },
- { field: "archiverName", title: "褰掓。浜�", minWidth: 100 },
+ { field: 'archiverNickname', title: '褰掓。浜�', minWidth: 100 },
{
- field: "archiveTime",
- title: "褰掓。鏃堕棿",
+ field: 'archiveTime',
+ title: '褰掓。鏃堕棿',
minWidth: 160,
- formatter: "formatDateTime",
+ formatter: 'formatDateTime',
},
+ { field: 'updaterNickname', title: '鏇存柊浜�', minWidth: 100 },
+ {
+ field: 'updateTime',
+ title: '鏇存柊鏃堕棿',
+ minWidth: 160,
+ formatter: 'formatDateTime',
+ },
+
+
];
}
--
Gitblit v1.9.3