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/pro/task/index.vue | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 8 deletions(-)
diff --git a/src/views/mes/pro/task/index.vue b/src/views/mes/pro/task/index.vue
index ed4237c..79377f1 100644
--- a/src/views/mes/pro/task/index.vue
+++ b/src/views/mes/pro/task/index.vue
@@ -1,6 +1,6 @@
-锘�<script lang="ts" setup>
+<script lang="ts" setup>
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import {getWorkOrderSchedulePage, type MesProWorkOrderApi} from '#/api/mes/pro/workorder';
import { onMounted, ref } from 'vue';
import { useRouter } from 'vue-router';
@@ -11,21 +11,32 @@
MesProWorkOrderTypeEnum,
} from '@vben/constants';
-import { Button, Card } from 'ant-design-vue';
+import { Button, Card, message, Tabs } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getGanttTaskList } from '#/api/mes/pro/task';
+import { getGanttTaskList, previewAutoGenerate, autoGenerateTasks } from '#/api/mes/pro/task';
import { getWorkOrderPage } from '#/api/mes/pro/workorder';
+import ArchiveDetail from '#/views/mes/pd/archive/modules/detail.vue';
import { GanttChart } from './components';
import { useGridColumns, useGridFormSchema } from './data';
import ScheduleForm from './modules/schedule-form.vue';
+import SchedulePreview from '../workorder-center/modules/schedule-preview.vue';
const router = useRouter();
const ganttTasks = ref<any[]>([]); // 鐢樼壒鍥鹃瑙堟暟鎹�
+const archiveVisible = ref(false);
+const archiveProductCode = ref('');
+
+const activeTab = ref('PENDING'); // 榛樿閫変腑寰呮帓浜�
const [ScheduleModal, scheduleModalApi] = useVbenModal({
connectedComponent: ScheduleForm,
+ destroyOnClose: true,
+});
+
+const [SchedulePreviewModal, schedulePreviewModalApi] = useVbenModal({
+ connectedComponent: SchedulePreview,
destroyOnClose: true,
});
@@ -53,6 +64,35 @@
scheduleModalApi.setData({ formType: 'schedule', id: row.id }).open();
}
+/** 涓�閿帓浜ч瑙� */
+async function handleAutoSchedulePreview(row: MesProWorkOrderApi.WorkOrder) {
+ try {
+ const preview = await previewAutoGenerate({ workOrderId: row.id! });
+ schedulePreviewModalApi
+ .setData({ workOrder: row, preview })
+ .open();
+ } catch {
+ message.error('鑾峰彇鎺掍骇棰勮澶辫触');
+ }
+}
+
+/** 涓�閿帓浜ф墽琛� */
+async function handleAutoSchedule(row: MesProWorkOrderApi.WorkOrder) {
+ try {
+ const result = await autoGenerateTasks({ workOrderId: row.id! });
+ message.success(`鎺掍骇鎴愬姛锛岀敓鎴� ${result.taskIds?.length || 0} 涓换鍔);
+ handleRefresh();
+ } catch {
+ message.error('鎺掍骇澶辫触');
+ }
+}
+
+/** 鎵撳紑褰掓。璇︽儏 */
+function handleArchive(row: MesProWorkOrderApi.WorkOrder) {
+ archiveProductCode.value = row.productCode || '';
+ archiveVisible.value = true;
+}
+
/** 鎵撳紑鐢樼壒鍥剧紪杈戦〉闈� */
function handleGanttEdit() {
router.push({ name: 'MesProTaskGanttEdit' });
@@ -68,10 +108,19 @@
proxyConfig: {
ajax: {
query: async ({ page }, formValues) => {
- return await getWorkOrderPage({
+ let scheduleStatus: number | undefined = undefined;
+
+ if (activeTab.value === 'PENDING') {
+ scheduleStatus = 0; // 寰呮帓浜�
+ } else if (activeTab.value === 'FINISHED') {
+ scheduleStatus = 1; // 宸插畬鎴�
+ }
+ // activeTab === 'ALL' 鏃朵笉浼�
+
+ return await getWorkOrderSchedulePage({
pageNo: page.currentPage,
pageSize: page.pageSize,
- status: MesProWorkOrderStatusEnum.CONFIRMED,
+ scheduleStatus,
type: MesProWorkOrderTypeEnum.SELF,
...formValues,
});
@@ -100,14 +149,26 @@
</script>
<template>
- <Page auto-content-height><ScheduleModal @success="handleRefresh" />
+ <Page auto-content-height>
+ <ScheduleModal @success="handleRefresh" />
+ <SchedulePreviewModal @success="handleRefresh" />
<!-- 鎺掍骇鐢樼壒鍥鹃瑙� -->
<Card title="鎺掍骇鐢樼壒鍥�" class="mb-4">
<GanttChart :height="350" :readonly="true" :tasks="ganttTasks" />
</Card>
- <Grid table-title="寰呮帓浜ц鍗�">
+ <Grid>
+ <template #table-title>
+ <div class="flex flex-col gap-2">
+ <span class="text-base font-medium">鐢熶骇璁㈠崟鍒楄〃</span>
+ <Tabs v-model:activeKey="activeTab" @change="handleRefresh" :tabBarStyle="{ margin: 0, borderBottom: 0 }">
+ <Tabs.TabPane key="ALL" tab="鍏ㄩ儴" />
+ <Tabs.TabPane key="PENDING" tab="鏈畬鎴�" />
+ <Tabs.TabPane key="FINISHED" tab="宸插畬鎴�" />
+ </Tabs>
+ </div>
+ </template>
<template #toolbar-tools>
<TableAction
:actions="[
@@ -135,9 +196,15 @@
ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
onClick: handleSchedule.bind(null, row),
},
+ {
+ label: '褰掓。璇︽儏',
+ type: 'link',
+ onClick: handleArchive.bind(null, row),
+ },
]"
/>
</template>
</Grid>
+ <ArchiveDetail :visible="archiveVisible" :product-code="archiveProductCode" @update:visible="archiveVisible = $event" />
</Page>
</template>
--
Gitblit v1.9.3