From f08a81f01bc4a4104dd9ef04e071bb0bd0eb8afe Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 23 七月 2026 10:50:19 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0
---
src/views/mes/pro/task/index.vue | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/views/mes/pro/task/index.vue b/src/views/mes/pro/task/index.vue
index ed4237c..cb0bb3a 100644
--- a/src/views/mes/pro/task/index.vue
+++ b/src/views/mes/pro/task/index.vue
@@ -11,21 +11,27 @@
MesProWorkOrderTypeEnum,
} from '@vben/constants';
-import { Button, Card } from 'ant-design-vue';
+import { Button, Card, message } 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 { 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 [ScheduleModal, scheduleModalApi] = useVbenModal({
connectedComponent: ScheduleForm,
+ destroyOnClose: true,
+});
+
+const [SchedulePreviewModal, schedulePreviewModalApi] = useVbenModal({
+ connectedComponent: SchedulePreview,
destroyOnClose: true,
});
@@ -51,6 +57,29 @@
/** 鎺掍骇 */
function handleSchedule(row: MesProWorkOrderApi.WorkOrder) {
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('鎺掍骇澶辫触');
+ }
}
/** 鎵撳紑鐢樼壒鍥剧紪杈戦〉闈� */
@@ -100,7 +129,9 @@
</script>
<template>
- <Page auto-content-height><ScheduleModal @success="handleRefresh" />
+ <Page auto-content-height>
+ <ScheduleModal @success="handleRefresh" />
+ <SchedulePreviewModal @success="handleRefresh" />
<!-- 鎺掍骇鐢樼壒鍥鹃瑙� -->
<Card title="鎺掍骇鐢樼壒鍥�" class="mb-4">
@@ -135,6 +166,13 @@
ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
onClick: handleSchedule.bind(null, row),
},
+ {
+ label: '涓�閿帓浜�',
+ type: 'link',
+ auth: ['mes:pro-task:create'],
+ ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
+ onClick: handleAutoSchedulePreview.bind(null, row),
+ },
]"
/>
</template>
--
Gitblit v1.9.3