From cbe64d102b1a8166d516e4952d754214a45f664a Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Wed, 1 Jan 2020 20:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/ActualWorkQuery/index.vue    | 2 +-
 src/views/ManufacturingCenter/ManHourStatistics/index.vue  | 6 +++---
 .../ScheduleCompletionDetails/index.vue                    | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
index ae8aa405..8ffe0043 100644
--- a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
+++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
@@ -48,7 +48,7 @@
         </el-table-column>
         <el-table-column label="实际工时" align="center" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.实际加工时间段 || '—' }}
+            {{ scope.row.设备工时 || '—' }}
           </template>
         </el-table-column>
         <el-table-column label="计划工时" prop="理论加工时间段" align="center" width="100px">
diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
index b7384daa..debedd5e 100644
--- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue
+++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
@@ -33,9 +33,9 @@
             {{ scope.row.理论加工时间段 }}
           </template>
         </el-table-column>
-        <el-table-column label="加工工时" align="center">
+        <el-table-column label="实际工时" align="center">
           <template slot-scope="scope">
-            {{ scope.row.实际加工时间段 }}
+            {{ scope.row.设备工时 }}
           </template>
         </el-table-column>
         <el-table-column label="比例" align="center">
@@ -175,7 +175,7 @@ export default {
       }
       searchtable(this.workerName_ckeck, this.workerName, this.timeCheck, this.startTime, this.endTime).then(response => {
         response.data.map(v => {
-          this.$set(v, '比例', v.理论加工时间段 === 0 ? 0 : Math.round(v.实际加工时间段 / v.理论加工时间段 * 100) / 100.00)
+          this.$set(v, '比例', v.理论加工时间段 === 0 ? 0 : Math.round(v.设备工时 / v.理论加工时间段 * 100) / 100.00)
         })
         this.tableData = response.data
         this.loading = false
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index f2a4a0ce..aa2f6807 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -45,9 +45,9 @@
                 {{ scope.row.理论加工时间段 }}
               </template>
             </el-table-column>
-            <el-table-column label="加工工时" align="center" width="70px">
+            <el-table-column label="实际工时" align="center" width="70px">
               <template slot-scope="scope">
-                {{ scope.row.实际加工时间段 }}
+                {{ scope.row.设备工时 }}
               </template>
             </el-table-column>
             <el-table-column label="完成数量" align="center" width="70px">
@@ -106,7 +106,7 @@
             </el-table-column>
             <el-table-column label="加工工时" align="center" width="70px">
               <template slot-scope="scope">
-                {{ scope.row.实际加工时间段 }}
+                {{ scope.row.设备工时 ? scope.row.设备工时 : 0 }}
               </template>
             </el-table-column>
             <el-table-column label="加工开始" align="center" width="135px">
@@ -197,6 +197,7 @@ export default {
               工艺名称: response.data.rows[i].工艺名称,
               完成数量: response.data.rows[i].完成数量,
               质检结果: response.data.rows[i].质检结果,
+              设备工时: response.data.rows[i].设备工时,
               不合格数量: response.data.rows[i].不合格数量,
               理论加工时间段: response.data.rows[i].理论加工时间段,
               实际加工时间段: response.data.rows[i].实际加工时间段,