From 00a2116efe4a253e30a3df631effc0e58212fe0c Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 25 Feb 2020 17:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=95=E5=B7=A5=E6=97=B6=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/MonthEndHourAccounting/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index cd62dc84..ba8443a5 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -12,7 +12,7 @@
         style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
         start-placeholder="开始日期"
         end-placeholder="结束日期"/>
-      <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="searchTable()">查询</el-button>
+      <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
       <el-button size="small" type="primary" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
     </el-card>
     <el-card>
@@ -82,7 +82,7 @@
             {{ scope.row.操作时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="备注" width="100px">
+        <el-table-column align="center" label="备注" width="200px" show-overflow-tooltip="">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
@@ -122,7 +122,7 @@
             {{ scope.row.设计者 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="材料" width="100px">
+        <el-table-column align="center" label="材料" width="150px">
           <template slot-scope="scope">
             {{ scope.row.材料 }}
           </template>
@@ -189,9 +189,10 @@ export default {
         this.loading = true
         searchTable(this.startTime[0], this.startTime[1], this.orderName, this.order, this.pageCurrent, this.pageSize).then(response => {
           response.data.rows.map(v => {
-            this.$set(v, '工时比值', v.计划工时 === 0 ? 0 : Math.round(v.扫码工时 / v.计划工时 * 100) / 100.00)
+            this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.扫码工时) / parseInt(v.计划工时) * 100) / 100.00))
           })
           this.tableData = response.data.rows
+          console.log(this.tableData)
           this.total = response.data.total
           this.loading = false
         })