From 40a68e3c1f70a23fa376cd46c9149127eb3498a5 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 09:27:13 +0800
Subject: [PATCH 1/9] =?UTF-8?q?style=EF=BC=9A=E7=94=98=E7=89=B9=E5=9B=BEto?=
 =?UTF-8?q?oltip=E9=9A=90=E8=97=8F=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/components/ScheduleGanttPanel.vue     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/views/mes/components/ScheduleGanttPanel.vue b/src/views/mes/components/ScheduleGanttPanel.vue
index 79cc0e64..bb19e14c 100644
--- a/src/views/mes/components/ScheduleGanttPanel.vue
+++ b/src/views/mes/components/ScheduleGanttPanel.vue
@@ -209,7 +209,26 @@ const buildPreviewGanttData = (scheduleList: any[]) => {
   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'
+  }
+}
+
 const destroyGantt = () => {
+  cleanupTaskTooltips()
   ganttEventIds.value.forEach((eventId) => gantt.detachEvent(eventId))
   ganttEventIds.value = []
   gantt.clearAll()

From 4183ccda7c8f3e3eb5e6b8f943933b1dea190865 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 09:40:21 +0800
Subject: [PATCH 2/9] =?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=96=B0=E5=A2=9E=E8=AE=A1=E5=88=92-?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=80=BC=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=88=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E=E6=9C=AA=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=95=B0=E9=87=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/plan/PlanForm.vue | 42 ++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index 91182959..61433502 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -188,6 +188,7 @@ const taskList = ref<TaskVO[]>([]) // 用户列表
 const taskDetailList = ref<TaskDetailVO[]>([]) // 用户列表
 const deviceSelectDialogRef = ref()
 const selectedDeviceRows = ref<DeviceLedgerVO[]>([])
+const maxUnplannedNumber = ref<number | undefined>(undefined)
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -306,10 +307,45 @@ const validatePlanEndTime = (_rule: any, value: any, callback: (error?: Error) =
   }
   callback()
 }
