From 5367b3b4d92588c4e76728e6bd4ad6aae0cbb967 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 七月 2026 13:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/mes/pro/task/index.vue |   58 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/views/mes/pro/task/index.vue b/src/views/mes/pro/task/index.vue
index 2f71711..cb0bb3a 100644
--- a/src/views/mes/pro/task/index.vue
+++ b/src/views/mes/pro/task/index.vue
@@ -1,31 +1,37 @@
-<script lang="ts" setup>
+锘�<script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
 
 import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
-import { DocAlert, Page, useVbenModal } from '..\..\..\..\packages\effects\common-ui\src';
+import { Page, useVbenModal } from '@vben/common-ui';
 import {
   MesProWorkOrderStatusEnum,
   MesProWorkOrderTypeEnum,
-} from '..\..\..\..\packages\constants\src';
+} 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,
 });
 
@@ -43,7 +49,7 @@
   });
 }
 
-/** 鏌ョ湅宸ュ崟璇︽儏 */
+/** 鏌ョ湅璁㈠崟璇︽儏 */
 function handleDetail(row: MesProWorkOrderApi.WorkOrder) {
   scheduleModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
@@ -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('鎺掍骇澶辫触');
+  }
 }
 
 /** 鎵撳紑鐢樼壒鍥剧紪杈戦〉闈� */
@@ -101,21 +130,15 @@
 
 <template>
   <Page auto-content-height>
-    <template #doc>
-      <DocAlert
-        title="銆愮敓浜с�戠敓浜ф帓浜с�佸伐搴忔祦杞崱"
-        url="https://doc.iocoder.cn/mes/pro/schedule-card/"
-      />
-    </template>
-
     <ScheduleModal @success="handleRefresh" />
+    <SchedulePreviewModal @success="handleRefresh" />
 
     <!-- 鎺掍骇鐢樼壒鍥鹃瑙� -->
     <Card title="鎺掍骇鐢樼壒鍥�" class="mb-4">
       <GanttChart :height="350" :readonly="true" :tasks="ganttTasks" />
     </Card>
 
-    <Grid table-title="寰呮帓浜у伐鍗�">
+    <Grid table-title="寰呮帓浜ц鍗�">
       <template #toolbar-tools>
         <TableAction
           :actions="[
@@ -143,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