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/api/mes/pd/project/index.ts | 89 ++++++++++++++++++--------------------------
1 files changed, 36 insertions(+), 53 deletions(-)
diff --git a/src/api/mes/pd/project/index.ts b/src/api/mes/pd/project/index.ts
index a637d27..40e34ab 100644
--- a/src/api/mes/pd/project/index.ts
+++ b/src/api/mes/pd/project/index.ts
@@ -2,43 +2,49 @@
import { requestClient } from '#/api/request';
-import { isPdMockEnabled } from '../mock/enabled';
-import { pdMockStore } from '../mock/store';
-
export namespace MesPdProjectApi {
/** 浜у搧璁捐椤圭洰 */
export interface Project {
id?: number;
- code?: string;
- name?: string;
+ /** 浠诲姟缂栫爜 */
+ taskCode?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
+ /** 浜у搧缂栫爜 */
productCode?: string;
+ /** 浜у搧鍚嶇О */
productName?: string;
+ /** 鐗堟湰鍙� */
version?: string;
+ /** 鐘舵�� */
status?: number;
- designerId?: number;
- designerName?: string;
- reviewerId?: number;
- reviewerName?: string;
- planStartDate?: number;
- planEndDate?: number;
- actualFinishDate?: number;
+ /** 涓昏璁″笀锛堢敤鎴稩D锛� */
+ chiefDesigner?: number;
+ /** 涓昏璁″笀鍚嶇О */
+ chiefDesignerNickname?: string;
+ /** 瀹℃牳浜猴紙鐢ㄦ埛ID锛� */
+ reviewer?: number;
+ /** 瀹℃牳浜哄悕绉� */
+ reviewerNickname?: string;
+ /** 璁″垝瀹屾垚鏃堕棿 */
+ planFinishTime?: number;
+ /** 澶囨敞 */
remark?: string;
+ /** 鍒涘缓鏃堕棿 */
createTime?: number;
}
export interface PageParams extends PageParam {
- code?: string;
- name?: string;
+ taskCode?: string;
+ taskName?: string;
productCode?: string;
+ productName?: string;
status?: number;
- designerId?: number;
+ planFinishTime?: number[];
}
}
export function getPdProjectPage(params: MesPdProjectApi.PageParams) {
- if (isPdMockEnabled()) {
- return pdMockStore.getProjectPage(params);
- }
return requestClient.get<PageResult<MesPdProjectApi.Project>>(
'/mes/pd/project/page',
{ params },
@@ -46,73 +52,50 @@
}
export function getPdProject(id: number) {
- if (isPdMockEnabled()) {
- return pdMockStore.getProject(id);
- }
return requestClient.get<MesPdProjectApi.Project>(
`/mes/pd/project/get?id=${id}`,
);
}
export function createPdProject(data: MesPdProjectApi.Project) {
- if (isPdMockEnabled()) {
- return pdMockStore.createProject(data);
- }
return requestClient.post<number>('/mes/pd/project/create', data);
}
export function updatePdProject(data: MesPdProjectApi.Project) {
- if (isPdMockEnabled()) {
- return pdMockStore.updateProject(data);
- }
return requestClient.put('/mes/pd/project/update', data);
}
export function deletePdProject(id: number) {
- if (isPdMockEnabled()) {
- return pdMockStore.deleteProject(id);
- }
return requestClient.delete(`/mes/pd/project/delete?id=${id}`);
}
export function exportPdProject(params: MesPdProjectApi.PageParams) {
- if (isPdMockEnabled()) {
- return Promise.resolve(new Blob());
- }
return requestClient.download('/mes/pd/project/export-excel', { params });
}
-export function submitPdProjectReview(id: number) {
- if (isPdMockEnabled()) {
- return pdMockStore.submitProjectReview(id);
- }
- return requestClient.put('/mes/pd/project/submit-review', undefined, {
- params: { id },
- });
-}
-
+/** 鍙戝竷锛堝緟鍙戝竷鈫掑緟涓婁紶锛� */
export function publishPdProject(id: number) {
- if (isPdMockEnabled()) {
- return pdMockStore.publishProject(id);
- }
return requestClient.put('/mes/pd/project/publish', undefined, {
params: { id },
});
}
-export function approvePdProject(id: number) {
- if (isPdMockEnabled()) {
- return pdMockStore.approveProject(id);
- }
- return requestClient.put('/mes/pd/project/approve', undefined, {
+/** 涓婁紶璧勬枡锛堝緟涓婁紶鈫掑緟瀹℃牳锛夛紝鍚庣鑷姩鍒涘缓璧勬枡瀹℃牳璁板綍 */
+export function uploadPdProject(id: number) {
+ return requestClient.put('/mes/pd/project/upload', undefined, {
params: { id },
});
}
+/** 瀹℃牳锛堝緟瀹℃牳鈫掑緟褰掓。锛� */
+export function auditPdProject(id: number) {
+ return requestClient.put('/mes/pd/project/audit', undefined, {
+ params: { id },
+ });
+}
+
+/** 褰掓。锛堝緟褰掓。鈫掑凡褰掓。锛夛紝鍚庣鑷姩鍒涘缓褰掓。鍙拌处璁板綍 */
export function archivePdProject(id: number) {
- if (isPdMockEnabled()) {
- return pdMockStore.archiveProject(id);
- }
return requestClient.put('/mes/pd/project/archive', undefined, {
params: { id },
});
--
Gitblit v1.9.3