+const getSelectedTaskDetailUnplanned = () => {
+  const detail = taskDetailList.value.find(
+    (item: any) => Number(item.id) === Number(formData.value.taskDetailId)
+  ) as any
+  if (!detail) return undefined
+  const total = Number(detail.number)
+  const planned = Number(detail.planNumber)
+  if (!Number.isFinite(total) || !Number.isFinite(planned)) return undefined
+  return Math.max(total - planned, 0)
+}
+const getPlanNumberLimit = () => {
+  const detailUnplanned = getSelectedTaskDetailUnplanned()
+  if (detailUnplanned !== undefined) return detailUnplanned
+  return maxUnplannedNumber.value
+}
+const validatePlanNumber = (_rule: any, value: any, callback: (error?: Error) => void) => {
+  if (value === undefined || value === null || value === '') {
+    callback()
+    return
+  }
+  const currentPlanNumber = Number(value)
+  if (!Number.isFinite(currentPlanNumber)) {
+    callback(new Error('计划数量必须为数字'))
+    return
+  }
+  const planNumberLimit = getPlanNumberLimit()
+  if (planNumberLimit !== undefined && currentPlanNumber > planNumberLimit) {
+    callback(new Error(`计划数量不能大于未计划数量(${planNumberLimit})`))
+    return
+  }
+  callback()
+}
 const formRules = reactive({
   taskDetailId: [{ required: true, message: t('ProductionPlan.Plan.validatorTaskDetailRequired'), trigger: 'blur' }],
   taskId: [{ required: true, message: t('ProductionPlan.Plan.validatorTaskRequired'), trigger: 'blur' }],
-  planNumber: [{ required: true, message: t('ProductionPlan.Plan.validatorPlanNumberRequired'), trigger: 'blur' }],
+  planNumber: [
+    { required: true, message: t('ProductionPlan.Plan.validatorPlanNumberRequired'), trigger: 'blur' },
+    { validator: validatePlanNumber, trigger: ['blur', 'change'] }
+  ],
   // reyaNumber: [{ required: true, message: t('ProductionPlan.Plan.validatorReyaNumberRequired'), trigger: 'blur' }],
   planStartTime: [
     { required: true, message: t('ProductionPlan.Plan.validatorPlanStartRequired'), trigger: 'blur' },
@@ -374,6 +410,7 @@ const open = async (type: string, id?: number,
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  maxUnplannedNumber.value = number !== undefined ? Math.max(Number(number), 0) : undefined
   formData.value.deliveryDate = taskDeliveryDate || undefined
   if(taskId) {
    formData.value.taskId = taskId
@@ -465,6 +502,7 @@ const resetForm = () => {
       finishDate: undefined,
       deliveryDate: undefined
   }
+  maxUnplannedNumber.value = undefined
   selectedDeviceRows.value = []
   formRef.value?.resetFields()
 }
@@ -474,10 +512,12 @@ const handleTaskChange = async() => {
   taskDetailList.value =await TaskApi.getTaskDetailListByTaskId(formData.value.taskId)
   formData.value.taskDetailId = undefined
   formData.value.finishDate = undefined
+  formRef.value?.validateField('planNumber')
 }
 /** 明细变化 */
 const handleTaskDetailChange = async() => {
   syncFinishDateByTaskDetail()
+  formRef.value?.validateField('planNumber')
 }
 const handlePlanStartTimeChange = () => {
   formRef.value?.validateField(['planStartTime', 'planEndTime'])

From 159b24755f3e2eb6594bf305108184bde8ba5698 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 10:31:06 +0800
Subject: [PATCH 3/9] =?UTF-8?q?style=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=88=B6?=
 =?UTF-8?q?=E5=8D=95-tabs=E9=A1=B9=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en.ts            | 5 +++++
 src/locales/zh-CN.ts         | 5 +++++
 src/views/mes/task/index.vue | 8 ++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/locales/en.ts b/src/locales/en.ts
index 1cd31433..7d9cae55 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3398,6 +3398,10 @@ export default {
 
       tabAllLabel: 'All',
       tabIssuedLabel: 'Issued',
+      tabPartialSchedulingLabel: 'Partial Scheduling',
+      tabPendingProductionLabel: 'Pending Production',
+      tabInProductionLabel: 'In Production',
+      tabCompletedLabel: 'Completed',
       tabPlanLabel: 'Planned',
       tabStartLabel: 'Started',
       tabFinishedLabel: 'Finished',
@@ -3408,6 +3412,7 @@ export default {
       tableDeliveryDateColumn: 'Delivery Date',
       tableStatusColumn: 'Status',
       tableScheduleCompletedColumn: 'Schedule Completed',
+      tableProductionProgressColumn: 'Production Progress',
       tableRemarkColumn: 'Remark',
       tableOperateColumn: 'Operate',
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index fed55e5d..ca09da25 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -3244,6 +3244,10 @@ export default {
 
       tabAllLabel: '所有',
       tabIssuedLabel: '下达',
+      tabPartialSchedulingLabel: '部分排产',
+      tabPendingProductionLabel: '待生产',
+      tabInProductionLabel: '生产中',
+      tabCompletedLabel: '已完成',
       tabPlanLabel: '计划',
       tabStartLabel: '开工',
       tabFinishedLabel: '完工',
@@ -3254,6 +3258,7 @@ export default {
       tableDeliveryDateColumn: '交货日期',
       tableStatusColumn: '状态',
       tableScheduleCompletedColumn: '是否完成排产',
+      tableProductionProgressColumn: '生产进度',
       tableRemarkColumn: '备注',
       tableOperateColumn: '操作',
 
diff --git a/src/views/mes/task/index.vue b/src/views/mes/task/index.vue
index d15fdc8e..187ba439 100644
--- a/src/views/mes/task/index.vue
+++ b/src/views/mes/task/index.vue
@@ -94,10 +94,10 @@
       <el-tab-pane :label="t('ProductionPlan.Task.tabDraftLabel')" name="0" />
       <el-tab-pane :label="t('ProductionPlan.Task.tabSubmitLabel')" name="1" />
       <el-tab-pane :label="t('ProductionPlan.Task.tabIssuedLabel')" name="2" />
-      <el-tab-pane :label="t('ProductionPlan.Task.tabPlanLabel')" name="3" />
-      <el-tab-pane :label="t('ProductionPlan.Task.tabStartLabel')" name="4" />
-      <el-tab-pane :label="t('ProductionPlan.Task.tabFinishedLabel')" name="5" />
-      <el-tab-pane :label="t('ProductionPlan.Task.tabStoredLabel')" name="6" />
+    <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabPartialSchedulingLabel')" name="7" />
+      <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabPendingProductionLabel')" name="8" />
+      <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabInProductionLabel')" name="9" />
+      <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabCompletedLabel')" name="10" />
     </el-tabs>
     <el-table
       v-loading="loading"

From 41cacd4d1dc671eadd464e9b2add7f98833ab45a Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 10:34:32 +0800
Subject: [PATCH 4/9] =?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=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/tasksummary/index.vue | 54 ++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/views/mes/tasksummary/index.vue b/src/views/mes/tasksummary/index.vue
index fe250da1..59d7ff77 100644
--- a/src/views/mes/tasksummary/index.vue
+++ b/src/views/mes/tasksummary/index.vue
@@ -58,10 +58,10 @@ v-model="queryParams.createTime" @change="handleQuery" value-format="YYYY-MM-DD
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabAllLabel')" name="" />
       <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabIssuedLabel')" name="2" />
-      <el-tab-pane label="部分排产" name="7" />
-      <el-tab-pane label="待生产" name="8" />
-      <el-tab-pane label="生产中" name="9" />
-      <el-tab-pane label="已完成" name="10" />
+      <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabPartialSchedulingLabel')" name="7" />
+      <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabPendingProductionLabel')" name="8" />
+      <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabInProductionLabel')" name="9" />
+      <el-tab-pane :label="t('ProductionPlan.TaskSummary.tabCompletedLabel')" name="10" />
     </el-tabs>
     <el-table
 v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" highlight-current-row
@@ -85,6 +85,19 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" hi
           <el-tag :type="scope.row.isScheduled ? 'success' : 'info'">{{ scope.row.isScheduled ? '是' : '否' }}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column :label="t('ProductionPlan.TaskSummary.tableProductionProgressColumn')" align="center" min-width="180px">
+        <template #default="scope">
+          <div class="production-progress-cell">
+            <el-progress
+              :percentage="getProductionProgressPercent(scope.row)"
+              :show-text="false"
+              :stroke-width="12"
+              class="production-progress-bar"
+            />
+            <span class="production-progress-text">{{ getProductionProgressText(scope.row) }}</span>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column :label="t('ProductionPlan.TaskSummary.tableRemarkColumn')" align="center" prop="remark" />
 
       <el-table-column :label="t('ProductionPlan.TaskSummary.tableOperateColumn')" align="center" min-width="200px">
@@ -162,6 +175,19 @@ const deliveryDateFormatter = (_row: any, _column: any, value: any) => {
   if (value) return dateFormatter2(_row, _column, value)
   return dateFormatter2(_row, _column, _row?.finishDate)
 }
+const getProductionProgressPercent = (row: any) => {
+  const storedPlanNumber = Number(row?.storedPlanNumber ?? 0)
+  const totalNumber = Number(row?.totalNumber ?? row?.number ?? 0)
+  if (!Number.isFinite(storedPlanNumber) || !Number.isFinite(totalNumber) || totalNumber <= 0) return 0
+  const rawPercent = (storedPlanNumber / totalNumber) * 100
+  return Math.max(0, Math.min(100, Number(rawPercent.toFixed(2))))
+}
+const getProductionProgressText = (row: any) => {
+  const storedPlanNumber = Number(row?.storedPlanNumber ?? 0)
+  const totalNumber = Number(row?.totalNumber ?? row?.number ?? 0)
+  if (!Number.isFinite(storedPlanNumber) || !Number.isFinite(totalNumber) || totalNumber <= 0) return '0/0'
+  return `${storedPlanNumber}/${totalNumber}`
+}
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -241,3 +267,23 @@ const handleTabClick = (tab: TabsPaneContext) => {
   handleQuery()
 }
 </script>
+
+<style scoped>
+.production-progress-cell {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+}
+
+.production-progress-bar {
+  width: 180px;
+}
+
+.production-progress-text {
+  min-width: 92px;
+  text-align: left;
+  font-variant-numeric: tabular-nums;
+  color: var(--el-text-color-regular);
+}
+</style>

From b452e320ef1f81d4f6b477255930ad8505d29d7b Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 10:58:06 +0800
Subject: [PATCH 5/9] =?UTF-8?q?style=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=88=B6?=
 =?UTF-8?q?=E5=8D=95-=E6=96=B0=E5=A2=9E-=E4=BA=A4=E8=B4=A7=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=B8=8D=E8=83=BD=E9=80=89=E5=BE=80=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/task/TaskForm.vue               | 22 ++++++++++++++++++-
 .../mes/task/components/TaskDetailForm.vue    | 20 ++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/task/TaskForm.vue b/src/views/mes/task/TaskForm.vue
index 8eafd6e8..d4b78df9 100644
--- a/src/views/mes/task/TaskForm.vue
+++ b/src/views/mes/task/TaskForm.vue
@@ -39,6 +39,7 @@
           v-model="formData.deliveryDate"
           type="date"
           value-format="x"
+          :disabled-date="disablePastDate"
           :placeholder="t('ProductionPlan.Task.dialogDeliveryDatePlaceholder')"
           class="!w-full"
         />
@@ -107,8 +108,27 @@ const formData = ref({
   isEnable: undefined,
   isCode: undefined
 })
+const disablePastDate = (date: Date) => {
+  return date.getTime() < new Date(new Date().setHours(0, 0, 0, 0)).getTime()
+}
+const validateDeliveryDate = (_rule: any, value: any, callback: (error?: Error) => void) => {
+  if (!value) {
+    callback()
+    return
+  }
+  const selected = Number(value)
+  const todayStart = new Date(new Date().setHours(0, 0, 0, 0)).getTime()
+  if (Number.isFinite(selected) && selected < todayStart) {
+    callback(new Error('交货日期不能早于今天'))
+    return
+  }
+  callback()
+}
 const formRules = reactive({
-  deliveryDate: [{ required: true, message: t('ProductionPlan.Task.validatorDeliveryDateRequired'), trigger: 'blur' }],
+  deliveryDate: [
+    { required: true, message: t('ProductionPlan.Task.validatorDeliveryDateRequired'), trigger: 'blur' },
+    { validator: validateDeliveryDate, trigger: ['change', 'blur'] }
+  ],
   taskType: [{ required: true, message: t('ProductionPlan.Task.validatorTaskTypeRequired'), trigger: 'blur' }],
   isUrgent: [{ required: true, message: t('ProductionPlan.Task.validatorIsUrgentRequired'), trigger: 'change' }]
 })
diff --git a/src/views/mes/task/components/TaskDetailForm.vue b/src/views/mes/task/components/TaskDetailForm.vue
index 55836d0c..bd65e5ea 100644
--- a/src/views/mes/task/components/TaskDetailForm.vue
+++ b/src/views/mes/task/components/TaskDetailForm.vue
@@ -89,6 +89,7 @@
               v-model="formData.finishDate"
               type="date"
               value-format="x"
+              :disabled-date="disablePastDate"
               :placeholder="t('ProductionPlan.Task.detailFormDeliveryDatePlaceholder')"
             />
           </el-form-item>
@@ -158,12 +159,29 @@ const formData = ref({
   boxingDate: undefined,
   arriveDate: undefined,
 })
+const disablePastDate = (date: Date) => {
+  return date.getTime() < new Date(new Date().setHours(0, 0, 0, 0)).getTime()
+}
+const validateFinishDate = (_rule: any, value: any, callback: (error?: Error) => void) => {
+  if (!value) {
+    callback()
+    return
+  }
+  const selected = Number(value)
+  const todayStart = new Date(new Date().setHours(0, 0, 0, 0)).getTime()
+  if (Number.isFinite(selected) && selected < todayStart) {
+    callback(new Error('交货日期不能早于今天'))
+    return
+  }
+  callback()
+}
 const formRules = reactive({
   productId: [{ required: true, message: t('ProductionPlan.Task.validatorDetailProductIdRequired'), trigger: 'blur' }],
   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: [{ required: true, message: t('ProductionPlan.Task.validatorDetailPackageSizeRequired'), trigger: 'blur' }],
+  finishDate: [{ validator: validateFinishDate, trigger: ['change', 'blur'] }]
 })
 const formRef = ref() // 表单 Ref
 

From 02ba88a454bf2ff6d6208080462d99bdde09d39e Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 14:09:32 +0800
Subject: [PATCH 6/9] =?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=96=B0=E5=A2=9E-=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E3=80=81=E8=AE=A1=E5=88=92=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E3=80=81=E6=9C=80=E6=99=9A=E5=BC=80=E5=B7=A5=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/plan/PlanForm.vue              | 20 +++-----------------
 src/views/mes/plan/components/PlanDetail.vue |  4 ++--
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index 61433502..7f1ab8c4 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -99,24 +99,13 @@
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanNumberLabel')" prop="planNumber">
         <el-input v-model="formData.planNumber"  />
       </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Plan.dialogPreProductionLabel')" prop="isPreProduction">
-        <el-radio-group v-model="formData.isPreProduction">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRE_PRODUCTION)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
       <!-- <el-form-item label="热压数量" prop="reyaNumber">
         <el-input v-model="formData.reyaNumber" />
       </el-form-item> -->
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanStartLabel')" prop="planStartTime">
         <el-date-picker
           v-model="formData.planStartTime"
-          type="date"
+          type="datetime"
           value-format="x"
           :placeholder="t('ProductionPlan.Plan.dialogPlanStartPlaceholder')"
           class="!w-full"
@@ -126,7 +115,7 @@
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanEndLabel')" prop="planEndTime">
         <el-date-picker
           v-model="formData.planEndTime"
-          type="date"
+          type="datetime"
           value-format="x"
           :placeholder="t('ProductionPlan.Plan.dialogPlanEndPlaceholder')"
           class="!w-full"
@@ -136,7 +125,7 @@
       <el-form-item label="最晚开工时间" prop="latestStartTime">
         <el-date-picker
           v-model="formData.latestStartTime"
-          type="date"
+          type="datetime"
           value-format="x"
           :disabled-date="latestStartDisabledDate"
           placeholder="请选择最晚开工时间"
@@ -180,7 +169,6 @@ import { PlanApi, PlanVO } from '@/api/mes/plan'
 import { TaskApi, TaskDetailVO, TaskVO } from '@/api/mes/task'
 import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
 import TableSelectDialog from '@/components/TableSelectDialog/TableSelectDialog.vue'
-import { DICT_TYPE, getIntDictOptions } from "@/utils/dict";
 
 /** 生产计划 表单 */
 defineOptions({ name: 'PlanForm' })
@@ -218,7 +206,6 @@ const formData = ref({
   deviceId: undefined,
   deviceName: undefined,
   workerId: undefined,
-  isPreProduction: undefined,
   isCode: undefined,
   latestStartTime: undefined,
   finishDate: undefined,
@@ -356,7 +343,6 @@ const formRules = reactive({
     { validator: validatePlanEndTime, trigger: 'change' }
   ],
   deviceId: [{ required: true, message: '请选择设备', trigger: 'change' }],
-  isPreProduction: [{ required: true, message: t('ProductionPlan.Plan.validatorPreProductionRequired'), trigger: 'blur' }],
   latestStartTime: [
     { required: true, message: '请选择最晚开工时间', trigger: 'blur' },
     { validator: validateLatestStartTime, trigger: 'change' }
diff --git a/src/views/mes/plan/components/PlanDetail.vue b/src/views/mes/plan/components/PlanDetail.vue
index a54004ce..173256d3 100644
--- a/src/views/mes/plan/components/PlanDetail.vue
+++ b/src/views/mes/plan/components/PlanDetail.vue
@@ -55,7 +55,7 @@
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanNumberLabel')" prop="planNumber">
         <el-input disabled v-model="formData.planNumber" />
       </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Plan.dialogPreProductionLabel')" prop="isPreProduction">
+      <!-- <el-form-item :label="t('ProductionPlan.Plan.dialogPreProductionLabel')" prop="isPreProduction">
         <el-radio-group disabled v-model="formData.isPreProduction">
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRE_PRODUCTION)"
@@ -65,7 +65,7 @@
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="t('ProductionPlan.Plan.dialogPlanStartLabel')" prop="planStartTime">
         <el-date-picker
           disabled

From 824e5e77d9371006bb5d3f5fa96c136282ecb557 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 15:58:50 +0800
Subject: [PATCH 7/9] =?UTF-8?q?style=EF=BC=9A=E7=94=98=E7=89=B9=E5=9B=BE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/components/ScheduleGanttPanel.vue     | 225 +++++++++++++++---
 1 file changed, 191 insertions(+), 34 deletions(-)

diff --git a/src/views/mes/components/ScheduleGanttPanel.vue b/src/views/mes/components/ScheduleGanttPanel.vue
index bb19e14c..b6f96de6 100644
--- a/src/views/mes/components/ScheduleGanttPanel.vue
+++ b/src/views/mes/components/ScheduleGanttPanel.vue
@@ -3,31 +3,33 @@
     <div ref="ganttContainerRef" class="schedule-gantt-container" :style="{ height }"></div>
     <div class="schedule-detail-panel">
       <div class="schedule-detail-title">计划信息</div>
-      <el-descriptions :column="1" border size="small" v-if="activePreviewDevice">
-        <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 label="计划条数">{{ activePreviewDevice.plans?.length ?? 0 }}</el-descriptions-item>
-      </el-descriptions>
-      <el-empty v-else description="暂无计划信息" :image-size="80" />
-      <div class="schedule-plan-list-title">计划明细</div>
-      <div class="schedule-plan-list">
-        <div
-          v-for="(plan, index) in 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>
+      <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 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>计划编码：{{ 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>
 
@@ -56,6 +58,24 @@
       <el-button type="primary" @click="handleTaskAdjustSubmit">确定</el-button>
     </template>
   </el-dialog>
+
+  <el-dialog v-if="props.editable" 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">
@@ -80,6 +100,11 @@ const props = withDefaults(
 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)
@@ -225,6 +250,8 @@ const cleanupTaskTooltips = () => {
     node.style.visibility = 'hidden'
     node.style.opacity = '0'
   }
+  tooltipCleanupFns.value.forEach((fn) => fn())
+  tooltipCleanupFns.value = []
 }
 
 const destroyGantt = () => {
@@ -315,7 +342,28 @@ 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?.()
@@ -327,6 +375,7 @@ const initTaskTooltips = () => {
       node.style.pointerEvents = 'none'
     }
   }
+
   tooltipsExt.detach('.gantt_task_line')
   tooltipsExt.detach('.gantt_task_content')
   tooltipsExt.attach({
@@ -342,7 +391,38 @@ const initTaskTooltips = () => {
       showTooltip(event, buildTaskTooltipHtml(task))
     },
     onmouseleave: () => {
-      tooltip.hide()
+      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
     }
   })
 }
@@ -359,6 +439,9 @@ const syncPlanTimeFromTask = (task: any) => {
   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) => {
@@ -515,6 +598,39 @@ const handleTaskAdjustSubmit = () => {
   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
@@ -546,10 +662,11 @@ const initGanttPreview = () => {
   destroyGantt()
   if (!previewScheduleList.value.length) {
     activePreviewDevice.value = undefined
+    activePreviewTask.value = undefined
     return
   }
 
-  gantt.plugins({ tooltip: true })
+  gantt.plugins({ tooltip: true, inline_edit: true,undo: true })
   gantt.config.readonly = !props.editable
   gantt.config.drag_move = !!props.editable
   gantt.config.drag_links = false
@@ -579,12 +696,8 @@ const initGanttPreview = () => {
       width: 210,
       template: (task: any) =>
         props.editable && task?._planData && String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT'
-          ? `<span class="gantt-inline-editor-trigger" data-field="start_date">${formatGridDateText(task.start_date)}</span>`
-          : formatGridDateText(task.start_date),
-      editor: {
-        type: 'date',
-        map_to: 'start_date'
-      }
+          ? `<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',
@@ -617,6 +730,7 @@ const initGanttPreview = () => {
   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)
@@ -625,18 +739,39 @@ const initGanttPreview = () => {
 
   if (ganttData.data.length) {
     activePreviewDevice.value = ganttData.data[0]._deviceData
-    gantt.showDate(gantt.config.start_date)
+    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)
-    activePreviewDevice.value = task?._deviceData
+    if (task?._planData) {
+      activePreviewTask.value = task._planData
+      activePreviewDevice.value = task._deviceData
+    } else {
+      activePreviewTask.value = undefined
+      activePreviewDevice.value = task?._deviceData
+    }
     if (!props.editable) return true
     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 (field && task?._planData && String(task?._planData?.sourceType ?? '').toUpperCase() === 'CURRENT' && inlineEditors?.startEdit) {
+    if (inlineEditors?.startEdit) {
       inlineEditors.startEdit(id, field)
       return false
     }
@@ -644,6 +779,28 @@ const initGanttPreview = () => {
   })
   ganttEventIds.value.push(clickEventId)
 
+  if (props.editable && 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)
+    })
+  }
+
   if (!props.editable) return
 
   const beforeDragEventId = gantt.attachEvent('onBeforeTaskDrag', (id) => {

From 6fc887d9f2ffc05303ba8f7aa816ed959cd69633 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 16:18:40 +0800
Subject: [PATCH 8/9] =?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=E9=A1=B5=E6=B7=BB=E5=8A=A0=E6=AF=8F=E6=97=A5?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=B9=B3=E5=9D=87=E5=80=BC=E3=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=87=87=E9=9B=86=E4=BA=A7=E8=83=BD=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/mes/components/ScheduleGanttPanel.vue b/src/views/mes/components/ScheduleGanttPanel.vue
index b6f96de6..e5476e2e 100644
--- a/src/views/mes/components/ScheduleGanttPanel.vue
+++ b/src/views/mes/components/ScheduleGanttPanel.vue
@@ -8,6 +8,8 @@
           <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>

From a99abc9e0170be21b32a2aa3611555fe4e23c233 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 15 Apr 2026 16:38:03 +0800
Subject: [PATCH 9/9] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/baogongrecord/index.ts       |  33 +++-
 src/locales/en.ts                        |  27 +++
 src/locales/zh-CN.ts                     |  26 +++
 src/views/mes/workReportRecord/index.vue | 224 +++++++++++++++++++++++
 4 files changed, 309 insertions(+), 1 deletion(-)
 create mode 100644 src/views/mes/workReportRecord/index.vue

diff --git a/src/api/mes/baogongrecord/index.ts b/src/api/mes/baogongrecord/index.ts
index 5581889a..6e7fb98d 100644
--- a/src/api/mes/baogongrecord/index.ts
+++ b/src/api/mes/baogongrecord/index.ts
@@ -3,11 +3,28 @@ import request from '@/config/axios'
 // 报工 VO
 export interface BaogongRecordVO {
   id: number // id
-  planId: number // 关联计划id
+  planId: number // 关联计划 id
   num: number // 派工数量
   baogongTime: Date // 派工时间
 }
 
+// 报工统计 VO
+export interface BaogongRecordStatVO {
+  id: number // ID
+  taskCode: string // 任务单编码
+  planCode: string // 计划单编码
+  employeeId: string // 员工 ID
+  employeeName: string // 员工姓名
+  productName: string // 产品名称
+  productCode: string // 产品编码
+  baogongNum: number // 报工数量
+  passNum: number // 合格数量
+  noPassNum: number // 不合格数量
+  passRate: number // 合格率 (%)
+  reason: string // 原因
+  baogongTime: Date // 报工时间
+}
+
 // 报工 API
 export const BaogongRecordApi = {
   // 查询报工分页
@@ -15,6 +32,11 @@ export const BaogongRecordApi = {
     return await request.get({ url: `/mes/baogong-record/page`, params })
   },
 
+  // 查询报工统计分页
+  getBaogongRecordStatPage: async (params: any) => {
+    return await request.get({ url: `/mes/baogong-record/stat-page`, params })
+  },
+
   // 查询报工详情
   getBaogongRecord: async (id: number) => {
     return await request.get({ url: `/mes/baogong-record/get?id=` + id })
@@ -40,4 +62,13 @@ export const BaogongRecordApi = {
     return await request.download({ url: `/mes/baogong-record/export-excel`, params })
   },
 
+  // 导出报工统计 Excel
+  exportBaogongRecordStat: async (params) => {
+    return await request.download({ url: `/mes/baogong-record/export-stat-excel`, params })
+  },
+
+  // 导出报工统计 Excel (新)
+  statExportExcel: async (params) => {
+    return await request.download({ url: `/mes/baogong-record/stat-export-excel`, params })
+  },
 }
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 7d9cae55..22386e12 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3836,6 +3836,33 @@ export default {
       actionDeleteLabel: 'Delete',
 
       exportFilename: 'FormingRecord.xls'
+    },
+    
+    WorkReportRecord: {
+      moduleName: 'Work Report Record',
+
+      searchBaogongTimeLabel: 'Report Date',
+      searchBaogongTimeStartPlaceholder: 'Start Date',
+      searchBaogongTimeEndPlaceholder: 'End Date',
+
+      buttonSearchText: 'Search',
+      buttonResetText: 'Reset',
+      buttonExportText: 'Export',
+
+      tableTaskCodeColumn: 'Task Code',
+      tablePlanCodeColumn: 'Plan Code',
+      tableEmployeeIdColumn: 'Employee ID',
+      tableEmployeeNameColumn: 'Employee Name',
+      tableProductNameColumn: 'Product Name',
+      tableProductCodeColumn: 'Product Code',
+      tableBaogongNumColumn: 'Report Quantity',
+      tablePassNumColumn: 'Pass Quantity',
+      tableNoPassNumColumn: 'No-Pass Quantity',
+      tablePassRateColumn: 'Pass Rate(%)',
+      tableReasonColumn: 'Reason',
+      tableBaogongTimeColumn: 'Report Time',
+
+      exportFilename: 'Employee Work Report Statistics.xls'
     }
   },
   DataCollection: {
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index ca09da25..cc40ad33 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -3682,6 +3682,32 @@ export default {
       actionDeleteLabel: '删除',
 
       exportFilename: '成型记录.xls'
+    },
+     WorkReportRecord: {
+      moduleName: '报工记录',
+
+      searchBaogongTimeLabel: '报工日期',
+      searchBaogongTimeStartPlaceholder: '开始日期',
+      searchBaogongTimeEndPlaceholder: '结束日期',
+
+      buttonSearchText: '搜索',
+      buttonResetText: '重置',
+      buttonExportText: '导出',
+
+      tableTaskCodeColumn: '任务单编码',
+      tablePlanCodeColumn: '计划单编码',
+      tableEmployeeIdColumn: '员工 ID',
+      tableEmployeeNameColumn: '员工姓名',
+      tableProductNameColumn: '产品名称',
+      tableProductCodeColumn: '产品编码',
+      tableBaogongNumColumn: '报工数量',
+      tablePassNumColumn: '合格数量',
+      tableNoPassNumColumn: '不合格数量',
+      tablePassRateColumn: '合格率 (%)',
+      tableReasonColumn: '原因',
+      tableBaogongTimeColumn: '报工时间',
+
+      exportFilename: '员工报工统计.xls'
     }
   },
   DataCollection: {
diff --git a/src/views/mes/workReportRecord/index.vue b/src/views/mes/workReportRecord/index.vue
new file mode 100644
index 00000000..dd27ac07
--- /dev/null
+++ b/src/views/mes/workReportRecord/index.vue
@@ -0,0 +1,224 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item :label="t('ProductionPlan.WorkReportRecord.searchBaogongTimeLabel')" prop="baogongTime">
+        <el-date-picker
+          v-model="queryParams.baogongTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          :start-placeholder="t('ProductionPlan.WorkReportRecord.searchBaogongTimeStartPlaceholder')"
+          :end-placeholder="t('ProductionPlan.WorkReportRecord.searchBaogongTimeEndPlaceholder')"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          :shortcuts="dateShortcuts"
+          class="!w-240px"
+          @change="handleDateChange"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> {{ t('ProductionPlan.WorkReportRecord.buttonSearchText') }}</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> {{ t('ProductionPlan.WorkReportRecord.buttonResetText') }}</el-button>
+
+        <el-button
+          type="success"
+          plain
+          @click="handleStatExport"
+          :loading="statExportLoading"
+          v-hasPermi="['mes:baogong-record:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableTaskCodeColumn')" align="center" prop="taskCode" min-width="120px" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tablePlanCodeColumn')" align="center" prop="planCode" min-width="120px" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableEmployeeIdColumn')" align="center" prop="employeeId" min-width="100px" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableEmployeeNameColumn')" align="center" prop="employeeName" min-width="100px" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableProductNameColumn')" align="center" prop="productName" min-width="120px" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableProductCodeColumn')" align="center" prop="productCode" min-width="100px" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableBaogongNumColumn')" align="center" prop="baogongNum" min-width="100px" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tablePassNumColumn')" align="center" prop="passNum" min-width="100px" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableNoPassNumColumn')" align="center" prop="noPassNum" min-width="100px" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tablePassRateColumn')" align="center" prop="passRate" min-width="100px" :formatter="formatPassRate" sortable />
+      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableReasonColumn')" align="center" prop="reason" min-width="150px" show-overflow-tooltip />
+      <el-table-column
+        :label="t('ProductionPlan.WorkReportRecord.tableBaogongTimeColumn')"
+        align="center"
+        prop="baogongTime"
+        :formatter="dateFormatter"
+        width="180px"
+        sortable
+      />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { BaogongRecordApi, BaogongRecordStatVO } from '@/api/mes/baogongrecord'
+
+/** 报工记录统计 列表 */
+defineOptions({ name: 'WorkReportRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<BaogongRecordStatVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const selectedIds = ref<(string | number)[]>([])
+
+// 日期快捷按钮
+const dateShortcuts = [
+  {
+    text: '今日',
+    value: () => {
+      const start = new Date()
+      start.setHours(0, 0, 0, 0)
+      const end = new Date()
+      end.setHours(23, 59, 59, 999)
+      return [start, end]
+    }
+  },
+  {
+    text: '近七日',
+    value: () => {
+      const end = new Date()
+      end.setHours(23, 59, 59, 999)
+      const start = new Date()
+      start.setDate(start.getDate() - 6)
+      start.setHours(0, 0, 0, 0)
+      return [start, end]
+    }
+  },
+  {
+    text: '近三十日',
+    value: () => {
+      const end = new Date()
+      end.setHours(23, 59, 59, 999)
+      const start = new Date()
+      start.setDate(start.getDate() - 29)
+      start.setHours(0, 0, 0, 0)
+      return [start, end]
+    }
+  }
+]
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  beginBaogongTime: undefined,
+  endBaogongTime: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const statExportLoading = ref(false)
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await BaogongRecordApi.getBaogongRecordStatPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  queryParams.beginBaogongTime = undefined
+  queryParams.endBaogongTime = undefined
+  handleQuery()
+}
+
+/** 日期选择变化处理 */
+const handleDateChange = (value: any) => {
+  if (value && Array.isArray(value) && value.length === 2) {
+    queryParams.beginBaogongTime = value[0]
+    queryParams.endBaogongTime = value[1]
+  } else {
+    queryParams.beginBaogongTime = undefined
+    queryParams.endBaogongTime = undefined
+  }
+  handleQuery()
+}
+
+/** 合格率格式化 */
+const formatPassRate = (row: BaogongRecordStatVO) => {
+  if (row.passRate === null || row.passRate === undefined) return ''
+  return row.passRate + '%'
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const data = await BaogongRecordApi.exportBaogongRecordStat(queryParams)
+    download.excel(data, t('ProductionPlan.WorkReportRecord.exportFilename'))
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 多选变化 */
+const handleSelectionChange = (selection: BaogongRecordStatVO[]) => {
+  selectedIds.value = selection
+    .map((item) => item.id)
+    .filter((id): id is string | number => id !== undefined && id !== null && id !== '')
+}
+
+/** 统计导出按钮操作 */
+const handleStatExport = async () => {
+  try {
+    await message.exportConfirm()
+    statExportLoading.value = true
+    const params: any = { ...queryParams }
+    if (selectedIds.value.length > 0) {
+      params.ids = selectedIds.value.join(',')
+    }
+    const data = await BaogongRecordApi.statExportExcel(params)
+    download.excel(data, t('ProductionPlan.WorkReportRecord.exportFilename'))
+  } catch {
+  } finally {
+    statExportLoading.value = false
+  }
+}
+
+// 初始化加载
+onMounted(async () => {
+  await getList()
+})
+</script>
+
+<style lang="scss" scoped>
+</style>