From b7d52c84a343c76b41db612b75e33dec006d2625 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 09:35:48 +0800
Subject: [PATCH 01/20] =?UTF-8?q?style=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=88=B6?=
 =?UTF-8?q?=E5=8D=95-=E7=88=B6=E5=88=97=E8=A1=A8=E9=A1=B9=E7=9A=84status?=
 =?UTF-8?q?=E5=80=BC=E4=B8=BA2,7,8,9,10=E6=97=B6=EF=BC=8C=E5=AD=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/task/components/TaskDetailList.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/mes/task/components/TaskDetailList.vue b/src/views/mes/task/components/TaskDetailList.vue
index c0c7dd33..51b33a68 100644
--- a/src/views/mes/task/components/TaskDetailList.vue
+++ b/src/views/mes/task/components/TaskDetailList.vue
@@ -54,6 +54,7 @@
             排产
           </el-button> -->
           <el-button
+            v-if="![2,7,8,9,10].includes(props.taskStatus)"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
@@ -62,6 +63,7 @@
             {{ t('ProductionPlan.Task.detailListEditActionText') }}
           </el-button>
           <el-button
+            v-if="![2,7,8,9,10].includes(props.taskStatus)"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"

From 40967ed2002e9921b644794ad115c5a798ac0403 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 10:20:24 +0800
Subject: [PATCH 02/20] =?UTF-8?q?style=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E6=8E=92=E4=BA=A7-=E6=8E=92=E4=BA=A7=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog/src/Dialog.vue                       | 7 ++++---
 .../mes/tasksummary/components/TaskScheduleDialog.vue      | 7 ++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index a1eb550c..854ebfe3 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -9,13 +9,14 @@ const props = defineProps({
   modelValue: propTypes.bool.def(false),
   title: propTypes.string.def('Dialog'),
   fullscreen: propTypes.bool.def(true),
+  initialFullscreen: propTypes.bool.def(false),
   width: propTypes.oneOfType([String, Number]).def('40%'),
-  scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
+  scroll: propTypes.bool.def(false),
   maxHeight: propTypes.oneOfType([String, Number]).def('400px')
 })
 
 const getBindValue = computed(() => {
-  const delArr: string[] = ['fullscreen', 'title', 'maxHeight', 'appendToBody']
+  const delArr: string[] = ['fullscreen', 'initialFullscreen', 'title', 'maxHeight', 'appendToBody']
   const attrs = useAttrs()
   const obj = { ...attrs, ...props }
   for (const key in obj) {
@@ -26,7 +27,7 @@ const getBindValue = computed(() => {
   return obj
 })
 
-const isFullscreen = ref(false)
+const isFullscreen = ref(props.initialFullscreen)
 
 const toggleFull = () => {
   isFullscreen.value = !unref(isFullscreen)
diff --git a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
index 64740eff..c789d8eb 100644
--- a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
+++ b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="排产" width="80%" destroy-on-close align-center>
+  <Dialog v-model="dialogVisible" title="排产" :initialFullscreen="true" destroy-on-close>
     <div class="flex items-center gap-20px mb-16px">
       <div class="flex items-center gap-8px">
         <span class="text-red-500">*</span>
@@ -33,6 +33,7 @@
         <span>是否跳过节假日</span>
         <el-switch v-model="searchForm.skipHoliday" />
       </div>
+      <el-button type="primary" :loading="submitLoading" @click="handleSubmit" class="ml-auto">确认排产</el-button>
     </div>
 
     <div class="border border-solid border-gray-200 rounded p-16px mt-16px">
@@ -177,10 +178,6 @@
       </el-table>
     </div>
 
-    <template #footer>
-      <el-button type="primary" :loading="submitLoading" @click="handleSubmit">确定</el-button>
-      <el-button @click="dialogVisible = false">取消</el-button>
-    </template>
   </Dialog>
 
   <TaskSchedulePreviewDialog

From b22631a612b84e2350889b85ebc1704cb1a93539 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 10:34:03 +0800
Subject: [PATCH 03/20] =?UTF-8?q?style=EF=BC=9A=E4=BA=A7=E5=93=81BOM-?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AD=9B=E9=80=89=E6=A1=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/bom/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/bom/index.vue b/src/views/mes/bom/index.vue
index de13d7ad..8e3c1677 100644
--- a/src/views/mes/bom/index.vue
+++ b/src/views/mes/bom/index.vue
@@ -241,6 +241,6 @@ const handleExport = async () => {
 onMounted(async () => {
   await getList()
   // 加载产品、
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getMesProductSimpleList()
 })
 </script>

From 20b54fbd70846c52bf828bccbb50b3c4eb34f3c2 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 10:45:56 +0800
Subject: [PATCH 04/20] =?UTF-8?q?style=EF=BC=9A=E6=A3=80=E9=AA=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95-=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/zjTask/ZjTaskForm.vue | 30 +++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/zjTask/ZjTaskForm.vue b/src/views/mes/zjTask/ZjTaskForm.vue
index bb900a8f..7dbb570d 100644
--- a/src/views/mes/zjTask/ZjTaskForm.vue
+++ b/src/views/mes/zjTask/ZjTaskForm.vue
@@ -2,7 +2,14 @@
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" v-loading="formLoading">
       <el-form-item :label="t('QualityManagement.ZjTask.formCode')" prop="code">
-        <el-input v-model="formData.code" :placeholder="t('QualityManagement.ZjTask.placeholderFormCode')" />
+        <el-row :gutter="8" class="w-full">
+          <el-col :span="20">
+            <el-input v-model="formData.code" :placeholder="t('QualityManagement.ZjTask.placeholderFormCode')" :disabled="Boolean(formData.isCode) || formType === 'update'" />
+          </el-col>
+          <el-col :span="4">
+            <el-switch v-model="formData.isCode" :disabled="formType === 'update'" @change="handleCodeAutoChange" />
+          </el-col>
+        </el-row>
       </el-form-item>
       <el-form-item :label="t('QualityManagement.ZjTask.formType')" prop="type">
         <el-select v-model="formData.type" clearable filterable
@@ -120,6 +127,7 @@ const planList = ref<PlanVO[]>([])
 const formData = ref<{ [key: string]: any }>({
   id: undefined,
   code: undefined,
+  isCode: true,
   name: undefined,
   type: undefined,
   schemaId: undefined,
@@ -133,7 +141,17 @@ const formData = ref<{ [key: string]: any }>({
 })
 
 const formRules = reactive({
-  code: [{ required: true, message: t('QualityManagement.ZjTask.validatorCodeRequired'), trigger: 'blur' }],
+  code: [{ required: true, validator: (_rule, value, callback) => {
+    if (Boolean(formData.value.isCode)) {
+      callback()
+      return
+    }
+    if (value === undefined || value === null || String(value).trim() === '') {
+      callback(new Error(t('QualityManagement.ZjTask.validatorCodeRequired')))
+      return
+    }
+    callback()
+  }, trigger: 'blur' }],
   type: [{ required: true, message: t('QualityManagement.ZjTask.validatorTypeRequired'), trigger: 'change' }],
   schemaId: [{ required: true, message: t('QualityManagement.ZjTask.validatorSchemaRequired'), trigger: 'change' }],
   ticket: [{ required: true, message: t('QualityManagement.ZjTask.validatorTicketRequired'), trigger: 'blur' }],
@@ -150,6 +168,13 @@ const selectedSchemaId = ref<number | undefined>(undefined)
 const orgTypeOptions = getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)
 const userList = ref<UserApi.UserVO[]>([])
 
+const handleCodeAutoChange = (value: boolean) => {
+  if (value) {
+    formData.value.code = undefined
+  }
+  formRef.value?.clearValidate('code')
+}
+
 const formatSchemaVal = (val: string | number | null | undefined) => {
   if (val === null || val === undefined || val === '') return ''
   const text = String(val).trim()
@@ -205,6 +230,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     code: undefined,
+    isCode: true,
     name: undefined,
     type: undefined,
     schemaId: undefined,

From 99aeeb54fdb011a27ce135bbf1d3bd1f9c286120 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 10:59:05 +0800
Subject: [PATCH 05/20] =?UTF-8?q?style=EF=BC=9A=E6=8E=92=E4=BA=A7=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E9=80=82=E9=85=8D=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en.ts                             |  50 +++++++-
 src/locales/zh-CN.ts                          |  50 +++++++-
 .../components/TaskScheduleDialog.vue         | 114 +++++++++---------
 3 files changed, 155 insertions(+), 59 deletions(-)

diff --git a/src/locales/en.ts b/src/locales/en.ts
index 4769f483..cc2d0185 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3470,7 +3470,55 @@ export default {
       validatorPlanFormTaskIdRequired: 'Task order can not be empty',
       validatorPlanFormPlanNumberRequired: 'Quantity can not be empty',
       validatorPlanFormPlanStartTimeRequired: 'Plan start time can not be empty',
-      validatorPlanFormPlanEndTimeRequired: 'Plan end time can not be empty'
+      validatorPlanFormPlanEndTimeRequired: 'Plan end time can not be empty',
+
+      scheduleDialogTitle: 'Schedule',
+      scheduleRuleLabel: 'Schedule Rule',
+      capacitySourceLabel: 'Capacity Source',
+      workTimeLabel: 'Work Time',
+      skipHolidayLabel: 'Skip Holidays',
+      confirmScheduleButton: 'Confirm Schedule',
+      scheduleFormCodeLabel: 'Task Order Code',
+      scheduleFormCodePlaceholder: 'Please input',
+      scheduleFormOrderDateLabel: 'Order Date',
+      scheduleFormDeliveryDateLabel: 'Delivery Date',
+      scheduleFormRemarkLabel: 'Remark',
+      scheduleFormRemarkPlaceholder: 'Please input',
+      scheduleFormInventoryTaskLabel: 'Inventory Task',
+      scheduleFormSearchButton: 'Search',
+      scheduleFormResetButton: 'Reset',
+      scheduleYesLabel: 'Yes',
+      scheduleNoLabel: 'No',
+      relateDeviceButton: 'Relate Device',
+      deviceRelationDialogTitle: 'Relate Device',
+      deviceRelationLabel: 'Related Device',
+      deviceRelationPlaceholder: 'Click to select device',
+      deviceRelationSaveButton: 'Save',
+      deviceRelationCancelButton: 'Cancel',
+      selectDeviceDialogTitle: 'Select Device',
+      deviceColumnCode: 'Device Code',
+      deviceColumnName: 'Device Name',
+      deviceColumnModel: 'Device Model',
+      deviceColumnWorkshop: 'Workshop',
+      scheduleRulePriority: 'Order Priority',
+      scheduleRuleCategory: 'Product Category Order',
+      scheduleRuleDelivery: 'Delivery Date Priority',
+      capacityTypeRated: 'Rated Capacity',
+      capacityTypeDailyAvg: 'Daily Report Average',
+      capacityTypeDataCollection: 'Data Collection Capacity',
+      inventoryTaskType: 'Inventory Task',
+      taskNoDetailWarning: 'Task order {code} has no detail data, cannot be selected',
+      partialTaskNoDetailWarning: 'Some task orders have no detail data, selection has been automatically cancelled',
+      taskItemNeedPrefix: 'Task Order-',
+      detailNoProductWarning: 'Current detail has no related product, cannot set device',
+      deviceRelationSaved: 'Device relation saved',
+      selectScheduleRuleWarning: 'Please select a schedule rule',
+      selectCapacitySourceWarning: 'Please select a capacity source',
+      selectWorkTimeWarning: 'Please select work time',
+      selectDetailWarning: 'Please select at least one task summary detail',
+      scheduleSubmitted: 'Schedule submitted',
+      startDatePlaceholder: 'Start Date',
+      endDatePlaceholder: 'End Date'
     },
 
     Plan: {
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index e64a15fd..7ebf9212 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -3314,7 +3314,55 @@ export default {
       validatorPlanFormTaskIdRequired: '任务单不能为空',
       validatorPlanFormPlanNumberRequired: '数量不能为空',
       validatorPlanFormPlanStartTimeRequired: '计划开始时间不能为空',
-      validatorPlanFormPlanEndTimeRequired: '计划结束时间不能为空'
+      validatorPlanFormPlanEndTimeRequired: '计划结束时间不能为空',
+
+      scheduleDialogTitle: '排产',
+      scheduleRuleLabel: '排产规则',
+      capacitySourceLabel: '产能来源',
+      workTimeLabel: '生产时间安排',
+      skipHolidayLabel: '是否跳过节假日',
+      confirmScheduleButton: '确认排产',
+      scheduleFormCodeLabel: '任务单编码',
+      scheduleFormCodePlaceholder: '请输入',
+      scheduleFormOrderDateLabel: '下达日期',
+      scheduleFormDeliveryDateLabel: '交货日期',
+      scheduleFormRemarkLabel: '备注',
+      scheduleFormRemarkPlaceholder: '请输入',
+      scheduleFormInventoryTaskLabel: '库存任务',
+      scheduleFormSearchButton: '查询',
+      scheduleFormResetButton: '重置',
+      scheduleYesLabel: '是',
+      scheduleNoLabel: '否',
+      relateDeviceButton: '关联设备',
+      deviceRelationDialogTitle: '关联设备',
+      deviceRelationLabel: '关联设备',
+      deviceRelationPlaceholder: '点击选择设备',
+      deviceRelationSaveButton: '保存',
+      deviceRelationCancelButton: '取消',
+      selectDeviceDialogTitle: '选择设备',
+      deviceColumnCode: '设备编号',
+      deviceColumnName: '设备名称',
+      deviceColumnModel: '设备型号',
+      deviceColumnWorkshop: '所属车间',
+      scheduleRulePriority: '订单优先级',
+      scheduleRuleCategory: '产品类别顺序',
+      scheduleRuleDelivery: '订单交期优先',
+      capacityTypeRated: '额定产能',
+      capacityTypeDailyAvg: '每日报工平均值',
+      capacityTypeDataCollection: '数据采集产能',
+      inventoryTaskType: '库存任务',
+      taskNoDetailWarning: '任务单 {code} 无任务明细数据，无法勾选',
+      partialTaskNoDetailWarning: '部分任务单无明细数据，已自动取消勾选',
+      taskItemNeedPrefix: '任务单-',
+      detailNoProductWarning: '当前明细没有关联产品，无法设置设备',
+      deviceRelationSaved: '关联设备已保存',
+      selectScheduleRuleWarning: '请选择排产规则',
+      selectCapacitySourceWarning: '请选择产能来源',
+      selectWorkTimeWarning: '请选择生产时间安排',
+      selectDetailWarning: '至少选一个任务单汇总明细的数据',
+      scheduleSubmitted: '排产已提交',
+      startDatePlaceholder: '开始日期',
+      endDatePlaceholder: '结束日期'
     },
     Plan: {
       moduleName: '生产计划',
diff --git a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
index c789d8eb..956a9707 100644
--- a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
+++ b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
@@ -1,23 +1,23 @@
 <template>
-  <Dialog v-model="dialogVisible" title="排产" :initialFullscreen="true" destroy-on-close>
+  <Dialog v-model="dialogVisible" :title="t('ProductionPlan.TaskSummary.scheduleDialogTitle')" :initialFullscreen="true" destroy-on-close>
     <div class="flex items-center gap-20px mb-16px">
       <div class="flex items-center gap-8px">
         <span class="text-red-500">*</span>
-        <span>排产规则</span>
+        <span>{{ t('ProductionPlan.TaskSummary.scheduleRuleLabel') }}</span>
         <el-select v-model="searchForm.sortRule" class="!w-220px" clearable>
           <el-option v-for="item in scheduleRuleOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </div>
       <div class="flex items-center gap-8px">
         <span class="text-red-500">*</span>
-        <span>产能来源</span>
+        <span>{{ t('ProductionPlan.TaskSummary.capacitySourceLabel') }}</span>
         <el-select v-model="searchForm.capacityType" class="!w-220px">
           <el-option v-for="item in capacityTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </div>
       <div class="flex items-center gap-8px">
         <span class="text-red-500">*</span>
-        <span>生产时间安排</span>
+        <span>{{ t('ProductionPlan.TaskSummary.workTimeLabel') }}</span>
         <el-time-picker
           v-model="searchForm.workTimeRange"
           is-range
@@ -30,53 +30,53 @@
         />
       </div>
       <div class="flex items-center gap-8px">
-        <span>是否跳过节假日</span>
+        <span>{{ t('ProductionPlan.TaskSummary.skipHolidayLabel') }}</span>
         <el-switch v-model="searchForm.skipHoliday" />
       </div>
-      <el-button type="primary" :loading="submitLoading" @click="handleSubmit" class="ml-auto">确认排产</el-button>
+      <el-button type="primary" :loading="submitLoading" @click="handleSubmit" class="ml-auto">{{ t('ProductionPlan.TaskSummary.confirmScheduleButton') }}</el-button>
     </div>
 
     <div class="border border-solid border-gray-200 rounded p-16px mt-16px">
       <el-form :inline="true" :model="searchForm" label-width="90px" class="-mb-8px">
-        <el-form-item label="任务单编码">
-          <el-input v-model="searchForm.code" placeholder="请输入" clearable class="!w-200px" />
+        <el-form-item :label="t('ProductionPlan.TaskSummary.scheduleFormCodeLabel')">
+          <el-input v-model="searchForm.code" :placeholder="t('ProductionPlan.TaskSummary.scheduleFormCodePlaceholder')" clearable class="!w-200px" />
         </el-form-item>
-        <el-form-item label="下达日期">
+        <el-form-item :label="t('ProductionPlan.TaskSummary.scheduleFormOrderDateLabel')">
           <el-date-picker
             v-model="searchForm.orderDate"
             type="daterange"
             value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            :start-placeholder="t('ProductionPlan.TaskSummary.startDatePlaceholder')"
+            :end-placeholder="t('ProductionPlan.TaskSummary.endDatePlaceholder')"
             :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
             class="!w-260px"
           />
         </el-form-item>
-        <el-form-item label="交货日期">
+        <el-form-item :label="t('ProductionPlan.TaskSummary.scheduleFormDeliveryDateLabel')">
           <el-date-picker
             v-model="searchForm.deliveryDate"
             type="daterange"
             value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            :start-placeholder="t('ProductionPlan.TaskSummary.startDatePlaceholder')"
+            :end-placeholder="t('ProductionPlan.TaskSummary.endDatePlaceholder')"
             :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
             class="!w-260px"
           />
         </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="searchForm.remark" placeholder="请输入" clearable class="!w-220px" />
+        <el-form-item :label="t('ProductionPlan.TaskSummary.scheduleFormRemarkLabel')">
+          <el-input v-model="searchForm.remark" :placeholder="t('ProductionPlan.TaskSummary.scheduleFormRemarkPlaceholder')" clearable class="!w-220px" />
         </el-form-item>
-        <el-form-item label="库存任务">
+        <el-form-item :label="t('ProductionPlan.TaskSummary.scheduleFormInventoryTaskLabel')">
           <div class="flex items-center gap-8px">
             <el-switch v-model="searchForm.inventoryTaskSchedule" />
           </div>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleSearch">
-            <Icon icon="ep:search" class="mr-5px" /> 查询
+            <Icon icon="ep:search" class="mr-5px" /> {{ t('ProductionPlan.TaskSummary.scheduleFormSearchButton') }}
           </el-button>
           <el-button @click="handleReset">
-            <Icon icon="ep:refresh" class="mr-5px" /> 重置
+            <Icon icon="ep:refresh" class="mr-5px" /> {{ t('ProductionPlan.TaskSummary.scheduleFormResetButton') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -111,7 +111,7 @@
         </el-table-column>
         <el-table-column :label="t('ProductionPlan.TaskSummary.tableScheduleCompletedColumn')" align="center">
           <template #default="scope">
-            <el-tag :type="scope.row.isScheduled ? 'success' : 'info'">{{ scope.row.isScheduled ? '是' : '否' }}</el-tag>
+            <el-tag :type="scope.row.isScheduled ? 'success' : 'info'">{{ scope.row.isScheduled ? t('ProductionPlan.TaskSummary.scheduleYesLabel') : t('ProductionPlan.TaskSummary.scheduleNoLabel') }}</el-tag>
           </template>
         </el-table-column>
          <el-table-column :label="t('ProductionPlan.Task.tableIsUrgentColumn')" align="center" prop="isUrgent" sortable>
@@ -171,7 +171,7 @@
               {{ t('ProductionPlan.TaskSummary.detailActionMaterialLabel') }}
             </el-button>
             <el-button link type="primary" @click="openDeviceRelationDialog(scope.row)">
-              关联设备
+              {{ t('ProductionPlan.TaskSummary.relateDeviceButton') }}
             </el-button>
           </template>
         </el-table-column>
@@ -186,26 +186,26 @@
     @saved="handlePreviewSaved"
   />
 
-  <Dialog v-model="deviceRelationDialogVisible" title="关联设备" width="520px">
+  <Dialog v-model="deviceRelationDialogVisible" :title="t('ProductionPlan.TaskSummary.deviceRelationDialogTitle')" width="520px">
     <el-form :model="deviceRelationForm" label-width="90px" v-loading="deviceRelationLoading">
-      <el-form-item label="关联设备">
+      <el-form-item :label="t('ProductionPlan.TaskSummary.deviceRelationLabel')">
         <el-input
           :model-value="deviceRelationDisplayText"
-          placeholder="点击选择设备"
+          :placeholder="t('ProductionPlan.TaskSummary.deviceRelationPlaceholder')"
           readonly
           @click="openDeviceSelectDialog"
         />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button type="primary" :loading="deviceRelationSaving" @click="submitDeviceRelation">保存</el-button>
-      <el-button @click="deviceRelationDialogVisible = false">取消</el-button>
+      <el-button type="primary" :loading="deviceRelationSaving" @click="submitDeviceRelation">{{ t('ProductionPlan.TaskSummary.deviceRelationSaveButton') }}</el-button>
+      <el-button @click="deviceRelationDialogVisible = false">{{ t('ProductionPlan.TaskSummary.deviceRelationCancelButton') }}</el-button>
     </template>
   </Dialog>
 
   <TableSelectDialog
     ref="deviceSelectDialogRef"
-    title="选择设备"
+    :title="t('ProductionPlan.TaskSummary.selectDeviceDialogTitle')"
     :columns="deviceColumns"
     :fetch-api="fetchDeviceLedgerPage"
     row-key="id"
@@ -253,28 +253,28 @@ const deviceRelationForm = reactive({
   devices: [] as { id: number; name: string }[]
 })
 
-const deviceColumns = [
-  { label: '设备编号', prop: 'deviceCode', minWidth: 140 },
-  { label: '设备名称', prop: 'deviceName', minWidth: 160 },
-  { label: '设备型号', prop: 'deviceModel', minWidth: 140 },
-  { label: '所属车间', prop: 'workshop', minWidth: 140 }
-]
+const deviceColumns = computed(() => [
+  { label: t('ProductionPlan.TaskSummary.deviceColumnCode'), prop: 'deviceCode', minWidth: 140 },
+  { label: t('ProductionPlan.TaskSummary.deviceColumnName'), prop: 'deviceName', minWidth: 160 },
+  { label: t('ProductionPlan.TaskSummary.deviceColumnModel'), prop: 'deviceModel', minWidth: 140 },
+  { label: t('ProductionPlan.TaskSummary.deviceColumnWorkshop'), prop: 'workshop', minWidth: 140 }
+])
 const deviceRelationDisplayText = computed(() => {
   if (!deviceRelationForm.devices.length) return ''
   if (!selectedDeviceRows.value.length) return deviceRelationForm.devices.map((item) => item.name).join('、')
   return selectedDeviceRows.value.map((item) => item.deviceName || item.name || item.code || `ID:${item.id}`).join('、')
 })
 
-const scheduleRuleOptions = [
-  { label: '订单优先级', value: 2 },
-  { label: '产品类别顺序', value: 3 },
-  { label: '订单交期优先', value: 4 }
-]
-const capacityTypeOptions = [
-  { label: '额定产能', value: 1 },
-  { label: '每日报工平均值', value: 2 },
-  { label: '数据采集产能', value: 3 }
-]
+const scheduleRuleOptions = computed(() => [
+  { label: t('ProductionPlan.TaskSummary.scheduleRulePriority'), value: 2 },
+  { label: t('ProductionPlan.TaskSummary.scheduleRuleCategory'), value: 3 },
+  { label: t('ProductionPlan.TaskSummary.scheduleRuleDelivery'), value: 4 }
+])
+const capacityTypeOptions = computed(() => [
+  { label: t('ProductionPlan.TaskSummary.capacityTypeRated'), value: 1 },
+  { label: t('ProductionPlan.TaskSummary.capacityTypeDailyAvg'), value: 2 },
+  { label: t('ProductionPlan.TaskSummary.capacityTypeDataCollection'), value: 3 }
+])
 
 const searchForm = reactive({
   inventoryTaskSchedule: false,
@@ -384,7 +384,7 @@ const loadTaskList = async () => {
       orderDate: searchForm.orderDate,
       deliveryDate: searchForm.deliveryDate,
       remark: searchForm.remark || undefined,
-      taskType: searchForm.inventoryTaskSchedule ? '库存任务' : undefined
+      taskType: searchForm.inventoryTaskSchedule ? t('ProductionPlan.TaskSummary.inventoryTaskType') : undefined
     }
     const data = await TaskApi.getPlanTaskPage(params)
     taskList.value = data?.list ?? []
@@ -469,7 +469,7 @@ const handleTaskSelect = async (selection: any[], row: any) => {
       await handleCurrentTaskChange(row)
       const childList = allDetailsMap.value[row.id] || []
       if (childList.length === 0) {
-        message.warning(`任务单 ${row.code} 无任务明细数据，无法勾选`)
+        message.warning(t('ProductionPlan.TaskSummary.taskNoDetailWarning', { code: row.code }))
         taskTableRef.value?.toggleRowSelection(row, false)
         return
       }
@@ -515,7 +515,7 @@ const handleTaskSelectAll = async (selection: any[]) => {
         }
       }
       if (hasEmptyChild) {
-        message.warning('部分任务单无明细数据，已自动取消勾选')
+        message.warning(t('ProductionPlan.TaskSummary.partialTaskNoDetailWarning'))
       }
     } else {
       detailTableRef.value?.clearSelection()
@@ -586,7 +586,7 @@ const handleReset = async () => {
 
 const openTaskItemNeed = (row: any) => {
   if (!row?.id) return
-  itemNeedRef.value.open('task', '任务单-' + (row?.code ?? ''), row.id)
+  itemNeedRef.value.open('task', t('ProductionPlan.TaskSummary.taskItemNeedPrefix') + (row?.code ?? ''), row.id)
 }
 
 const openProductItemNeed = (row: any) => {
@@ -596,7 +596,7 @@ const openProductItemNeed = (row: any) => {
 }
 const openDeviceRelationDialog = async (row: any) => {
   if (!row?.productId) {
-    message.warning('当前明细没有关联产品，无法设置设备')
+    message.warning(t('ProductionPlan.TaskSummary.detailNoProductWarning'))
     return
   }
   currentDeviceRelationRow.value = row
@@ -610,7 +610,7 @@ const openDeviceRelationDialog = async (row: any) => {
       (productData as any).devices ?? (productData as any).deviceIds,
       (productData as any).deviceList,
       ['name', 'deviceName', 'code'],
-      '设备'
+      t('ProductionPlan.TaskSummary.deviceColumnName')
     )
     deviceRelationForm.productId = Number(row.productId)
     deviceRelationForm.devices = devices
@@ -632,7 +632,7 @@ const handleDeviceSelectConfirm = (payload: { ids: (number | string)[]; rows: an
       if (!Number.isFinite(id)) return undefined
       return {
         id,
-        name: item.deviceName || item.name || item.code || `设备ID:${id}`
+        name: item.deviceName || item.name || item.code || `${t('ProductionPlan.TaskSummary.deviceColumnName')}ID:${id}`
       }
     })
     .filter((item): item is { id: number; name: string } => Boolean(item))
@@ -655,7 +655,7 @@ const submitDeviceRelation = async () => {
       currentData.molds ?? currentData.moldIds,
       currentData.moldList,
       ['name', 'code'],
-      '模具'
+      t('ProductionPlan.TaskSummary.deviceColumnName')
     )
     const payload: any = {
       ...currentData,
@@ -666,7 +666,7 @@ const submitDeviceRelation = async () => {
     delete payload.molds
     await ProductApi.updateProduct(payload)
     await refreshDetailListAfterDeviceSaved()
-    message.success('关联设备已保存')
+    message.success(t('ProductionPlan.TaskSummary.deviceRelationSaved'))
     deviceRelationDialogVisible.value = false
   } finally {
     deviceRelationSaving.value = false
@@ -683,22 +683,22 @@ const hasValue = (value: unknown) => value !== null && value !== undefined && va
 
 const handleSubmit = async () => {
   if (searchForm.sortRule === undefined) {
-    message.warning('请选择排产规则')
+    message.warning(t('ProductionPlan.TaskSummary.selectScheduleRuleWarning'))
     return
   }
   if (searchForm.capacityType === undefined) {
-    message.warning('请选择产能来源')
+    message.warning(t('ProductionPlan.TaskSummary.selectCapacitySourceWarning'))
     return
   }
   const [workStartTime, workEndTime] = Array.isArray(searchForm.workTimeRange) ? searchForm.workTimeRange : []
   if (!workStartTime || !workEndTime) {
-    message.warning('请选择生产时间安排')
+    message.warning(t('ProductionPlan.TaskSummary.selectWorkTimeWarning'))
     return
   }
 
   const selectedRows = detailTableRef.value?.getSelectionRows() || []
   if (selectedRows.length === 0) {
-    message.warning('至少选一个任务单汇总明细的数据')
+    message.warning(t('ProductionPlan.TaskSummary.selectDetailWarning'))
     return
   }
   submitLoading.value = true
@@ -742,7 +742,7 @@ const handleSubmit = async () => {
       ? (scheduleResult as any).data
       : []
     previewScheduleList.value = scheduleData
-    message.success('排产已提交')
+    message.success(t('ProductionPlan.TaskSummary.scheduleSubmitted'))
     previewVisible.value = true
     emit('success')
   } finally {

From 6d57b13a751a9f0166bec4c37a24cccbcaec3cf3 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 11:11:53 +0800
Subject: [PATCH 06/20] =?UTF-8?q?style=EF=BC=9A=E6=8E=92=E4=BA=A7=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86-=E4=BB=BB=E5=8A=A1=E5=8D=95=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86-=E6=9C=AA=E8=AE=A1=E5=88=92=E6=95=B0?=
 =?UTF-8?q?=E4=B8=BA0=E7=9A=84=EF=BC=8C=E4=B8=8D=E8=83=BD=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TaskScheduleDialog.vue         | 53 +++++++++++++------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
index 956a9707..73eb984b 100644
--- a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
+++ b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue
@@ -151,7 +151,7 @@
         @select="handleDetailSelect"
         @select-all="handleDetailSelectAll"
       >
-        <el-table-column type="selection" width="55" :reserve-selection="true" align="center" />
+        <el-table-column type="selection" width="55" :reserve-selection="true" align="center" :selectable="isDetailRowSelectable" />
         <el-table-column :label="t('ProductionPlan.TaskSummary.detailTableTaskCodeColumn')" align="center" prop="taskCode" sortable width="200px"/>
         <el-table-column :label="t('ProductionPlan.TaskSummary.detailTableProductCodeColumn')" align="center" prop="barCode" sortable />
         <el-table-column :label="t('ProductionPlan.TaskSummary.detailTableProductNameColumn')" align="center" prop="productName" sortable />
@@ -449,7 +449,10 @@ const handleCurrentTaskChange = async (row: any) => {
       const parentIsSelected = taskTableRef.value?.getSelectionRows()?.some((t: any) => t.id === row.id)
       if (parentIsSelected) {
         detailList.value.forEach(child => {
-          detailTableRef.value?.toggleRowSelection(child, true)
+          const unplanNumber = child.number - child.planNumber
+          if (unplanNumber > 0) {
+            detailTableRef.value?.toggleRowSelection(child, true)
+          }
         })
       }
     })
@@ -474,7 +477,10 @@ const handleTaskSelect = async (selection: any[], row: any) => {
         return
       }
       detailList.value.forEach((child) => {
-        detailTableRef.value?.toggleRowSelection(child, true)
+        const unplanNumber = child.number - child.planNumber
+        if (unplanNumber > 0) {
+          detailTableRef.value?.toggleRowSelection(child, true)
+        }
       })
       return
     }
@@ -507,9 +513,12 @@ const handleTaskSelectAll = async (selection: any[]) => {
           taskTableRef.value?.toggleRowSelection(row, false)
         } else {
           childList.forEach((child) => {
-            const rowInView = detailList.value.find(d => d.id === child.id)
-            if (rowInView) {
-              detailTableRef.value?.toggleRowSelection(rowInView, true)
+            const unplanNumber = child.number - child.planNumber
+            if (unplanNumber > 0) {
+              const rowInView = detailList.value.find(d => d.id === child.id)
+              if (rowInView) {
+                detailTableRef.value?.toggleRowSelection(rowInView, true)
+              }
             }
           })
         }
@@ -528,10 +537,13 @@ const handleTaskSelectAll = async (selection: any[]) => {
 const handleDetailSelect = (selection: any[], row: any) => {
   const taskId = row.taskId
   const childList = allDetailsMap.value[taskId] || []
+  const selectableChildren = childList.filter(child => {
+    const unplanNumber = child.number - child.planNumber
+    return unplanNumber > 0
+  })
   
-  // check if all children for this task are selected
-  const allChildrenSelected = childList.every(child => selection.some(sel => sel.id === child.id))
-  const noChildrenSelected = childList.every(child => !selection.some(sel => sel.id === child.id))
+  const allChildrenSelected = selectableChildren.length > 0 && selectableChildren.every(child => selection.some(sel => sel.id === child.id))
+  const noChildrenSelected = selectableChildren.every(child => !selection.some(sel => sel.id === child.id))
   
   const parentTask = taskList.value.find(task => task.id === taskId)
   if (parentTask) {
@@ -548,14 +560,16 @@ const handleDetailSelectAll = (selection: any[]) => {
   
   const taskId = currentTask.value.id
   const childList = allDetailsMap.value[taskId] || []
+  const selectableChildren = childList.filter(child => {
+    const unplanNumber = child.number - child.planNumber
+    return unplanNumber > 0
+  })
   
   const parentTask = taskList.value.find(task => task.id === taskId)
   if (parentTask) {
-    // if any child in current view is selected, consider it an intent to select parent (if not all were selected)
-    // selection will contain all selected items across pages, so we need to filter for current view's task
     const currentViewSelection = selection.filter(sel => sel.taskId === taskId)
     
-    if (currentViewSelection.length === childList.length && childList.length > 0) {
+    if (selectableChildren.length > 0 && currentViewSelection.length === selectableChildren.length) {
       taskTableRef.value?.toggleRowSelection(parentTask, true)
     } else if (currentViewSelection.length === 0) {
       taskTableRef.value?.toggleRowSelection(parentTask, false)
@@ -565,6 +579,11 @@ const handleDetailSelectAll = (selection: any[]) => {
 
 const isTaskRowSelectable = () => !taskTableBusy.value && !detailLoading.value
 
+const isDetailRowSelectable = (row: any) => {
+  const unplanNumber = row.number - row.planNumber
+  return unplanNumber > 0
+}
+
 const handleSearch = async () => {
   queryParams.pageNo = 1
   await loadTaskList()
@@ -697,14 +716,18 @@ const handleSubmit = async () => {
   }
 
   const selectedRows = detailTableRef.value?.getSelectionRows() || []
-  if (selectedRows.length === 0) {
+  const filteredRows = selectedRows.filter((row: any) => {
+    const unplanNumber = row.number - row.planNumber
+    return unplanNumber > 0
+  })
+  if (filteredRows.length === 0) {
     message.warning(t('ProductionPlan.TaskSummary.selectDetailWarning'))
     return
   }
   submitLoading.value = true
   try {
-    console.log(selectedRows)
-    const createReqVO = selectedRows.map((row: any) => {
+    console.log(filteredRows)
+    const createReqVO = filteredRows.map((row: any) => {
       const planNumber = row.number - row.planNumber > 0 ? row.number - row.planNumber : 0
       return {
         // PlanForm fields

From c4fd3bbbb1ed03ca03b8db907b31569ea91571c3 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 11:34:26 +0800
Subject: [PATCH 07/20] =?UTF-8?q?feat=EF=BC=9A=E8=8F=9C=E5=8D=95=E7=94=98?=
 =?UTF-8?q?=E7=89=B9=E5=9B=BE=E9=A1=B5=E9=9D=A2/=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E6=8E=92=E6=9F=A5-=E7=94=98=E7=89=B9=E5=9B=BE=E6=8B=86?=
 =?UTF-8?q?=E5=BC=80=E4=B8=A4=E4=B8=AA=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ScheduleGanttPanelEditable.vue | 1026 +++++++++++++++++
 .../components/TaskSchedulePreviewDialog.vue  |    4 +-
 2 files changed, 1028 insertions(+), 2 deletions(-)
 create mode 100644 src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue

diff --git a/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
new file mode 100644
index 00000000..2c0adf5f
--- /dev/null
+++ b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
@@ -0,0 +1,1026 @@
+<template>
+  <div class="schedule-preview-wrap">
+    <div ref="ganttContainerRef" class="schedule-gantt-container" :style="{ height }"></div>
+    <div class="schedule-detail-panel">
+      <div class="schedule-detail-title">计划信息</div>
+      <template v-if="activePreviewDevice">
+        <el-descriptions :column="1" border size="small">
+          <el-descriptions-item label="设备名称">{{ activePreviewDevice.deviceName }}</el-descriptions-item>
+          <el-descriptions-item label="设备ID">{{ activePreviewDevice.deviceId }}</el-descriptions-item>
+          <el-descriptions-item label="产能">{{ activePreviewDevice.ratedCapacity ?? '-' }}</el-descriptions-item>
+          <el-descriptions-item v-if="'dailyAverageValue' in activePreviewDevice" label="每日报工平均值">{{ activePreviewDevice.dailyAverageValue ?? '-' }}</el-descriptions-item>
+          <el-descriptions-item v-if="'dataCollectionCapacity' in activePreviewDevice" label="数据采集产能">{{ activePreviewDevice.dataCollectionCapacity ?? '-' }}</el-descriptions-item>
+          <el-descriptions-item label="计划条数">{{ activePreviewDevice.plans?.length ?? 0 }}</el-descriptions-item>
+        </el-descriptions>
+        <div class="schedule-plan-list-title">计划明细</div>
+        <div class="schedule-plan-list">
+          <div
+            v-for="(plan, index) in activePreviewTask ? [activePreviewTask] : (activePreviewDevice?.plans ?? [])"
+            :key="`${activePreviewDevice?.deviceId}-${plan.taskDetailId}-${index}`"
+            :class="['schedule-plan-item', { 'schedule-plan-item-active': plan.sourceType === 'CURRENT' }]"
+          >
+            <div class="schedule-plan-item-head">
+              <span class="schedule-plan-item-title">{{ plan.productCode ?? '-' }} / {{ plan.productName ?? '-' }}</span>
+            </div>
+            <div>计划编码：{{ plan.taskCode ?? '-' }}</div>
+            <div>计划数量：{{ plan.planNumber ?? '-' }}</div>
+            <div>交货日期：{{ plan.deliveryDateStr ?? '-' }}</div>
+            <div>开始：{{ plan.planStartTimeStr || '-' }}</div>
+            <div>结束：{{ plan.planEndTimeStr || '-' }}</div>
+            <div>最晚开工：{{ plan.latestStartTimeStr || '-' }}</div>
+          </div>
+        </div>
+      </template>
+      <el-empty v-else description="暂无计划信息" :image-size="80" />
+    </div>
+  </div>
+
+  <el-dialog v-model="taskAdjustDialogVisible" title="调整任务" width="420px" append-to-body>
+    <el-form label-width="90px">
+      <el-form-item label="设备">
+        <el-select v-model="taskAdjustForm.deviceTaskId" placeholder="请选择设备" class="!w-full">
+          <el-option v-for="item in previewDeviceOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开始日期">
+        <el-date-picker
+          v-model="taskAdjustForm.startDate"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择开始日期"
+          class="!w-full"
+        />
+      </el-form-item>
+      <el-form-item label="天数">
+        <el-input-number v-model="taskAdjustForm.duration" :min="1" :max="365" class="!w-full" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="taskAdjustDialogVisible = false">取消</el-button>
+      <el-button type="primary" @click="handleTaskAdjustSubmit">确定</el-button>
+    </template>
+  </el-dialog>
+
+  <el-dialog v-model="startDateEditorVisible" title="修改开始时间" width="360px" append-to-body>
+    <el-form label-width="80px">
+      <el-form-item label="开始时间">
+        <el-date-picker
+          v-model="startDateEditorValue"
+          type="datetime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择开始时间"
+          class="!w-full"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="startDateEditorVisible = false">取消</el-button>
+      <el-button type="primary" @click="handleStartDateEditorSubmit">确定</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import dayjs from 'dayjs'
+import { gantt } from 'dhtmlx-gantt'
+import 'dhtmlx-gantt/codebase/dhtmlxgantt.css'
+
+defineOptions({ name: 'ScheduleGanttPanelEditable' })
+
+const props = withDefaults(
+  defineProps<{
+    scheduleList: any[]
+    height?: string
+  }>(),
+  {
+    height: '800px'
+  }
+)
+
+const message = useMessage()
+const ganttContainerRef = ref<HTMLDivElement>()
+const activePreviewDevice = ref<any>()
+const activePreviewTask = ref<any>()
+const startDateEditorVisible = ref(false)
+const startDateEditorTaskId = ref<string | number | null>(null)
+const startDateEditorValue = ref('')
+const tooltipCleanupFns = ref<(() => void)[]>([])
+const ganttEventIds = ref<string[]>([])
+const ganttSyncing = ref(false)
+const taskAdjustDialogVisible = ref(false)
+const taskAdjustTaskId = ref<string | number | null>(null)
+const taskAdjustForm = reactive({
+  deviceTaskId: '',
+  startDate: '',
+  duration: 1
+})
+const taskMoveFromParentMap = ref<Record<string, string | number | undefined>>({})
+const taskDragDurationMap = ref<Record<string, number>>({})
+
+const previewScheduleList = computed(() => (Array.isArray(props.scheduleList) ? props.scheduleList : []))
+const previewDeviceOptions = computed(() =>
+  previewScheduleList.value.map((device: any) => ({
+    label: device?.deviceName ?? '-',
+    value: `device-${device?.deviceId}`
+  }))
+)
+
+const getGlobalDateRange = (scheduleList: any[]) => {
+  const allPlans = scheduleList.flatMap((item: any) => item?.plans ?? [])
+  const starts = allPlans.map((item: any) => dayjs(item?.planStartTimeStr).valueOf()).filter((item: number) => Number.isFinite(item))
+  const ends = allPlans.map((item: any) => dayjs(item?.planEndTimeStr).valueOf()).filter((item: number) => Number.isFinite(item))
+  if (!starts.length || !ends.length) {
+    const now = Date.now()
+    return {
+      start: now,
+      end: now + 7 * 24 * 60 * 60 * 1000
+    }
+  }
+  return {
+    start: Math.min(...starts),
+    end: Math.max(...ends)
+  }
+}
+
+const formatGanttDate = (value: unknown) => {
+  const date = dayjs(value)
+  if (!date.isValid()) return undefined
+  return date.format('YYYY-MM-DD HH:mm')
+}
+
+const getDeviceTaskRangeByChildren = (planTasks: any[]) => {
+  const starts = planTasks.map((item: any) => dayjs(item?.start_date)).filter((item: any) => item.isValid())
+  const ends = planTasks.map((item: any) => dayjs(item?.end_date)).filter((item: any) => item.isValid())
+  if (!starts.length || !ends.length) return undefined
+  const earliestStart = starts.reduce((min: any, current: any) => (current.valueOf() < min.valueOf() ? current : min))
+  const latestEnd = ends.reduce((max: any, current: any) => (current.valueOf() > max.valueOf() ? current : max))
+  const duration = Math.max(latestEnd.endOf('day').diff(earliestStart.startOf('day'), 'day') + 1, 1)
+  return {
+    start_date: earliestStart.toDate(),
+    end_date: latestEnd.toDate(),
+    duration
+  }
+}
+
+const buildPreviewGanttData = (scheduleList: any[]) => {
+  const tasks: any[] = []
+  const links: any[] = []
+  let linkIndex = 1
+
+  scheduleList.forEach((device: any) => {
+    const deviceId = `device-${device.deviceId}`
+    const plans = (device?.plans ?? []).map((plan: any) => ({
+      ...plan,
+      _start: dayjs(plan?.planStartTimeStr),
+      _end: dayjs(plan?.planEndTimeStr)
+    }))
+    const validPlans = plans
+      .filter((plan: any) => plan._start.isValid() && plan._end.isValid())
+      .sort((a: any, b: any) => a._start.valueOf() - b._start.valueOf())
+    const firstPlan = validPlans[0]
+    const deviceRange = getDeviceTaskRangeByChildren(
+      validPlans.map((item: any) => ({
+        start_date: item?._start,
+        end_date: item?._end
+      }))
+    )
+
+    tasks.push({
+      id: deviceId,
+      text: `${device.deviceName ?? '-'}`,
+      start_date: formatGanttDate(deviceRange?.start_date ?? firstPlan?._start),
+      end_date: formatGanttDate(deviceRange?.end_date ?? firstPlan?._end),
+      duration: deviceRange?.duration ?? 1,
+      parent: 0,
+      progress: 0,
+      open: true,
+      readonly: true,
+      deviceName: device.deviceName ?? '-',
+      _deviceData: device
+    })
+
+    let previousPlanTaskId: string | null = null
+    validPlans.forEach((plan: any, index: number) => {
+      const startDate = formatGanttDate(plan.planStartTimeStr)
+      const endDate = formatGanttDate(plan.planEndTimeStr)
+      const duration = Number(plan.scheduleDays) > 0 ? Number(plan.scheduleDays) : Math.max(plan._end.diff(plan._start, 'day') + 1, 1)
+      if (!startDate || !endDate) return
+      const isHistory = String(plan.sourceType ?? '').toUpperCase() === 'HISTORY'
+      const planTaskId = `plan-${device.deviceId}-${plan.taskDetailId ?? index}-${index}`
+      tasks.push({
+        id: planTaskId,
+        text: `${plan.productCode ?? '-'} / ${plan.productName ?? '-'} / ${plan.taskCode ?? '-'}`,
+        start_date: startDate,
+        end_date: endDate,
+        duration,
+        parent: deviceId,
+        progress: 0,
+        readonly: isHistory,
+        _planData: plan,
+        _deviceData: device
+      })
+      if (previousPlanTaskId) {
+        links.push({
+          id: `link-${linkIndex++}`,
+          source: previousPlanTaskId,
+          target: planTaskId,
+          type: '0'
+        })
+      }
+      previousPlanTaskId = planTaskId
+    })
+  })
+
+  return { data: tasks, links }
+}
+
+const cleanupTaskTooltips = () => {
+  const tooltipsExt = (gantt.ext as any)?.tooltips
+  const tooltip = tooltipsExt?.tooltip
+  if (tooltipsExt?.detach) {
+    tooltipsExt.detach('.gantt_task_line')
+    tooltipsExt.detach('.gantt_task_content')
+  }
+  if (tooltip?.hide) {
+    tooltip.hide()
+  }
+  const node = tooltip?.getNode?.()
+  if (node) {
+    node.style.display = 'none'
+    node.style.visibility = 'hidden'
+    node.style.opacity = '0'
+  }
+  tooltipCleanupFns.value.forEach((fn) => fn())
+  tooltipCleanupFns.value = []
+}
+
+const destroyGantt = () => {
+  cleanupTaskTooltips()
+  ganttEventIds.value.forEach((eventId) => gantt.detachEvent(eventId))
+  ganttEventIds.value = []
+  gantt.clearAll()
+}
+
+const formatGridDateText = (value: unknown) => {
+  const date = dayjs(value)
+  if (!date.isValid()) return '-'
+  return date.format('YYYY-MM-DD HH:mm:ss')
+}
+const formatTooltipDateTime = (value: unknown) => {
+  const date = dayjs(value)
+  if (!date.isValid()) return '-'
+  return date.format('YYYY-MM-DD HH:mm:ss')
+}
+const getDeviceTaskSummary = (task: any) => {
+  if (!task) {
+    return {
+      planCount: 0,
+      totalPlanNumber: 0,
+      earliestStart: '-',
+      latestEnd: '-'
+    }
+  }
+  const childTaskIds = gantt.getChildren(task.id)
+  const childTasks = (Array.isArray(childTaskIds) ? childTaskIds : [])
+    .map((childId: string | number) => gantt.getTask(childId))
+    .filter((child: any) => child?._planData)
+  if (!childTasks.length) {
+    return {
+      planCount: 0,
+      totalPlanNumber: 0,
+      earliestStart: '-',
+      latestEnd: '-'
+    }
+  }
+  const starts = childTasks.map((child: any) => dayjs(child.start_date).valueOf()).filter((val: number) => Number.isFinite(val))
+  const ends = childTasks.map((child: any) => dayjs(child.end_date).valueOf()).filter((val: number) => Number.isFinite(val))
+  const totalPlanNumber = childTasks.reduce((sum: number, child: any) => sum + Number(child?._planData?.planNumber ?? 0), 0)
+  return {
+    planCount: childTasks.length,
+    totalPlanNumber,
+    earliestStart: starts.length ? formatTooltipDateTime(Math.min(...starts)) : '-',
+    latestEnd: ends.length ? formatTooltipDateTime(Math.max(...ends)) : '-'
+  }
+}
+const buildTaskTooltipHtml = (task: any, start?: Date, end?: Date) => {
+  const plan = task?._planData
+  if (plan) {
+    return `
+      <div><b>任务明细</b></div>
+      <div>任务单：${plan.taskCode ?? '-'}</div>
+      <div>产品：${plan.productCode ?? '-'} / ${plan.productName ?? '-'}</div>
+      <div>明细ID：${plan.taskDetailId ?? '-'}</div>
+      <div>计划数量：${plan.planNumber ?? '-'}</div>
+      <div>开始：${formatTooltipDateTime(start ?? task?.start_date)}</div>
+      <div>结束：${formatTooltipDateTime(end ?? task?.end_date)}</div>
+      <div>最晚开工：${formatTooltipDateTime(plan.latestStartTimeStr)}</div>
+    `
+  }
+  const device = task?._deviceData
+  const summary = getDeviceTaskSummary(task)
+  return `
+    <div><b>汇总</b></div>
+    <div>设备：${device?.deviceName ?? '-'}</div>
+    <div>任务明细条数：${summary.planCount}</div>
+    <div>计划总数：${summary.totalPlanNumber}</div>
+    <div>最早计划开始：${summary.earliestStart}</div>
+    <div>最晚计划结束：${summary.latestEnd}</div>
+  `
+}
+const getTaskByTooltipNode = (node: HTMLElement) => {
+  const holder = node.closest('[task_id]') || node.closest('[data-task-id]') || node.closest('.gantt_task_line') || node
+  const taskId = holder?.getAttribute('task_id') || holder?.getAttribute('data-task-id')
+  if (!taskId) return undefined
+  try {
+    return gantt.getTask(taskId)
+  } catch {
+    return undefined
+  }
+}
+
+const initTaskTooltips = () => {
+  const tooltipsExt = (gantt.ext as any)?.tooltips
+  const tooltip = tooltipsExt?.tooltip
+  if (!tooltipsExt || !tooltip || !ganttContainerRef.value) return
+
+  let tooltipHideTimer: ReturnType<typeof setTimeout> | null = null
+
+  const forceHideTooltip = () => {
+    if (tooltipHideTimer) {
+      clearTimeout(tooltipHideTimer)
+      tooltipHideTimer = null
+    }
+    tooltip.hide()
+    const node = tooltip.getNode?.()
+    if (node) {
+      node.style.display = 'none'
+      node.style.visibility = 'hidden'
+      node.style.opacity = '0'
+    }
+  }
+
+  const showTooltip = (event: MouseEvent, html: string) => {
+    if (tooltipHideTimer) {
+      clearTimeout(tooltipHideTimer)
+      tooltipHideTimer = null
+    }
+    tooltip.setContent(html)
+    tooltip.show(event)
+    const node = tooltip.getNode?.()
+    if (node) {
+      node.style.display = 'block'
+      node.style.visibility = 'visible'
+      node.style.opacity = '1'
+      node.style.zIndex = '10000'
+      node.style.pointerEvents = 'none'
+    }
+  }
+
+  tooltipsExt.detach('.gantt_task_line')
+  tooltipsExt.detach('.gantt_task_content')
+  tooltipsExt.attach({
+    selector: '.gantt_task_line,.gantt_task_content',
+    onmouseenter: (event: MouseEvent, node: HTMLElement) => {
+      const task = getTaskByTooltipNode(node)
+      if (!task) return
+      showTooltip(event, buildTaskTooltipHtml(task))
+    },
+    onmousemove: (event: MouseEvent, node: HTMLElement) => {
+      const task = getTaskByTooltipNode(node)
+      if (!task) return
+      showTooltip(event, buildTaskTooltipHtml(task))
+    },
+    onmouseleave: () => {
+      forceHideTooltip()
+    }
+  })
+
+  const containerEl = ganttContainerRef.value
+  const containerMouseLeaveHandler = () => {
+    forceHideTooltip()
+  }
+  containerEl.addEventListener('mouseleave', containerMouseLeaveHandler)
+
+  const documentMouseMoveHandler = (e: MouseEvent) => {
+    const target = e.target as HTMLElement
+    if (!target) return
+    const isOverTask = target.closest('.gantt_task_line') || target.closest('.gantt_task_content')
+    if (!isOverTask) {
+      if (tooltipHideTimer) clearTimeout(tooltipHideTimer)
+      tooltipHideTimer = setTimeout(forceHideTooltip, 150)
+    } else {
+      if (tooltipHideTimer) {
+        clearTimeout(tooltipHideTimer)
+        tooltipHideTimer = null
+      }
+    }
+  }
+  document.addEventListener('mousemove', documentMouseMoveHandler)
+
+  tooltipCleanupFns.value.push(() => {
+    containerEl.removeEventListener('mouseleave', containerMouseLeaveHandler)
+    document.removeEventListener('mousemove', documentMouseMoveHandler)
+    if (tooltipHideTimer) {
+      clearTimeout(tooltipHideTimer)
+      tooltipHideTimer = null
+    }
+  })
+}
+
+const syncPlanTimeFromTask = (task: any) => {
+  if (!task?._planData) return
+  if (String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return
+  const start = dayjs(task.start_date)
+  const end = dayjs(task.end_date)
+  if (!start.isValid() || !end.isValid()) return
+  const duration = Math.max(Number(task.duration) || end.diff(start, 'day') + 1, 1)
+  task.duration = duration
+  task._planData.planStartTimeStr = start.format('YYYY-MM-DD HH:mm:ss')
+  task._planData.planEndTimeStr = end.format('YYYY-MM-DD HH:mm:ss')
+  task._planData.scheduleDays = duration
+  activePreviewDevice.value = task._deviceData
+  if (activePreviewTask.value && String(activePreviewTask.value.taskDetailId) === String(task._planData.taskDetailId)) {
+    activePreviewTask.value = task._planData
+  }
+}
+
+const syncDeviceTaskRangeFromChildren = (task: any) => {
+  if (!task?._planData) return
+  const deviceTaskId = task.parent
+  if (!deviceTaskId) return
+  const childTaskIds = gantt.getChildren(deviceTaskId)
+  if (!Array.isArray(childTaskIds) || !childTaskIds.length) return
+  const childTasks = childTaskIds.map((childId: string | number) => gantt.getTask(childId)).filter((item: any) => item?._planData)
+  if (!childTasks.length) return
+  const deviceRange = getDeviceTaskRangeByChildren(childTasks)
+  if (!deviceRange) return
+  const deviceTask = gantt.getTask(deviceTaskId)
+  deviceTask.start_date = deviceRange.start_date
+  deviceTask.end_date = deviceRange.end_date
+  deviceTask.duration = deviceRange.duration
+  gantt.updateTask(deviceTaskId)
+}
+
+const movePlanDataToDevice = (task: any, targetDeviceTaskId: string | number, sourceDeviceTaskId?: string | number) => {
+  if (!task?._planData) return
+  const targetDeviceTask = gantt.getTask(targetDeviceTaskId)
+  const targetDeviceData = targetDeviceTask?._deviceData
+  if (!targetDeviceData) return
+  const planIdentity = `${task?._planData?.taskId ?? ''}-${task?._planData?.taskDetailId ?? ''}`
+  const sourceDeviceTask = sourceDeviceTaskId ? gantt.getTask(sourceDeviceTaskId) : undefined
+  const sourceDeviceData = sourceDeviceTask?._deviceData
+  if (sourceDeviceData?.plans && Array.isArray(sourceDeviceData.plans)) {
+    sourceDeviceData.plans = sourceDeviceData.plans.filter((item: any) => {
+      const itemIdentity = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
+      return itemIdentity !== planIdentity
+    })
+  }
+  if (!Array.isArray(targetDeviceData.plans)) {
+    targetDeviceData.plans = []
+  }
+  const targetExists = targetDeviceData.plans.some((item: any) => {
+    const itemIdentity = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
+    return itemIdentity === planIdentity
+  })
+  if (!targetExists) {
+    targetDeviceData.plans.push(task._planData)
+  }
+  task._planData.deviceId = targetDeviceData.deviceId
+  task._planData.feedingPipeline = targetDeviceData.deviceId
+  task._deviceData = targetDeviceData
+}
+
+const normalizeDeviceChildren = (deviceTaskId: string | number, priorityTaskId?: string | number) => {
+  const childTaskIds = gantt.getChildren(deviceTaskId)
+  if (!Array.isArray(childTaskIds) || !childTaskIds.length) return
+  const childTasks = childTaskIds
+    .map((childId: string | number) => gantt.getTask(childId))
+    .filter((item: any) => item?._planData)
+    .sort((a: any, b: any) => {
+      const startDiff = dayjs(a.start_date).valueOf() - dayjs(b.start_date).valueOf()
+      if (startDiff !== 0) return startDiff
+      if (priorityTaskId !== undefined && String(a.id) === String(priorityTaskId)) return -1
+      if (priorityTaskId !== undefined && String(b.id) === String(priorityTaskId)) return 1
+      return 0
+    })
+  childTasks.forEach((item: any) => {
+    syncPlanTimeFromTask(item)
+    gantt.updateTask(item.id)
+  })
+  const fakePlanTask = { _planData: true, parent: deviceTaskId }
+  syncDeviceTaskRangeFromChildren(fakePlanTask)
+}
+
+const refreshPlanLinksByRowOrder = () => {
+  const allLinks = gantt.getLinks()
+  allLinks.forEach((item: any) => gantt.deleteLink(item.id))
+  let linkIndex = 1
+  const deviceTaskIds = gantt.getChildren(0)
+  deviceTaskIds.forEach((deviceTaskId: string | number) => {
+    const childTaskIds = gantt.getChildren(deviceTaskId).filter((childId: string | number) => {
+      const task = gantt.getTask(childId)
+      return !!task?._planData
+    })
+    let previousTaskId: string | number | null = null
+    childTaskIds.forEach((taskId: string | number) => {
+      if (previousTaskId !== null) {
+        gantt.addLink({
+          id: `link-${linkIndex++}`,
+          source: previousTaskId,
+          target: taskId,
+          type: '0'
+        })
+      }
+      previousTaskId = taskId
+    })
+  })
+}
+
+const getDeviceInsertIndex = (deviceTaskId: string | number, startDate: dayjs.Dayjs) => {
+  const childTaskIds = gantt.getChildren(deviceTaskId)
+  if (!Array.isArray(childTaskIds) || !childTaskIds.length) return 0
+  const targetStart = startDate.startOf('day').valueOf()
+  for (let index = 0; index < childTaskIds.length; index += 1) {
+    const childTask = gantt.getTask(childTaskIds[index])
+    if (!childTask?._planData) continue
+    const childStart = dayjs(childTask.start_date).startOf('day').valueOf()
+    if (childStart >= targetStart) return index
+  }
+  return childTaskIds.length
+}
+
+const applyTaskAdjust = (task: any, targetDeviceTaskId: string | number, startDate: string, durationValue: number) => {
+  const targetDeviceTask = gantt.getTask(targetDeviceTaskId)
+  if (!targetDeviceTask || targetDeviceTask?._planData) return
+  const sourceDeviceTaskId = task.parent
+  const nextStart = dayjs(startDate).startOf('day')
+  const duration = Math.max(Number(durationValue) || 1, 1)
+  task.parent = targetDeviceTaskId
+  task.start_date = nextStart.toDate()
+  task.end_date = nextStart.add(duration - 1, 'day').endOf('day').toDate()
+  task.duration = duration
+  movePlanDataToDevice(task, targetDeviceTaskId, sourceDeviceTaskId)
+  const targetIndex = getDeviceInsertIndex(targetDeviceTaskId, nextStart)
+  gantt.moveTask(task.id, targetIndex, targetDeviceTaskId)
+  gantt.updateTask(task.id)
+  syncPlanTimeFromTask(task)
+  normalizeDeviceChildren(targetDeviceTaskId, task.id)
+  if (sourceDeviceTaskId && sourceDeviceTaskId !== targetDeviceTaskId) {
+    normalizeDeviceChildren(sourceDeviceTaskId)
+  }
+  refreshPlanLinksByRowOrder()
+  refreshTimelineRangeByTasks()
+}
+
+const openTaskAdjustDialog = (task: any) => {
+  if (!task?._planData) return
+  taskAdjustTaskId.value = task.id
+  taskAdjustForm.deviceTaskId = String(task.parent ?? '')
+  taskAdjustForm.startDate = dayjs(task.start_date).format('YYYY-MM-DD')
+  taskAdjustForm.duration = Math.max(Number(task.duration) || 1, 1)
+  taskAdjustDialogVisible.value = true
+}
+
+const handleTaskAdjustSubmit = () => {
+  if (!taskAdjustTaskId.value) return
+  if (!taskAdjustForm.deviceTaskId || !taskAdjustForm.startDate) {
+    message.warning('请完善设备和开始日期')
+    return
+  }
+  const task = gantt.getTask(taskAdjustTaskId.value)
+  if (!task?._planData) return
+  ganttSyncing.value = true
+  try {
+    applyTaskAdjust(task, taskAdjustForm.deviceTaskId, taskAdjustForm.startDate, taskAdjustForm.duration)
+  } finally {
+    ganttSyncing.value = false
+  }
+  taskAdjustDialogVisible.value = false
+}
+
+const handleStartDateEditorSubmit = () => {
+  if (!startDateEditorTaskId.value || !startDateEditorValue.value) {
+    startDateEditorVisible.value = false
+    return
+  }
+  const task = gantt.getTask(startDateEditorTaskId.value)
+  if (!task?._planData) {
+    startDateEditorVisible.value = false
+    return
+  }
+  const newStart = dayjs(startDateEditorValue.value)
+  if (!newStart.isValid()) {
+    message.warning('请选择有效的时间')
+    return
+  }
+  const duration = Math.max(Number(task.duration) || 1, 1)
+  const newEnd = newStart.add(duration - 1, 'day').endOf('day')
+  ganttSyncing.value = true
+  try {
+    task.start_date = newStart.toDate()
+    task.end_date = newEnd.toDate()
+    task.duration = duration
+    syncPlanTimeFromTask(task)
+    normalizeDeviceChildren(task.parent)
+    refreshPlanLinksByRowOrder()
+    refreshTimelineRangeByTasks()
+    gantt.updateTask(task.id)
+  } finally {
+    ganttSyncing.value = false
+  }
+  startDateEditorVisible.value = false
+}
+
+const refreshTimelineRangeByTasks = () => {
+  let minStart = Number.POSITIVE_INFINITY
+  let maxEnd = Number.NEGATIVE_INFINITY
+  gantt.eachTask((task: any) => {
+    if (!task?._planData) return
+    const start = dayjs(task.start_date).valueOf()
+    const end = dayjs(task.end_date).valueOf()
+    if (!Number.isFinite(start) || !Number.isFinite(end)) return
+    minStart = Math.min(minStart, start)
+    maxEnd = Math.max(maxEnd, end)
+  })
+  if (!Number.isFinite(minStart) || !Number.isFinite(maxEnd)) return
+
+  const nextStartDate = dayjs(minStart).startOf('day').toDate()
+  const nextEndDate = dayjs(maxEnd).endOf('day').toDate()
+  const currentStart = dayjs(gantt.config.start_date).valueOf()
+  const currentEnd = dayjs(gantt.config.end_date).valueOf()
+  const nextStart = dayjs(nextStartDate).valueOf()
+  const nextEnd = dayjs(nextEndDate).valueOf()
+  if (currentStart === nextStart && currentEnd === nextEnd) return
+
+  gantt.config.start_date = nextStartDate
+  gantt.config.end_date = nextEndDate
+  gantt.render()
+}
+
+const initGanttPreview = () => {
+  if (!ganttContainerRef.value) return
+  destroyGantt()
+  if (!previewScheduleList.value.length) {
+    activePreviewDevice.value = undefined
+    activePreviewTask.value = undefined
+    return
+  }
+
+  gantt.plugins({ tooltip: true, inline_edit: true,undo: true })
+  gantt.config.readonly = false
+  gantt.config.drag_move = true
+  gantt.config.drag_links = false
+  gantt.config.drag_progress = false
+  gantt.config.drag_resize = true
+  gantt.config.order_branch = true
+  gantt.config.order_branch_free = true
+  gantt.config.details_on_dblclick = false
+  gantt.config.show_progress = false
+  gantt.config.row_height = 40
+  gantt.config.scale_height = 44
+  gantt.config.xml_date = '%Y-%m-%d %H:%i'
+  gantt.config.task_height = 24
+
+  gantt.config.columns = [
+    {
+      name: 'text',
+      label: '任务名称',
+      tree: true,
+      width: '*',
+      min_width: 200
+    },
+    {
+      name: 'start_date',
+      label: '开始时间',
+      align: 'center',
+      width: 210,
+      template: (task: any) =>
+        task?._planData && String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
+          ? `<span class="gantt-inline-editor-trigger" data-field="start_date" data-task-id="${task.id}">${formatGridDateText(task.start_date)}</span>`
+          : formatGridDateText(task.start_date)
+    },
+    {
+      name: 'duration',
+      label: '天数',
+      align: 'center',
+      width: 60,
+      template: (task: any) =>
+        task?._planData && String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
+          ? `<span class="gantt-inline-editor-trigger" data-field="duration">${task.duration ?? 0}</span>`
+          : String(task.duration ?? 0),
+      editor: {
+        type: 'number',
+        map_to: 'duration',
+        min: 1
+      }
+    }
+  ]
+
+  gantt.config.scales = [
+    { unit: 'month', step: 1, format: (date) => dayjs(date).format('YYYY年M月') },
+    { unit: 'day', step: 1, format: (date) => dayjs(date).format('MM-DD') }
+  ]
+
+  gantt.templates.tooltip_text = (start, end, task: any) => buildTaskTooltipHtml(task, start, end)
+  gantt.templates.task_class = (_start, _end, task: any) => {
+    if (!task?._planData) return ''
+    const sourceType = String(task?._planData?.sourceType ?? '').toUpperCase()
+    return sourceType === 'HISTORY' ? 'schedule-plan-task-history' : 'schedule-plan-task'
+  }
+
+  const globalRange = getGlobalDateRange(previewScheduleList.value)
+  gantt.config.start_date = dayjs(globalRange.start).startOf('day').toDate()
+  gantt.config.end_date = dayjs(globalRange.end).endOf('day').toDate()
+
+  gantt.init(ganttContainerRef.value)
+
+  const ganttData = buildPreviewGanttData(previewScheduleList.value)
+  gantt.parse(ganttData)
+  
+  // 强制刷新所有任务的样式，确保颜色正确应用
+  gantt.eachTask((task: any) => {
+    gantt.refreshTask(task.id)
+  })
+  
+  initTaskTooltips()
+
+  if (ganttData.data.length) {
+    activePreviewDevice.value = ganttData.data[0]._deviceData
+    const today = dayjs().startOf('day').toDate()
+    const pos = gantt.posFromDate(today)
+    const scrollState = gantt.getScrollState()
+    if (scrollState && pos >= 0) {
+      const halfWidth = scrollState.inner_width / 3
+      gantt.scrollTo(Math.max(0, pos - halfWidth), 0)
+    } else {
+      gantt.showDate(today)
+    }
+  }
+
+  const clickEventId = gantt.attachEvent('onTaskClick', (id, event: MouseEvent) => {
+    const task = gantt.getTask(id)
+    if (task?._planData) {
+      activePreviewTask.value = task._planData
+      activePreviewDevice.value = task._deviceData
+    } else {
+      activePreviewTask.value = undefined
+      activePreviewDevice.value = task?._deviceData
+    }
+    const target = event?.target as HTMLElement | null
+    const editableNode = target?.closest('.gantt-inline-editor-trigger') as HTMLElement | null
+    const field = editableNode?.dataset?.field
+    if (!field || !task?._planData || String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return true
+    if (field === 'start_date') {
+      startDateEditorTaskId.value = id
+      startDateEditorValue.value = dayjs(task.start_date).format('YYYY-MM-DD HH:mm:ss')
+      startDateEditorVisible.value = true
+      return false
+    }
+    const inlineEditors = (gantt.ext as any)?.inlineEditors
+    if (inlineEditors?.startEdit) {
+      inlineEditors.startEdit(id, field)
+      return false
+    }
+    return true
+  })
+  ganttEventIds.value.push(clickEventId)
+
+  if (ganttContainerRef.value) {
+    const gridClickHandler = (e: MouseEvent) => {
+      const target = e.target as HTMLElement
+      const trigger = target.closest('.gantt-inline-editor-trigger[data-field="start_date"]') as HTMLElement | null
+      if (!trigger) return
+      const taskId = trigger.getAttribute('data-task-id')
+      if (!taskId) return
+      try {
+        const task = gantt.getTask(taskId)
+        if (!task?._planData || String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return
+        e.stopPropagation()
+        startDateEditorTaskId.value = taskId
+        startDateEditorValue.value = dayjs(task.start_date).format('YYYY-MM-DD HH:mm:ss')
+        startDateEditorVisible.value = true
+      } catch {}
+    }
+    ganttContainerRef.value.addEventListener('click', gridClickHandler, true)
+    tooltipCleanupFns.value.push(() => {
+      ganttContainerRef.value?.removeEventListener('click', gridClickHandler, true)
+    })
+  }
+
+  const beforeDragEventId = gantt.attachEvent('onBeforeTaskDrag', (id) => {
+    const task = gantt.getTask(id)
+    if (!task?._planData) return false
+    taskDragDurationMap.value[String(id)] = Math.max(Number(task.duration) || 1, 1)
+    return String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
+  })
+
+  const beforeMoveEventId = gantt.attachEvent('onBeforeTaskMove', (id, parent) => {
+    const task = gantt.getTask(id)
+    if (!task?._planData) return false
+    if (String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return false
+    const targetTask = gantt.getTask(parent)
+    if (!targetTask || targetTask?._planData) return false
+    taskMoveFromParentMap.value[String(id)] = task.parent
+    return true
+  })
+
+  const afterMoveEventId = gantt.attachEvent('onAfterTaskMove', (id, parent) => {
+    const task = gantt.getTask(id)
+    if (!task?._planData) return
+    const sourceParent = taskMoveFromParentMap.value[String(id)]
+    delete taskMoveFromParentMap.value[String(id)]
+    if (!sourceParent && sourceParent !== 0) return
+    if (sourceParent === parent) {
+      refreshPlanLinksByRowOrder()
+      return
+    }
+    if (ganttSyncing.value) return
+    ganttSyncing.value = true
+    try {
+      movePlanDataToDevice(task, parent, sourceParent)
+      syncPlanTimeFromTask(task)
+      normalizeDeviceChildren(parent)
+      normalizeDeviceChildren(sourceParent)
+      refreshPlanLinksByRowOrder()
+      refreshTimelineRangeByTasks()
+    } finally {
+      ganttSyncing.value = false
+    }
+  })
+
+  const contextMenuEventId = gantt.attachEvent('onContextMenu', (taskId, _linkId, event: MouseEvent) => {
+    const task = gantt.getTask(taskId)
+    if (!task?._planData) return true
+    if (String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return false
+    event.preventDefault()
+    openTaskAdjustDialog(task)
+    return false
+  })
+
+  const dragEventId = gantt.attachEvent('onAfterTaskDrag', (id, mode) => {
+    if (ganttSyncing.value) return
+    const task = gantt.getTask(id)
+    const taskId = String(id)
+    const originalDuration = taskDragDurationMap.value[taskId]
+    delete taskDragDurationMap.value[taskId]
+    ganttSyncing.value = true
+    try {
+      if (mode === gantt.config.drag_mode.move && Number(originalDuration) > 0) {
+        task.duration = originalDuration
+      }
+      syncPlanTimeFromTask(task)
+      normalizeDeviceChildren(task.parent)
+      refreshPlanLinksByRowOrder()
+      refreshTimelineRangeByTasks()
+    } finally {
+      ganttSyncing.value = false
+    }
+  })
+
+  const updateEventId = gantt.attachEvent('onAfterTaskUpdate', (id) => {
+    if (ganttSyncing.value) return
+    const task = gantt.getTask(id)
+    ganttSyncing.value = true
+    try {
+      syncPlanTimeFromTask(task)
+      normalizeDeviceChildren(task.parent)
+      refreshPlanLinksByRowOrder()
+      refreshTimelineRangeByTasks()
+      gantt.refreshTask(id)
+    } finally {
+      ganttSyncing.value = false
+    }
+  })
+
+  ganttEventIds.value.push(beforeDragEventId, beforeMoveEventId, afterMoveEventId, contextMenuEventId, dragEventId, updateEventId)
+  refreshPlanLinksByRowOrder()
+}
+
+onMounted(async () => {
+  await nextTick()
+  initGanttPreview()
+})
+
+watch(
+  () => props.scheduleList,
+  async () => {
+    await nextTick()
+    initGanttPreview()
+  },
+  { deep: true }
+)
+
+onBeforeUnmount(() => {
+  destroyGantt()
+})
+</script>
+
+<style scoped>
+.schedule-preview-wrap {
+  display: flex;
+  width: 100%;
+  gap: 12px;
+}
+
+.schedule-gantt-container {
+  flex: 1;
+  min-width: 0;
+  border: 1px solid var(--el-border-color);
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.schedule-detail-panel {
+  width: 280px;
+  flex: 0 0 280px;
+}
+
+.schedule-detail-title {
+  margin-bottom: 10px;
+  font-weight: 600;
+}
+
+.schedule-plan-list-title {
+  margin-top: 14px;
+  margin-bottom: 10px;
+  font-weight: 600;
+}
+
+.schedule-plan-list {
+  overflow: auto;
+  max-height: 55vh;
+  border: 1px solid var(--el-border-color);
+  border-radius: 4px;
+  padding: 8px;
+}
+
+.schedule-plan-item {
+  padding: 8px;
+  border-radius: 4px;
+  background: var(--el-fill-color-light);
+}
+.schedule-plan-item-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  margin-bottom: 4px;
+}
+.schedule-plan-item-title {
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.schedule-plan-item-active {
+  border: 1px solid var(--el-color-success-light-5);
+  background: var(--el-color-success-light-9);
+}
+
+.schedule-plan-item + .schedule-plan-item {
+  margin-top: 8px;
+}
+
+.schedule-gantt-container :deep(.gantt_grid_data .gantt_row) {
+  font-weight: 600;
+}
+
+.schedule-gantt-container :deep(.gantt_grid_data .gantt_cell) {
+  text-overflow: clip;
+}
+
+.schedule-gantt-container :deep(.gantt_task_bg .gantt_task_cell) {
+  border-right-width: 2px;
+}
+
+.schedule-gantt-container :deep(.gantt-inline-editor-trigger) {
+  display: inline-block;
+  width: 100%;
+  overflow: visible;
+  cursor: pointer;
+}
+
+.schedule-gantt-container :deep(.gantt_task_line.schedule-plan-task) {
+  background: #67c23a;
+  border-color: #67c23a;
+}
+
+.schedule-gantt-container :deep(.gantt_task_line.schedule-plan-task .gantt_task_content) {
+  color: #ffffff;
+}
+
+.schedule-gantt-container :deep(.gantt_task_line.schedule-plan-task-history) {
+  background: #909399;
+  border-color: #909399;
+}
+
+.schedule-gantt-container :deep(.gantt_task_line.schedule-plan-task-history .gantt_task_content) {
+  color: #ffffff;
+}
+
+:deep(.gantt_tooltip) {
+  z-index: 5000 !important;
+}
+</style>
diff --git a/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue b/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue
index fc6e0dee..32402548 100644
--- a/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue
+++ b/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <Dialog v-model="previewVisible" title="排产甘特图预览" width="100%" align-center>
-    <ScheduleGanttPanel :schedule-list="previewScheduleList" :editable="true" height="800px" />
+    <ScheduleGanttPanelEditable :schedule-list="previewScheduleList" height="800px" />
     <template #footer>
       <el-button type="primary" :loading="previewSaveLoading" @click="handlePreviewSave">保存</el-button>
       <el-button @click="previewVisible = false">关闭</el-button>
@@ -10,7 +10,7 @@
 
 <script setup lang="ts">
 import { PlanApi } from '@/api/mes/plan'
-import ScheduleGanttPanel from '@/views/mes/components/ScheduleGanttPanel.vue'
+import ScheduleGanttPanelEditable from './ScheduleGanttPanelEditable.vue'
 import dayjs from 'dayjs'
 
 defineOptions({ name: 'TaskSchedulePreviewDialog' })

From cef7a400333981560323af68ac2e6f64e67ce822 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 13:43:14 +0800
Subject: [PATCH 08/20] =?UTF-8?q?style=EF=BC=9A=E6=8E=92=E4=BA=A7=E7=94=98?=
 =?UTF-8?q?=E7=89=B9=E5=9B=BE=E6=97=A5=E6=9C=9F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ScheduleGanttPanelEditable.vue | 114 ++++--------------
 1 file changed, 24 insertions(+), 90 deletions(-)

diff --git a/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
index 2c0adf5f..54d20bfd 100644
--- a/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
+++ b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
@@ -36,46 +36,34 @@
   </div>
 
   <el-dialog v-model="taskAdjustDialogVisible" title="调整任务" width="420px" append-to-body>
-    <el-form label-width="90px">
+    <el-form label-width="110px">
       <el-form-item label="设备">
         <el-select v-model="taskAdjustForm.deviceTaskId" placeholder="请选择设备" class="!w-full">
           <el-option v-for="item in previewDeviceOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="开始日期">
+      <el-form-item label="计划开始日期">
         <el-date-picker
           v-model="taskAdjustForm.startDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择开始日期"
+          type="datetime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择计划开始日期"
           class="!w-full"
         />
       </el-form-item>
-      <el-form-item label="天数">
-        <el-input-number v-model="taskAdjustForm.duration" :min="1" :max="365" class="!w-full" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="taskAdjustDialogVisible = false">取消</el-button>
-      <el-button type="primary" @click="handleTaskAdjustSubmit">确定</el-button>
-    </template>
-  </el-dialog>
-
-  <el-dialog v-model="startDateEditorVisible" title="修改开始时间" width="360px" append-to-body>
-    <el-form label-width="80px">
-      <el-form-item label="开始时间">
+      <el-form-item label="计划结束日期">
         <el-date-picker
-          v-model="startDateEditorValue"
+          v-model="taskAdjustForm.endDate"
           type="datetime"
           value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择开始时间"
+          placeholder="请选择计划结束日期"
           class="!w-full"
         />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="startDateEditorVisible = false">取消</el-button>
-      <el-button type="primary" @click="handleStartDateEditorSubmit">确定</el-button>
+      <el-button @click="taskAdjustDialogVisible = false">取消</el-button>
+      <el-button type="primary" @click="handleTaskAdjustSubmit">确定</el-button>
     </template>
   </el-dialog>
 </template>
@@ -101,9 +89,6 @@ const message = useMessage()
 const ganttContainerRef = ref<HTMLDivElement>()
 const activePreviewDevice = ref<any>()
 const activePreviewTask = ref<any>()
-const startDateEditorVisible = ref(false)
-const startDateEditorTaskId = ref<string | number | null>(null)
-const startDateEditorValue = ref('')
 const tooltipCleanupFns = ref<(() => void)[]>([])
 const ganttEventIds = ref<string[]>([])
 const ganttSyncing = ref(false)
@@ -112,7 +97,7 @@ const taskAdjustTaskId = ref<string | number | null>(null)
 const taskAdjustForm = reactive({
   deviceTaskId: '',
   startDate: '',
-  duration: 1
+  endDate: ''
 })
 const taskMoveFromParentMap = ref<Record<string, string | number | undefined>>({})
 const taskDragDurationMap = ref<Record<string, number>>({})
@@ -549,15 +534,16 @@ const getDeviceInsertIndex = (deviceTaskId: string | number, startDate: dayjs.Da
   return childTaskIds.length
 }
 
-const applyTaskAdjust = (task: any, targetDeviceTaskId: string | number, startDate: string, durationValue: number) => {
+const applyTaskAdjust = (task: any, targetDeviceTaskId: string | number, startDate: string, endDate: string) => {
   const targetDeviceTask = gantt.getTask(targetDeviceTaskId)
   if (!targetDeviceTask || targetDeviceTask?._planData) return
   const sourceDeviceTaskId = task.parent
-  const nextStart = dayjs(startDate).startOf('day')
-  const duration = Math.max(Number(durationValue) || 1, 1)
+  const nextStart = dayjs(startDate)
+  const nextEnd = dayjs(endDate)
+  const duration = Math.max(nextEnd.diff(nextStart, 'day') + 1, 1)
   task.parent = targetDeviceTaskId
   task.start_date = nextStart.toDate()
-  task.end_date = nextStart.add(duration - 1, 'day').endOf('day').toDate()
+  task.end_date = nextEnd.toDate()
   task.duration = duration
   movePlanDataToDevice(task, targetDeviceTaskId, sourceDeviceTaskId)
   const targetIndex = getDeviceInsertIndex(targetDeviceTaskId, nextStart)
@@ -576,61 +562,28 @@ const openTaskAdjustDialog = (task: any) => {
   if (!task?._planData) return
   taskAdjustTaskId.value = task.id
   taskAdjustForm.deviceTaskId = String(task.parent ?? '')
-  taskAdjustForm.startDate = dayjs(task.start_date).format('YYYY-MM-DD')
-  taskAdjustForm.duration = Math.max(Number(task.duration) || 1, 1)
+  taskAdjustForm.startDate = dayjs(task.start_date).format('YYYY-MM-DD HH:mm:ss')
+  taskAdjustForm.endDate = dayjs(task.end_date).format('YYYY-MM-DD HH:mm:ss')
   taskAdjustDialogVisible.value = true
 }
 
 const handleTaskAdjustSubmit = () => {
   if (!taskAdjustTaskId.value) return
-  if (!taskAdjustForm.deviceTaskId || !taskAdjustForm.startDate) {
-    message.warning('请完善设备和开始日期')
+  if (!taskAdjustForm.deviceTaskId || !taskAdjustForm.startDate || !taskAdjustForm.endDate) {
+    message.warning('请完善设备、计划开始日期和计划结束日期')
     return
   }
   const task = gantt.getTask(taskAdjustTaskId.value)
   if (!task?._planData) return
   ganttSyncing.value = true
   try {
-    applyTaskAdjust(task, taskAdjustForm.deviceTaskId, taskAdjustForm.startDate, taskAdjustForm.duration)
+    applyTaskAdjust(task, taskAdjustForm.deviceTaskId, taskAdjustForm.startDate, taskAdjustForm.endDate)
   } finally {
     ganttSyncing.value = false
   }
   taskAdjustDialogVisible.value = false
 }
 
-const handleStartDateEditorSubmit = () => {
-  if (!startDateEditorTaskId.value || !startDateEditorValue.value) {
-    startDateEditorVisible.value = false
-    return
-  }
-  const task = gantt.getTask(startDateEditorTaskId.value)
-  if (!task?._planData) {
-    startDateEditorVisible.value = false
-    return
-  }
-  const newStart = dayjs(startDateEditorValue.value)
-  if (!newStart.isValid()) {
-    message.warning('请选择有效的时间')
-    return
-  }
-  const duration = Math.max(Number(task.duration) || 1, 1)
-  const newEnd = newStart.add(duration - 1, 'day').endOf('day')
-  ganttSyncing.value = true
-  try {
-    task.start_date = newStart.toDate()
-    task.end_date = newEnd.toDate()
-    task.duration = duration
-    syncPlanTimeFromTask(task)
-    normalizeDeviceChildren(task.parent)
-    refreshPlanLinksByRowOrder()
-    refreshTimelineRangeByTasks()
-    gantt.updateTask(task.id)
-  } finally {
-    ganttSyncing.value = false
-  }
-  startDateEditorVisible.value = false
-}
-
 const refreshTimelineRangeByTasks = () => {
   let minStart = Number.POSITIVE_INFINITY
   let maxEnd = Number.NEGATIVE_INFINITY
@@ -691,28 +644,13 @@ const initGanttPreview = () => {
     },
     {
       name: 'start_date',
-      label: '开始时间',
+      label: '计划时间',
       align: 'center',
       width: 210,
       template: (task: any) =>
         task?._planData && String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
           ? `<span class="gantt-inline-editor-trigger" data-field="start_date" data-task-id="${task.id}">${formatGridDateText(task.start_date)}</span>`
           : formatGridDateText(task.start_date)
-    },
-    {
-      name: 'duration',
-      label: '天数',
-      align: 'center',
-      width: 60,
-      template: (task: any) =>
-        task?._planData && String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
-          ? `<span class="gantt-inline-editor-trigger" data-field="duration">${task.duration ?? 0}</span>`
-          : String(task.duration ?? 0),
-      editor: {
-        type: 'number',
-        map_to: 'duration',
-        min: 1
-      }
     }
   ]
 
@@ -771,9 +709,7 @@ const initGanttPreview = () => {
     const field = editableNode?.dataset?.field
     if (!field || !task?._planData || String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return true
     if (field === 'start_date') {
-      startDateEditorTaskId.value = id
-      startDateEditorValue.value = dayjs(task.start_date).format('YYYY-MM-DD HH:mm:ss')
-      startDateEditorVisible.value = true
+      openTaskAdjustDialog(task)
       return false
     }
     const inlineEditors = (gantt.ext as any)?.inlineEditors
@@ -796,9 +732,7 @@ const initGanttPreview = () => {
         const task = gantt.getTask(taskId)
         if (!task?._planData || String(task?._planData?.sourceType ?? '').toUpperCase() !== 'CURRENT') return
         e.stopPropagation()
-        startDateEditorTaskId.value = taskId
-        startDateEditorValue.value = dayjs(task.start_date).format('YYYY-MM-DD HH:mm:ss')
-        startDateEditorVisible.value = true
+        openTaskAdjustDialog(task)
       } catch {}
     }
     ganttContainerRef.value.addEventListener('click', gridClickHandler, true)

From 77ba830e707b260dc0c828dd59f1e4d5745bbb90 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 14:07:58 +0800
Subject: [PATCH 09/20] =?UTF-8?q?style=EF=BC=9A=E7=94=98=E7=89=B9=E5=9B=BE?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/ganttChart/index.vue | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/ganttChart/index.vue b/src/views/mes/ganttChart/index.vue
index 5215c8d6..8c39ac95 100644
--- a/src/views/mes/ganttChart/index.vue
+++ b/src/views/mes/ganttChart/index.vue
@@ -12,6 +12,11 @@
           class="!w-360px"
         />
       </el-form-item>
+      <el-form-item label="设备" prop="deviceIds">
+        <el-select v-model="queryParams.deviceIds" placeholder="请选择设备" clearable multiple collapse-tags class="!w-240px">
+          <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" />查询</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" />重置</el-button>
@@ -21,7 +26,7 @@
 
   <ContentWrap>
     <div v-loading="loading">
-      <ScheduleGanttPanel :schedule-list="scheduleList" :editable="false" height="calc(100vh - 320px)" />
+      <ScheduleGanttPanel :schedule-list="filteredList" :editable="false" height="calc(100vh - 320px)" />
     </div>
   </ContentWrap>
 </template>
@@ -68,7 +73,20 @@ const buildDefaultRange = () => {
 const queryRange = ref<string[]>(buildDefaultRange())
 const queryParams = reactive({
   startTime: queryRange.value[0],
-  endTime: queryRange.value[1]
+  endTime: queryRange.value[1],
+  deviceIds: [] as (string | number)[]
+})
+
+const deviceOptions = computed(() =>
+  scheduleList.value.map((device) => ({
+    label: device.deviceName,
+    value: device.deviceId
+  }))
+)
+
+const filteredList = computed(() => {
+  if (!queryParams.deviceIds.length) return scheduleList.value
+  return scheduleList.value.filter((device) => queryParams.deviceIds.includes(device.deviceId))
 })
 
 const getList = async () => {

From 5a5080877f811694b57be10b1746d430b8ab3d71 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 14:08:49 +0800
Subject: [PATCH 10/20] =?UTF-8?q?style=EF=BC=9A=E7=94=9F=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92-=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E2=80=9Dtabs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/plan/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index a3d53824..d6a679a4 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -59,7 +59,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <!-- <el-tab-pane label="所有" name="" /> -->
+      <el-tab-pane label="所有" name="" />
       <!-- <el-tab-pane label="派工" name="0" /> -->
       <el-tab-pane :label="t('ProductionPlan.Plan.tabPlannedLabel')" name="1" />
       <el-tab-pane :label="t('ProductionPlan.Plan.tabStartLabel')" name="8" />
@@ -282,7 +282,7 @@ const productList = ref<ProductVO[]>([]) // 产品列表
 const taskList = ref<TaskVO[]>([]) // 列表
 /** 生产计划 列表 */
 defineOptions({ name: 'Plan' })
-const activeName = ref('1') // 列表 tab
+const activeName = ref('') // 列表 tab
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化

From 1d312fd64674b43ed3489d05f6704e4cdbdfc5b7 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 16:24:08 +0800
Subject: [PATCH 11/20] =?UTF-8?q?style=EF=BC=9A=E4=BA=A7=E5=93=81BOM-?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81BOM=E6=98=8E=E7=BB=86-=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/bom/components/BomDetailForm.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/mes/bom/components/BomDetailForm.vue b/src/views/mes/bom/components/BomDetailForm.vue
index 66de58bf..012910db 100644
--- a/src/views/mes/bom/components/BomDetailForm.vue
+++ b/src/views/mes/bom/components/BomDetailForm.vue
@@ -17,6 +17,7 @@
               clearable
               filterable
               :placeholder="t('FactoryModeling.ProductBOM.detailMaterialPlaceholder')"
+              @change="(val) => handleProductChange(val, row)"
             >
               <el-option
                 v-for="item in productList"
@@ -138,6 +139,16 @@ watch(
   
 )
 
+/** 原料选择变更时，自动带入单位 */
+const handleProductChange = (productId: number | undefined, row: any) => {
+  if (productId) {
+    const product = productList.value.find((item) => item.id === productId)
+    row.unitId = product?.unitId ?? undefined
+  } else {
+    row.unitId = undefined
+  }
+}
+
 /** 新增按钮操作 */
 const handleAdd = () => {
   const row = {

From 95d8398b0b71ac86512f035cf2af4ee1e9adfa3c Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 16:28:38 +0800
Subject: [PATCH 12/20] =?UTF-8?q?style=EF=BC=9A=E4=BA=A7=E5=93=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF-=E5=8E=BB=E6=8E=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E9=87=87=E8=B4=AD=E4=BB=B7=E6=A0=BC=E3=80=81?=
 =?UTF-8?q?=E6=9C=80=E4=BD=8E=E4=BB=B7=E6=A0=BC=E3=80=81=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/product/product/ProductForm.vue |   4 +-
 .../components/ScheduleGanttPanelEditable.vue | 142 +++++++++++++++++-
 2 files changed, 136 insertions(+), 10 deletions(-)

diff --git a/src/views/erp/product/product/ProductForm.vue b/src/views/erp/product/product/ProductForm.vue
index d8c4fd79..8196fed3 100644
--- a/src/views/erp/product/product/ProductForm.vue
+++ b/src/views/erp/product/product/ProductForm.vue
@@ -87,7 +87,7 @@
             />
           </el-form-item>
         </el-col> -->
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item :label="t('FactoryModeling.ProductInformation.dialogPurchasePriceLabel')" prop="purchasePrice">
             <el-input-number
               v-model="formData.purchasePrice"
@@ -119,7 +119,7 @@
               class="!w-1/1"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item :label="t('FactoryModeling.ProductInformation.dialogStatusLabel')" prop="status">
             <el-radio-group v-model="formData.status">
diff --git a/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
index 54d20bfd..c45f4467 100644
--- a/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
+++ b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
@@ -110,6 +110,12 @@ const previewDeviceOptions = computed(() =>
   }))
 )
 
+const hasCurrentPlan = (device: any) =>
+  (device?.plans ?? []).some((plan: any) => String(plan.sourceType ?? '').toUpperCase() === 'CURRENT')
+
+const getGanttScheduleList = () =>
+  previewScheduleList.value.filter((device: any) => hasCurrentPlan(device))
+
 const getGlobalDateRange = (scheduleList: any[]) => {
   const allPlans = scheduleList.flatMap((item: any) => item?.plans ?? [])
   const starts = allPlans.map((item: any) => dayjs(item?.planStartTimeStr).valueOf()).filter((item: number) => Number.isFinite(item))
@@ -240,10 +246,20 @@ const cleanupTaskTooltips = () => {
 }
 
 const destroyGantt = () => {
-  cleanupTaskTooltips()
-  ganttEventIds.value.forEach((eventId) => gantt.detachEvent(eventId))
+  try {
+    cleanupTaskTooltips()
+  } catch {}
+  try {
+    ganttEventIds.value.forEach((eventId) => {
+      try {
+        gantt.detachEvent(eventId)
+      } catch {}
+    })
+  } catch {}
   ganttEventIds.value = []
-  gantt.clearAll()
+  try {
+    gantt.clearAll()
+  } catch {}
 }
 
 const formatGridDateText = (value: unknown) => {
@@ -534,18 +550,122 @@ const getDeviceInsertIndex = (deviceTaskId: string | number, startDate: dayjs.Da
   return childTaskIds.length
 }
 
+const addDeviceToGantt = (device: any, excludePlanIdentity?: string) => {
+  const deviceId = `device-${device.deviceId}`
+  try {
+    gantt.getTask(deviceId)
+    return
+  } catch {}
+  const plans = (device?.plans ?? []).map((plan: any) => ({
+    ...plan,
+    _start: dayjs(plan?.planStartTimeStr),
+    _end: dayjs(plan?.planEndTimeStr)
+  }))
+  const validPlans = plans
+    .filter((plan: any) => plan._start.isValid() && plan._end.isValid())
+    .sort((a: any, b: any) => a._start.valueOf() - b._start.valueOf())
+  const firstPlan = validPlans[0]
+  const deviceRange = getDeviceTaskRangeByChildren(
+    validPlans.map((item: any) => ({ start_date: item?._start, end_date: item?._end }))
+  )
+  gantt.addTask({
+    id: deviceId,
+    text: `${device.deviceName ?? '-'}`,
+    start_date: formatGanttDate(deviceRange?.start_date ?? firstPlan?._start),
+    end_date: formatGanttDate(deviceRange?.end_date ?? firstPlan?._end),
+    duration: deviceRange?.duration ?? 1,
+    parent: 0,
+    progress: 0,
+    open: true,
+    readonly: true,
+    deviceName: device.deviceName ?? '-',
+    _deviceData: device
+  })
+  validPlans.forEach((plan: any, index: number) => {
+    const planIdentity = `${plan?.taskId ?? ''}-${plan?.taskDetailId ?? ''}`
+    if (excludePlanIdentity && planIdentity === excludePlanIdentity) return
+    const startDate = formatGanttDate(plan.planStartTimeStr)
+    const endDate = formatGanttDate(plan.planEndTimeStr)
+    if (!startDate || !endDate) return
+    const duration = Number(plan.scheduleDays) > 0 ? Number(plan.scheduleDays) : Math.max(plan._end.diff(plan._start, 'day') + 1, 1)
+    const isHistory = String(plan.sourceType ?? '').toUpperCase() === 'HISTORY'
+    const planTaskId = `plan-${device.deviceId}-${plan.taskDetailId ?? index}-${index}`
+    gantt.addTask({
+      id: planTaskId,
+      text: `${plan.productCode ?? '-'} / ${plan.productName ?? '-'} / ${plan.taskCode ?? '-'}`,
+      start_date: startDate,
+      end_date: endDate,
+      duration,
+      parent: deviceId,
+      progress: 0,
+      readonly: isHistory,
+      _planData: plan,
+      _deviceData: device
+    })
+  })
+}
+
+const removeDeviceFromGanttIfNoCurrent = (deviceTaskId: string | number) => {
+  try {
+    const deviceTask = gantt.getTask(deviceTaskId)
+    if (!deviceTask || deviceTask?._planData) return
+    const childTaskIds = gantt.getChildren(deviceTaskId)
+    const hasCurrent = (Array.isArray(childTaskIds) ? childTaskIds : []).some((childId: string | number) => {
+      const childTask = gantt.getTask(childId)
+      return childTask?._planData && String(childTask._planData.sourceType ?? '').toUpperCase() === 'CURRENT'
+    })
+    if (!hasCurrent) {
+      gantt.deleteTask(String(deviceTaskId))
+    }
+  } catch {}
+}
+
 const applyTaskAdjust = (task: any, targetDeviceTaskId: string | number, startDate: string, endDate: string) => {
-  const targetDeviceTask = gantt.getTask(targetDeviceTaskId)
-  if (!targetDeviceTask || targetDeviceTask?._planData) return
   const sourceDeviceTaskId = task.parent
   const nextStart = dayjs(startDate)
   const nextEnd = dayjs(endDate)
   const duration = Math.max(nextEnd.diff(nextStart, 'day') + 1, 1)
+  const planIdentity = `${task?._planData?.taskId ?? ''}-${task?._planData?.taskDetailId ?? ''}`
+
+  const targetDeviceData = previewScheduleList.value.find((d: any) => `device-${d.deviceId}` === targetDeviceTaskId)
+  if (!targetDeviceData) return
+
+  const sourceDeviceData = task._deviceData
+  if (sourceDeviceData?.plans && Array.isArray(sourceDeviceData.plans)) {
+    sourceDeviceData.plans = sourceDeviceData.plans.filter((item: any) => {
+      const itemId = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
+      return itemId !== planIdentity
+    })
+  }
+  if (!Array.isArray(targetDeviceData.plans)) {
+    targetDeviceData.plans = []
+  }
+  const targetExists = targetDeviceData.plans.some((item: any) => {
+    const itemId = `${item?.taskId ?? ''}-${item?.taskDetailId ?? ''}`
+    return itemId === planIdentity
+  })
+  if (!targetExists) {
+    targetDeviceData.plans.push(task._planData)
+  }
+  task._planData.deviceId = targetDeviceData.deviceId
+  task._planData.feedingPipeline = targetDeviceData.deviceId
+  task._deviceData = targetDeviceData
+
+  let targetDeviceInGantt = true
+  try {
+    gantt.getTask(targetDeviceTaskId)
+  } catch {
+    targetDeviceInGantt = false
+  }
+
+  if (!targetDeviceInGantt) {
+    addDeviceToGantt(targetDeviceData, planIdentity)
+  }
+
   task.parent = targetDeviceTaskId
   task.start_date = nextStart.toDate()
   task.end_date = nextEnd.toDate()
   task.duration = duration
-  movePlanDataToDevice(task, targetDeviceTaskId, sourceDeviceTaskId)
   const targetIndex = getDeviceInsertIndex(targetDeviceTaskId, nextStart)
   gantt.moveTask(task.id, targetIndex, targetDeviceTaskId)
   gantt.updateTask(task.id)
@@ -553,9 +673,11 @@ const applyTaskAdjust = (task: any, targetDeviceTaskId: string | number, startDa
   normalizeDeviceChildren(targetDeviceTaskId, task.id)
   if (sourceDeviceTaskId && sourceDeviceTaskId !== targetDeviceTaskId) {
     normalizeDeviceChildren(sourceDeviceTaskId)
+    removeDeviceFromGanttIfNoCurrent(sourceDeviceTaskId)
   }
   refreshPlanLinksByRowOrder()
   refreshTimelineRangeByTasks()
+  gantt.render()
 }
 
 const openTaskAdjustDialog = (task: any) => {
@@ -666,13 +788,14 @@ const initGanttPreview = () => {
     return sourceType === 'HISTORY' ? 'schedule-plan-task-history' : 'schedule-plan-task'
   }
 
-  const globalRange = getGlobalDateRange(previewScheduleList.value)
+  const ganttScheduleData = getGanttScheduleList()
+  const globalRange = getGlobalDateRange(ganttScheduleData)
   gantt.config.start_date = dayjs(globalRange.start).startOf('day').toDate()
   gantt.config.end_date = dayjs(globalRange.end).endOf('day').toDate()
 
   gantt.init(ganttContainerRef.value)
 
-  const ganttData = buildPreviewGanttData(previewScheduleList.value)
+  const ganttData = buildPreviewGanttData(ganttScheduleData)
   gantt.parse(ganttData)
   
   // 强制刷新所有任务的样式，确保颜色正确应用
@@ -775,6 +898,7 @@ const initGanttPreview = () => {
       syncPlanTimeFromTask(task)
       normalizeDeviceChildren(parent)
       normalizeDeviceChildren(sourceParent)
+      removeDeviceFromGanttIfNoCurrent(sourceParent)
       refreshPlanLinksByRowOrder()
       refreshTimelineRangeByTasks()
     } finally {
@@ -838,7 +962,9 @@ onMounted(async () => {
 watch(
   () => props.scheduleList,
   async () => {
+    if (ganttSyncing.value) return
     await nextTick()
+    if (ganttSyncing.value) return
     initGanttPreview()
   },
   { deep: true }

From 99acfc1f152e29ae32908c862f332ff400b9cd03 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 16:37:01 +0800
Subject: [PATCH 13/20] =?UTF-8?q?style=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=88=B6?=
 =?UTF-8?q?=E5=8D=95-=E6=98=8E=E7=BB=86-=E7=BC=96=E8=BE=91-=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/task/components/TaskDetailForm.vue    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/mes/task/components/TaskDetailForm.vue b/src/views/mes/task/components/TaskDetailForm.vue
index bd65e5ea..c2e40266 100644
--- a/src/views/mes/task/components/TaskDetailForm.vue
+++ b/src/views/mes/task/components/TaskDetailForm.vue
@@ -64,6 +64,7 @@
             <el-input-number
               v-model="formData.packageNumber"
               :min="0"
+              disabled
               class="!w-1/1"
               :placeholder="t('ProductionPlan.Task.detailDialogPackageNumberPlaceholder')"
             />
@@ -180,7 +181,7 @@ const formRules = reactive({
   unitId: [{ required: true, message: t('ProductionPlan.Task.validatorDetailUnitIdRequired'), trigger: 'blur' }],
   taskId: [{ required: true, message: t('ProductionPlan.Task.validatorDetailTaskIdRequired'), trigger: 'blur' }],
   number: [{ required: true, message: t('ProductionPlan.Task.validatorDetailNumberRequired'), trigger: 'blur' }],
-  packageSize: [{ required: true, message: t('ProductionPlan.Task.validatorDetailPackageSizeRequired'), trigger: 'blur' }],
+  packageSize: [],
   finishDate: [{ validator: validateFinishDate, trigger: ['change', 'blur'] }]
 })
 const formRef = ref() // 表单 Ref
@@ -241,6 +242,22 @@ const submitForm = async () => {
   }
 }
 
+/** 监听数量和每包数量变化，自动计算打包数量 */
+watch(
+  () => [formData.value.number, formData.value.packageSize],
+  ([number, packageSize]) => {
+    if (!number && number !== 0) {
+      formData.value.packageNumber = undefined
+      return
+    }
+    if (!packageSize || packageSize === 0) {
+      formData.value.packageNumber = number
+    } else {
+      formData.value.packageNumber = Math.ceil(number / packageSize)
+    }
+  }
+)
+
 /** 处理产品变更 */
 const onChangeProduct = (productId) => {
   const product = productList.value.find((item) => item.id === productId)

From 8863d6fd5783b54b4c080ef72b8c0c0ca5ca40ff Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 17:03:58 +0800
Subject: [PATCH 14/20] =?UTF-8?q?style=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=88=B6?=
 =?UTF-8?q?=E5=8D=95-=E6=8A=80=E6=9C=AF=E8=A6=81=E6=B1=82=E3=80=81?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en.ts                             |  3 +-
 src/locales/zh-CN.ts                          |  3 +-
 .../mes/task/components/TaskDetailForm.vue    | 30 ++++++++-----------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/locales/en.ts b/src/locales/en.ts
index cc2d0185..d680b4b0 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3313,7 +3313,8 @@ export default {
       detailDialogBoxingDatePlaceholder: 'Select boxing date',
       detailDialogArriveDateLabel: 'Arrival Date',
       detailDialogArriveDatePlaceholder: 'Select arrival date',
-      detailDialogRemarkLabel: 'Remark:',
+      detailDialogRemarkLabel: 'Remark',
+      detailDialogRemarkPlaceholder: 'Please enter remark',
       detailDialogSubmitButtonText: 'Confirm',
       detailDialogCancelButtonText: 'Cancel',
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 7ebf9212..e11b0abd 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -3159,7 +3159,8 @@ export default {
       detailDialogBoxingDatePlaceholder: '选择装柜日期',
       detailDialogArriveDateLabel: '到达日期',
       detailDialogArriveDatePlaceholder: '选择到达日期',
-      detailDialogRemarkLabel: '备注：',
+      detailDialogRemarkLabel: '备注',
+      detailDialogRemarkPlaceholder: '请输入备注',
       detailDialogSubmitButtonText: '确 定',
       detailDialogCancelButtonText: '取 消',
 
diff --git a/src/views/mes/task/components/TaskDetailForm.vue b/src/views/mes/task/components/TaskDetailForm.vue
index c2e40266..734b17b1 100644
--- a/src/views/mes/task/components/TaskDetailForm.vue
+++ b/src/views/mes/task/components/TaskDetailForm.vue
@@ -71,18 +71,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <!-- <el-col :span="8">
-          <el-form-item label="条码" prop="barCode">
-            <el-input v-model="formData.barCode" placeholder="请输入条码" />
-          </el-form-item>
-        </el-col> -->
-        <el-col :span="8">
-          <el-form-item :label="t('ProductionPlan.Task.detailDialogTechRequirementsLabel')" prop="techRequirements">
-            <el-input v-model="formData.techRequirements" :placeholder="t('ProductionPlan.Task.detailDialogTechRequirementsPlaceholder')" />
-          </el-form-item>
-        </el-col>
-      </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item :label="t('ProductionPlan.Task.detailFormDeliveryDateLabel')" prop="finishDate">
@@ -95,7 +83,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item :label="t('ProductionPlan.Task.detailDialogBoxingDateLabel')" prop="boxingDate">
             <el-date-picker
               v-model="formData.boxingDate"
@@ -114,12 +102,20 @@
               :placeholder="t('ProductionPlan.Task.detailDialogArriveDatePlaceholder')"
             />
           </el-form-item>
+        </el-col> -->
+      </el-row>
+         <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item :label="t('ProductionPlan.Task.detailDialogTechRequirementsLabel')" prop="techRequirements">
+            <el-input v-model="formData.techRequirements" type="textarea" :rows="4" :placeholder="t('ProductionPlan.Task.detailDialogTechRequirementsPlaceholder')" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('ProductionPlan.Task.detailDialogRemarkLabel')" prop="remark">
+            <el-input v-model="formData.remark" type="textarea" :rows="4" :placeholder="t('ProductionPlan.Task.detailDialogRemarkPlaceholder')" />
+          </el-form-item>
         </el-col>
       </el-row>
-
-      <el-form-item :label="t('ProductionPlan.Task.detailDialogRemarkLabel')" prop="remark">
-        <Editor disabled="disabled" v-model="formData.remark" height="500px" />
-      </el-form-item>
     </el-form>
 
 

From 7e32b70a6d40751b1a0cd4fa733fec4205aece4b Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 17:06:08 +0800
Subject: [PATCH 15/20] =?UTF-8?q?style=EF=BC=9A=E4=BA=A7=E5=93=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF-=E7=8A=B6=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/product/product/ProductForm.vue | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/erp/product/product/ProductForm.vue b/src/views/erp/product/product/ProductForm.vue
index 8196fed3..60ac96d6 100644
--- a/src/views/erp/product/product/ProductForm.vue
+++ b/src/views/erp/product/product/ProductForm.vue
@@ -120,19 +120,6 @@
             />
           </el-form-item>
         </el-col> -->
-        <el-col :span="12">
-          <el-form-item :label="t('FactoryModeling.ProductInformation.dialogStatusLabel')" prop="status">
-            <el-radio-group v-model="formData.status">
-              <el-radio
-                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-                :key="dict.value"
-                :label="dict.value"
-              >
-                {{ dict.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
         <el-col v-if="isProductCategory" :span="12">
           <el-form-item label="关联设备" prop="devices">
             <el-input
@@ -152,6 +139,19 @@
               @click="openMoldSelectDialog"
             />
           </el-form-item>
+        </el-col>
+         <el-col :span="12">
+          <el-form-item :label="t('FactoryModeling.ProductInformation.dialogStatusLabel')" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-col>
         <el-col v-if="formType === 'update'" :span="24">
           <el-form-item :label="t('FactoryModeling.ProductInformation.qrcode')" prop="qrcodeUrl">

From 11b3d14603d9325056414db7f2d3a3d59d10779b Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 17:10:07 +0800
Subject: [PATCH 16/20] =?UTF-8?q?style=EF=BC=9A=E4=BA=A7=E5=93=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF-=E5=85=B3=E8=81=94=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E9=80=89=E9=A1=B9=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?deviceStatus=3D0=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/product/product/ProductForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/erp/product/product/ProductForm.vue b/src/views/erp/product/product/ProductForm.vue
index 60ac96d6..e2b875ae 100644
--- a/src/views/erp/product/product/ProductForm.vue
+++ b/src/views/erp/product/product/ProductForm.vue
@@ -351,7 +351,8 @@ const moldColumns = [
 const fetchDeviceLedgerPage = (params: Record<string, any>) => {
   return DeviceLedgerApi.getDeviceLedgerPage({
     ...params,
-    isScheduled: 1
+    isScheduled: 1,
+    deviceStatus: 0
   })
 }
 const openDeviceSelectDialog = () => {

From fc8e5367fb067d8882bafccde7eeb8573009a561 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 17:32:32 +0800
Subject: [PATCH 17/20] =?UTF-8?q?feat=EF=BC=9A=E6=A3=80=E9=AA=8C=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF-=E6=B7=BB=E5=8A=A0=E5=85=B3=E8=81=94=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en.ts                       |   3 +
 src/locales/zh-CN.ts                    |   3 +
 src/views/mes/zjschema/ZjSchemaForm.vue | 193 ++++++++++++++++++++++--
 3 files changed, 185 insertions(+), 14 deletions(-)

diff --git a/src/locales/en.ts b/src/locales/en.ts
index d680b4b0..6781d569 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -2737,6 +2737,7 @@ export default {
       sampleMethod: 'Sampling Method',
       val: 'Value',
       item: 'Related Items',
+      product: 'Related Products',
       remark: 'Remark',
       createTime: 'Create Time',
       operate: 'Operate',
@@ -2750,6 +2751,8 @@ export default {
       placeholderSampleMethod: 'Please select sampling method',
       placeholderVal: 'Please input value',
       placeholderItem: 'Please select inspection items',
+      placeholderProduct: 'Please select related products',
+      selectProductDialogTitle: 'Select Related Products',
       placeholderRemark: 'Please input remark',
       placeholderCreateTimeStart: 'Start Date',
       placeholderCreateTimeEnd: 'End Date',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index e11b0abd..5a47a5ce 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -2245,6 +2245,7 @@ export default {
       sampleMethod: '抽检方式',
       val: '值',
       item: '关联项目',
+      product: '关联产品',
       remark: '备注',
       createTime: '创建时间',
       operate: '操作',
@@ -2258,6 +2259,8 @@ export default {
       placeholderSampleMethod: '请选择抽检方式',
       placeholderVal: '请输入值',
       placeholderItem: '请选择检验项目',
+      placeholderProduct: '请选择关联产品',
+      selectProductDialogTitle: '选择关联产品',
       placeholderRemark: '请输入备注',
       placeholderCreateTimeStart: '开始日期',
       placeholderCreateTimeEnd: '结束日期',
diff --git a/src/views/mes/zjschema/ZjSchemaForm.vue b/src/views/mes/zjschema/ZjSchemaForm.vue
index 82755747..2eacb7dc 100644
--- a/src/views/mes/zjschema/ZjSchemaForm.vue
+++ b/src/views/mes/zjschema/ZjSchemaForm.vue
@@ -49,20 +49,11 @@
         <el-input :model-value="displayItemNames" readonly clearable class="device-ledger-selection-input"
                   :placeholder="t('QualityManagement.ZjSchema.placeholderItem')"
                   @click="openCriticalComponentDialog"  @clear="clearBeijian" />
-        <!--   <el-row :gutter="8" class="w-full">
-         <el-col :span="22">
-             <el-input
-               :model-value="displayItemNames"
-               :placeholder="t('QualityManagement.ZjSchema.placeholderItem')"
-               readonly
-             />
-           </el-col>
-           <el-col :span="2" class="text-right">
-             <el-button type="primary" @click="openItemDialog">
-               {{ t('action.select') }}
-             </el-button>
-           </el-col>
-         </el-row>-->
+      </el-form-item>
+      <el-form-item :label="t('QualityManagement.ZjSchema.product')" prop="product">
+        <el-input :model-value="displayProductNames" readonly clearable class="device-ledger-selection-input"
+                  :placeholder="t('QualityManagement.ZjSchema.placeholderProduct')"
+                  @click="openProductDialog" @clear="clearProduct" />
       </el-form-item>
       <el-form-item :label="t('QualityManagement.ZjSchema.remark')" prop="remark">
         <el-input
@@ -230,11 +221,69 @@
       </el-button>
     </template>
   </el-dialog>
+  <el-dialog
+    v-model="productDialogVisible"
+    :title="t('QualityManagement.ZjSchema.selectProductDialogTitle')"
+    width="1300px"
+    draggable
+  >
+    <el-form class="-mb-15px" :model="productQueryParams" ref="productQueryFormRef" :inline="true" min-label-width="68px"
+             style="margin-bottom: 10px">
+      <el-form-item :label="t('FactoryModeling.ProductInformation.searchNameLabel')" prop="name">
+        <el-input
+          v-model="productQueryParams.name"
+          :placeholder="t('FactoryModeling.ProductInformation.searchNamePlaceholder')"
+          clearable
+          @keyup.enter="handleProductQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleProductQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          {{ t('common.query') }}
+        </el-button>
+        <el-button @click="resetProductQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          {{ t('common.reset') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <ContentWrap>
+      <el-table ref="productTableRef" v-loading="productLoading" :data="productList" :stripe="true"
+                @selection-change="handleProductSelectionChange" @select="handleProductSelect" @select-all="handleProductSelectAll"
+                :show-overflow-tooltip="true" row-key="id">
+        <el-table-column type="selection" width="55" :reserve-selection="true" />
+        <el-table-column :label="t('FactoryModeling.ProductInformation.tableBarCodeColumn')" align="center" prop="barCode" sortable />
+        <el-table-column :label="t('FactoryModeling.ProductInformation.tableNameColumn')" align="left" prop="name" width="220px" sortable />
+        <el-table-column :label="t('FactoryModeling.ProductInformation.tableStandardColumn')" align="center" prop="standard" sortable />
+        <el-table-column :label="t('FactoryModeling.ProductInformation.tableCategoryColumn')" align="center" prop="subCategoryName" sortable />
+        <el-table-column :label="t('FactoryModeling.ProductInformation.tableUnitColumn')" align="center" prop="unitName" sortable />
+        <el-table-column :label="t('FactoryModeling.ProductInformation.tableStatusColumn')" align="center" prop="status" sortable>
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <Pagination :total="productTotal" v-model:page="productQueryParams.pageNo" v-model:limit="productQueryParams.pageSize"
+                  @pagination="getProductList" />
+    </ContentWrap>
+    <template #footer>
+      <el-button @click="productDialogVisible = false">
+        {{ t('common.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="confirmSelectProducts">
+        {{ t('common.ok') }}
+      </el-button>
+    </template>
+  </el-dialog>
 </template>
 <script setup lang="ts">
 import { getDictOptions } from '@/utils/dict'
+import { DICT_TYPE } from '@/utils/dict'
 import { ZjSchemaApi, ZjSchemaVO } from '@/api/mes/zjschema'
 import { ZjItemApi, ZjItemVO } from '@/api/mes/zjitem'
+import { ProductApi } from '@/api/erp/product/product'
 import {ref} from "vue";
 import {ElTable} from "element-plus";
 import {ZjTypeApi, ZjTypeVO} from "@/api/mes/zjtype";
@@ -266,6 +315,7 @@ const formData = ref({
   sampleMethod: undefined as string | undefined,
   val: undefined as string | undefined,
   item: undefined as string | undefined,
+  product: undefined as string | undefined,
 })
 const rateVal = ref<number | undefined>(undefined)
 const gapInterval = ref<number | undefined>(undefined)
@@ -534,6 +584,7 @@ const resetForm = () => {
     sampleMethod: undefined,
     val: undefined,
     item: undefined,
+    product: undefined,
   }
   rateVal.value = undefined
   gapInterval.value = undefined
@@ -543,6 +594,8 @@ const resetForm = () => {
    targetKeyword.value = ''
    sourceCheckedKeys.value = []
    targetCheckedKeys.value = []
+  productIds.value = []
+  productSelectedRows.value = []
   formRef.value?.resetFields()
 }
 
@@ -584,6 +637,118 @@ const initSelectedItems = async () => {
 
 
 const ids = ref([])
+
+const productDialogVisible = ref(false)
+const productLoading = ref(false)
+const productList = ref<any[]>([])
+const productTotal = ref(0)
+const productQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined as string | undefined,
+  categoryId: 2
+})
+const productQueryFormRef = ref()
+const productTableRef = ref<InstanceType<typeof ElTable>>()
+const productIds = ref<number[]>([])
+const productSelectedRows = ref<any[]>([])
+
+const displayProductNames = computed(() => {
+  if (!productIds.value.length) return ''
+  if (!productSelectedRows.value.length) {
+    return formData.value.product ? String(formData.value.product) : ''
+  }
+  const map = new Map(productSelectedRows.value.map((item) => [item.id, item.name]))
+  return productIds.value.map((id) => map.get(id)).filter(Boolean).join(',')
+})
+
+const openProductDialog = async () => {
+  productDialogVisible.value = true
+  const initIds = formData.value.product != undefined ? formData.value.product.toString().split(',') : []
+  productIds.value = initIds.map((id: string) => Number(id))
+  await getProductList()
+  nextTick(() => {
+    setProductDefaultSelections()
+  })
+}
+
+const getProductList = async () => {
+  productLoading.value = true
+  try {
+    const data = await ProductApi.getProductPage(productQueryParams)
+    productList.value = data.list
+    productTotal.value = data.total
+    nextTick(() => {
+      setProductDefaultSelections()
+    })
+  } finally {
+    productLoading.value = false
+  }
+}
+
+const setProductDefaultSelections = () => {
+  nextTick(() => {
+    if (!productTableRef.value) return
+    productTableRef.value.clearSelection()
+    productList.value.forEach((row) => {
+      if (productIds.value.includes(row.id)) {
+        productTableRef.value!.toggleRowSelection(row, true)
+      }
+    })
+  })
+}
+
+const handleProductSelectionChange = (rows: any[]) => {
+  const currentPageIds = rows.map((item) => item.id)
+  productSelectedRows.value = productSelectedRows.value.filter(
+    (item) => !currentPageIds.includes(item.id)
+  )
+  productSelectedRows.value.push(...rows)
+}
+
+const handleProductSelect = (selection: any[], row: any) => {
+  const isSelected = selection.includes(row)
+  if (isSelected) {
+    productIds.value.push(row.id)
+  } else {
+    productIds.value = productIds.value.filter((id) => id !== row.id)
+  }
+}
+
+const handleProductSelectAll = (selection: any[]) => {
+  const currentPageIds = productList.value.map((row) => row.id)
+  if (selection.length > 0) {
+    selection.forEach((row) => {
+      if (!productIds.value.includes(row.id)) {
+        productIds.value.push(row.id)
+      }
+    })
+  } else {
+    productIds.value = productIds.value.filter((id) => !currentPageIds.includes(id))
+  }
+}
+
+const confirmSelectProducts = () => {
+  formData.value.product = productIds.value.join(',')
+  productDialogVisible.value = false
+}
+
+const clearProduct = () => {
+  formData.value.product = ''
+  productIds.value = []
+  productSelectedRows.value = []
+}
+
+const handleProductQuery = () => {
+  productQueryParams.pageNo = 1
+  getProductList()
+}
+
+const resetProductQuery = () => {
+  productQueryFormRef.value.resetFields()
+  handleProductQuery()
+}
+
 const handleSelectionChange = (rows: ZjItemVO[]) => {
   selectedIds.value = rows.map((r) => r.id).filter((id): id is number => typeof id === 'number')
   // 获取当前页所有行的 id

From 9361794f437ed3e8348fabbd8a7259aa97edacc6 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 17:34:33 +0800
Subject: [PATCH 18/20] =?UTF-8?q?style=EF=BC=9A=E4=BA=A7=E5=93=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF-=E8=AE=BE=E5=A4=87-=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E8=BD=A6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/product/product/ProductForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/erp/product/product/ProductForm.vue b/src/views/erp/product/product/ProductForm.vue
index e2b875ae..2377a44b 100644
--- a/src/views/erp/product/product/ProductForm.vue
+++ b/src/views/erp/product/product/ProductForm.vue
@@ -340,7 +340,7 @@ const deviceColumns = [
   { label: '设备编号', prop: 'deviceCode', minWidth: 140 },
   { label: '设备名称', prop: 'deviceName', minWidth: 160 },
   { label: '设备型号', prop: 'deviceModel', minWidth: 140 },
-  { label: '所属车间', prop: 'workshop', minWidth: 140 }
+  { label: '所属车间', prop: 'workshopName', minWidth: 140 }
 ]
 const moldColumns = [
   { label: '模具编码', prop: 'code', minWidth: 140 },

From 0ac051e4fcf67c079d50035913cf08522a97dd1a Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 17:38:36 +0800
Subject: [PATCH 19/20] =?UTF-8?q?style=EF=BC=9A=E7=94=9F=E4=BA=A7=E6=8A=95?=
 =?UTF-8?q?=E6=96=99-=E6=95=B0=E9=87=8F=E4=B8=8D=E5=A1=AB=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/feedingrecord/FeedingRecordForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue
index 250607e2..3e51495f 100644
--- a/src/views/mes/feedingrecord/FeedingRecordForm.vue
+++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue
@@ -323,7 +323,7 @@ const handleQuery = async(planId : number) => {
   data.value = await PlanApi.getPlan(planId)
   //console.log(data.value)
   list.value = await ItemRequisitionApi.getItemRequisitionDetailListByItemRequisitionId(data.value.requisitionId)
-  recordData.value = list.value
+  recordData.value = list.value.map((item) => ({ ...item, weight: item.weight ?? 0 }))
   to.value = list.total
 }
 </script>

From 7574ca1324de2f3a3dad23bd0a76c9997a661db7 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 20 Apr 2026 17:50:50 +0800
Subject: [PATCH 20/20] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=94=98?=
 =?UTF-8?q?=E7=89=B9=E5=9B=BE=E4=BF=9D=E5=AD=98=E5=90=8E=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ScheduleGanttPanelEditable.vue | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
index c45f4467..38f00989 100644
--- a/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
+++ b/src/views/mes/tasksummary/components/ScheduleGanttPanelEditable.vue
@@ -492,6 +492,11 @@ const movePlanDataToDevice = (task: any, targetDeviceTaskId: string | number, so
 }
 
 const normalizeDeviceChildren = (deviceTaskId: string | number, priorityTaskId?: string | number) => {
+  try {
+    gantt.getTask(deviceTaskId)
+  } catch {
+    return
+  }
   const childTaskIds = gantt.getChildren(deviceTaskId)
   if (!Array.isArray(childTaskIds) || !childTaskIds.length) return
   const childTasks = childTaskIds
@@ -513,28 +518,32 @@ const normalizeDeviceChildren = (deviceTaskId: string | number, priorityTaskId?:
 }
 
 const refreshPlanLinksByRowOrder = () => {
-  const allLinks = gantt.getLinks()
-  allLinks.forEach((item: any) => gantt.deleteLink(item.id))
-  let linkIndex = 1
-  const deviceTaskIds = gantt.getChildren(0)
-  deviceTaskIds.forEach((deviceTaskId: string | number) => {
-    const childTaskIds = gantt.getChildren(deviceTaskId).filter((childId: string | number) => {
-      const task = gantt.getTask(childId)
-      return !!task?._planData
-    })
-    let previousTaskId: string | number | null = null
-    childTaskIds.forEach((taskId: string | number) => {
-      if (previousTaskId !== null) {
-        gantt.addLink({
-          id: `link-${linkIndex++}`,
-          source: previousTaskId,
-          target: taskId,
-          type: '0'
+  try {
+    const allLinks = gantt.getLinks()
+    allLinks.forEach((item: any) => gantt.deleteLink(item.id))
+    let linkIndex = 1
+    const deviceTaskIds = gantt.getChildren(0)
+    deviceTaskIds.forEach((deviceTaskId: string | number) => {
+      try {
+        const childTaskIds = gantt.getChildren(deviceTaskId).filter((childId: string | number) => {
+          const task = gantt.getTask(childId)
+          return !!task?._planData
         })
-      }
-      previousTaskId = taskId
+        let previousTaskId: string | number | null = null
+        childTaskIds.forEach((taskId: string | number) => {
+          if (previousTaskId !== null) {
+            gantt.addLink({
+              id: `link-${linkIndex++}`,
+              source: previousTaskId,
+              target: taskId,
+              type: '0'
+            })
+          }
+          previousTaskId = taskId
+        })
+      } catch {}
     })
-  })
+  } catch {}
 }
 
 const getDeviceInsertIndex = (deviceTaskId: string | number, startDate: dayjs.Dayjs) => {
@@ -672,8 +681,8 @@ const applyTaskAdjust = (task: any, targetDeviceTaskId: string | number, startDa
   syncPlanTimeFromTask(task)
   normalizeDeviceChildren(targetDeviceTaskId, task.id)
   if (sourceDeviceTaskId && sourceDeviceTaskId !== targetDeviceTaskId) {
-    normalizeDeviceChildren(sourceDeviceTaskId)
     removeDeviceFromGanttIfNoCurrent(sourceDeviceTaskId)
+    normalizeDeviceChildren(sourceDeviceTaskId)
   }
   refreshPlanLinksByRowOrder()
   refreshTimelineRangeByTasks()