From 2848f31ce33b63486a483425778fedbe65458bbf Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Sun, 12 Oct 2025 19:28:05 +0800
Subject: [PATCH] =?UTF-8?q?change(mes):=20=E6=9B=B4=E6=96=B0=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E5=B7=A5=E6=97=B6=E5=88=97=E6=A0=87=E9=A2=98=E4=B8=BA?=
 =?UTF-8?q?=E6=80=BB=E5=85=B1=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将报工工时(h)列标题修改为总共时间(h)
- 在制数量列默认隐藏设置调整
- 统一多个视图中的列标题命名
---
 src/views/mes/reportWorkHour/index.vue    | 2 +-
 src/views/mes/reportWorkHour/index2.vue   | 2 +-
 src/views/mes/reportWorkHour/index3.vue   | 2 +-
 src/views/mes/wipTrackingReport/index.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/mes/reportWorkHour/index.vue b/src/views/mes/reportWorkHour/index.vue
index 1ecd7cc..c768cf7 100644
--- a/src/views/mes/reportWorkHour/index.vue
+++ b/src/views/mes/reportWorkHour/index.vue
@@ -74,7 +74,7 @@
         <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[4].visible" />
         <el-table-column label="报工数量" align="center" prop="completeAmount" v-if="columns[5].visible" />
         <el-table-column label="标准工时(h)" align="center" prop="standardWorkHour" v-if="columns[6].visible" />
-        <el-table-column label="报工工时(h)" align="center" prop="reportWorkHour" v-if="columns[7].visible" />
+        <el-table-column label="总共时间(h)" align="center" prop="reportWorkHour" v-if="columns[7].visible" />
         <el-table-column label="生产效率" align="center" prop="productionEfficiency" v-if="columns[8].visible" />
         <el-table-column label="派工单状态" align="center" prop="planStatus" v-if="columns[9].visible" >
           <template #default="scope">
diff --git a/src/views/mes/reportWorkHour/index2.vue b/src/views/mes/reportWorkHour/index2.vue
index c66cae0..93ae940 100644
--- a/src/views/mes/reportWorkHour/index2.vue
+++ b/src/views/mes/reportWorkHour/index2.vue
@@ -74,7 +74,7 @@
         <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[4].visible" />
         <el-table-column label="报工数量" align="center" prop="completeAmount" v-if="columns[5].visible" />
         <el-table-column label="标准工时(h)" align="center" prop="standardWorkHour" v-if="columns[6].visible" />
-        <el-table-column label="报工工时(h)" align="center" prop="reportWorkHour" v-if="columns[7].visible" />
+        <el-table-column label="总共时间(h)" align="center" prop="reportWorkHour" v-if="columns[7].visible" />
         <el-table-column label="生产效率" align="center" prop="productionEfficiency" v-if="columns[8].visible" />
         <el-table-column label="派工单状态" align="center" prop="planStatus" v-if="columns[9].visible" >
           <template #default="scope">
diff --git a/src/views/mes/reportWorkHour/index3.vue b/src/views/mes/reportWorkHour/index3.vue
index abf9aec..d8874d2 100644
--- a/src/views/mes/reportWorkHour/index3.vue
+++ b/src/views/mes/reportWorkHour/index3.vue
@@ -74,7 +74,7 @@
         <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[4].visible" />
         <el-table-column label="报工数量" align="center" prop="completeAmount" v-if="columns[5].visible" />
         <el-table-column label="标准工时(h)" align="center" prop="standardWorkHour" v-if="columns[6].visible" />
-        <el-table-column label="报工工时(h)" align="center" prop="reportWorkHour" v-if="columns[7].visible" />
+        <el-table-column label="总共时间(h)" align="center" prop="reportWorkHour" v-if="columns[7].visible" />
         <el-table-column label="生产效率" align="center" prop="productionEfficiency" v-if="columns[8].visible" />
         <el-table-column label="派工单状态" align="center" prop="planStatus" v-if="columns[9].visible" >
           <template #default="scope">
diff --git a/src/views/mes/wipTrackingReport/index.vue b/src/views/mes/wipTrackingReport/index.vue
index 65e16b9..9bb782a 100644
--- a/src/views/mes/wipTrackingReport/index.vue
+++ b/src/views/mes/wipTrackingReport/index.vue
@@ -230,7 +230,7 @@ const columns = ref([
   { key: 2, label: '物料名称', visible: true },
   { key: 3, label: '规格型号', visible: true },
   { key: 4, label: '计划总数量', visible: true },
-  { key: 5, label: '在制数量', visible: true },
+  { key: 5, label: '在制数量', visible: false },
   { key: 6, label: '已完成数量', visible: true },
   { key: 7, label: '计划开工时间', visible: true },
   { key: 8, label: '实际开工时间', visible: true },