From 66a4d3e816a75e14d9a1cf833c182d24dbb05760 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Tue, 7 Jan 2020 12:17:45 +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/Inventory/Inboundscanning/index.vue | 34 +++++++------------
 .../MonthEndHourAccounting/index.vue          | 14 ++++----
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index eaceafc5..92e3f4f7 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -11,15 +11,6 @@
         <el-tooltip :open-delay="1200" effect="dark" content="将所有机床零件入库" placement="top">
           <el-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
         </el-tooltip>
-        <el-tooltip :open-delay="1200" effect="dark" content="清除该条零件信息" placement="top">
-          <el-button
-            size="small"
-            type="danger"
-            style="float: right; margin-right: 10px;margin-top: 12px"
-            plain
-            class="el-icon-delete"
-            @click="handleDelete()">移除</el-button>
-        </el-tooltip>
       </el-row>
     </el-card>
 
@@ -27,7 +18,6 @@
       <el-table
         v-loading="listLoading"
         :data="tableDataNum"
-        :row-class-name="tableRowClassName"
         stripe
         highlight-current-row
         border
@@ -80,6 +70,16 @@
             <el-input v-model="tableData[scope.$index].note" clearable size="mini"/>
           </template>
         </el-table-column>
+        <el-table-column label="操作" min-width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              :disabled="scope.row.是否禁用"
+              size="mini"
+              type="danger"
+              class="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </el-card>
   </div>
@@ -122,17 +122,9 @@ export default {
   },
   methods: {
     // 移除
-    handleDelete() {
-      this.tableDataNum.splice(this.NUM, 1)
-      this.tableData.splice(this.NUM, 1)
-      this.NUM = ''
-    },
-    tableRowClassName({ row, rowIndex }) {
-      console.log(rowIndex)
-      this.NUM = rowIndex
-    },
-    searchData(index) {
-      this.NUM = index
+    handleDelete(index, row) {
+      this.tableDataNum.splice(index, 1)
+      this.tableData.splice(index, 1)
     },
     // 获取人员编号
     getpeopleid() {
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index affbd18b..4a51526e 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -37,19 +37,19 @@
             {{ scope.row.工序顺序 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工序名称" width="100px">
+        <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">
+        <el-table-column align="center" label="录入准结工时" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.准结工时 }}
+            {{ scope.row.修补准结工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="定额工时" width="80px">
+        <el-table-column align="center" label="实际工时" width="80px">
           <template slot-scope="scope">
-            {{ scope.row.单件工时 }}
+            {{ scope.row.设备工时 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="合格品" width="70px">
@@ -132,8 +132,8 @@ export default {
         return
       }
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['姓名', '图号', '跟单号', '序号', '工序名称', '准结工时', '定额工时', '合格数', '不合格数', '备注', '日期', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料']
-        const filterVal = ['姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '准结工时', '单件工时', '合格数', '不合格数', '备注', '操作时间', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料']
+        const tHeader = ['姓名', '图号', '跟单号', '序号', '工序名称', '录入准结工时', '实际工时', '合格数', '不合格数', '备注', '日期', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料']
+        const filterVal = ['姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '合格数', '不合格数', '备注', '操作时间', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料']
         const list = this.tableData
         const data = this.formatJson(filterVal, list)
         excel.export_json_to_excel({