From 1b42820f7fca20bb4d617b0bef309534878c5f73 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 13 Mar 2020 13:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=95=E5=B7=A5=E6=97=B6=E5=96=9D?=
 =?UTF-8?q?=E6=B0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContractDetailsInquiry/index.vue          | 20 +++----
 .../MonthEndHourAccounting/index.vue          | 55 +++++++++----------
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
index c57bf203..d54fb3a6 100644
--- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
@@ -35,7 +35,7 @@
             {{ scope.row.工序名 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划件数" align="center" width="80">
+        <el-table-column label="投产数" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.计划数量 }}
           </template>
@@ -45,7 +45,7 @@
             {{ scope.row.计划准备工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划定额(分)" align="center" width="110">
+        <el-table-column label="单件定额(分)" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.单件计划工时 }}
           </template>
@@ -55,7 +55,7 @@
             {{ scope.row.计划工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划加工日期" align="center" width="110">
+        <el-table-column label="计划完成" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.计划加工日期 }}
           </template>
@@ -65,11 +65,16 @@
             {{ scope.row.加工数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="录入准结(分)" align="center" width="110">
+        <el-table-column label="准结(分)" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.加工准备工时 }}
           </template>
         </el-table-column>
+        <el-table-column label="单件加工工时(分)" align="center" prop="加工工时" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.修补单件工时 }}
+          </template>
+        </el-table-column>
         <el-table-column label="加工工时(分)" align="center" prop="加工工时" width="110">
           <template slot-scope="scope">
             {{ scope.row.加工工时 }}
@@ -80,17 +85,12 @@
             {{ scope.row.扫码工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="辅助工时(分)" align="center" prop="辅助工时" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.辅助工时 }}
-          </template>
-        </el-table-column>
         <el-table-column label="工时比值" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.工时比值 }}
           </template>
         </el-table-column>
-        <el-table-column label="加工日期" align="center" width="100">
+        <el-table-column label="加工完成" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.加工日期 }}
           </template>
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index 6530d9e2..66bf3c7a 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -20,6 +20,11 @@
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 720px" height="720px" border @sort-change="sortChange">
+        <el-table-column align="center" label="跟单号" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.跟单号 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="加工日期" width="110px" sortable="custom" prop="操作时间">
           <template slot-scope="scope">
             {{ scope.row.完成日期 }}
@@ -35,11 +40,6 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="跟单号" width="120px">
-          <template slot-scope="scope">
-            {{ scope.row.跟单号 }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="工序" width="50px">
           <template slot-scope="scope">
             {{ scope.row.工序顺序 }}
@@ -50,46 +50,41 @@
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <!--<el-table-column align="center" label="录入准结(分)" width="110px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.修补准结工时 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column align="center" label="加工工时(分)" width="110px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.设备工时 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
+        <el-table-column align="center" label="完成数量" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.完成数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="单件工时(分)" width="110px">
+          <template slot-scope="scope">
+            {{ scope.row.修补单件工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="录入准结(分)" width="110px">
+          <template slot-scope="scope">
+            {{ scope.row.修补准结工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="备注" width="200px" show-overflow-tooltip="">
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="扫码工时(分)" width="110px">
           <template slot-scope="scope">
             {{ scope.row.扫码工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="完成工时(分)" width="110px">
-          <template slot-scope="scope">
-            {{ scope.row.完成工时 }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="工时比值" width="100px">
           <template slot-scope="scope">
             {{ scope.row.工时比值 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="完成数量" width="80px">
-          <template slot-scope="scope">
-            {{ scope.row.完成数量 }}
-          </template>
-        </el-table-column>
         <!--<el-table-column align="center" label="废品件数" width="80px">-->
         <!--<template slot-scope="scope">-->
         <!--{{ scope.row.不合格数量 }}-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column align="center" label="备注" width="200px" show-overflow-tooltip="">
-          <template slot-scope="scope">
-            {{ scope.row.备注 }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="计划准结(分)" width="110px">
           <template slot-scope="scope">
             {{ scope.row.准结定额工时 }}