From e366b2915b048f9d5d516c68e92885e1140d2e3c Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 11 Mar 2026 16:45:59 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E7=94=9F=E4=BA=A7=E6=8A=95?=
 =?UTF-8?q?=E6=96=99-=E6=B7=BB=E5=8A=A0=E5=AE=9E=E9=99=85/=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=8A=95=E6=96=99=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/locales/en.ts b/src/locales/en.ts
index 1b96242a..89223c1e 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -3293,7 +3293,7 @@ export default {
       tableWeightColumn: 'Quantity',
       tableUserColumn: 'Recorder',
       tableRemarkColumn: 'Remark',
-      tableFeedingTimeColumn: 'Feeding Time',
+      tableFeedingTimeColumn: 'Plan Feeding Time',
       tableOperateColumn: 'Operate',
 
       actionDeleteLabel: 'Delete',
@@ -3316,7 +3316,7 @@ export default {
       dialogProductPlaceholder: 'Please select product',
       dialogWeightLabel: 'Weight(kg)',
       dialogWeightPlaceholder: 'Please enter weight',
-      dialogFeedingTimeLabel: 'Feeding Time',
+      dialogFeedingTimeLabel: 'Plan Feeding Time',
       dialogFeedingTimePlaceholder: 'Select feeding time',
       dialogRemarkLabel: 'Remark',
       dialogRemarkPlaceholder: 'Please enter remark',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index b8edf39c..7a4b2f9d 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -3106,6 +3106,7 @@ export default {
     FeedingRecord: {
       moduleName: '生产投料',
       planCode: '生产计划',
+      actualFeedingTime: '实际投料时间',
       searchCodeLabel: '单号',
       searchCodePlaceholder: '请输入单号',
       searchPipelineLabel: '制浆线',
@@ -3136,7 +3137,7 @@ export default {
       tableWeightColumn: '数量',
       tableUserColumn: '记录人',
       tableRemarkColumn: '备注',
-      tableFeedingTimeColumn: '投料时间',
+      tableFeedingTimeColumn: '计划投料时间',
       tableOperateColumn: '操作',
 
       actionDeleteLabel: '删除',
@@ -3159,7 +3160,7 @@ export default {
       dialogProductPlaceholder: '请选择产品',
       dialogWeightLabel: '重量(kg)',
       dialogWeightPlaceholder: '请输入重量',
-      dialogFeedingTimeLabel: '投料时间',
+      dialogFeedingTimeLabel: '计划投料时间',
       dialogFeedingTimePlaceholder: '选择投料时间',
       dialogRemarkLabel: '备注',
       dialogRemarkPlaceholder: '请输入备注',
diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue
index 7a46257a..fd4a1f28 100644
--- a/src/views/mes/feedingrecord/FeedingRecordForm.vue
+++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue
@@ -113,7 +113,8 @@
       <el-form-item :label="t('ProductionPlan.FeedingRecord.dialogFeedingTimeLabel') + ':'" prop="feedingTime">
         <el-date-picker
           v-model="formData.feedingTime"
-          type="date"
+          type="datetime"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="x"
           :placeholder="t('ProductionPlan.FeedingRecord.dialogFeedingTimePlaceholder')"
           class="!w-full"
diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index ef623a23..b07fc5c2 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -117,6 +117,13 @@
           <dict-tag :type="DICT_TYPE.MES_FEEDING_RECORD_STATUS" :value="scope.row.recordStatus" />
         </template>
       </el-table-column>
+        <el-table-column
+        :label="t('ProductionPlan.FeedingRecord.actualFeedingTime')"
+        align="center"
+        prop="actualFeedingTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
       <el-table-column
         :label="t('ProductionPlan.FeedingRecord.tableFeedingTimeColumn')"
         align="center"