From ee0749c568df29e57dea51654828fce8d9cc2a1c Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 8 Jan 2020 09:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScheduleCompletionDetails/index.vue       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index cbd24494..74befd92 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -130,12 +130,12 @@
 
 <script>
 import { searchtable, searchtable2 } from '@/api/ManufacturingCenter/ScheduleCompletionDetails'
-import { getNowTime, getNowTime1 } from '@/utils/tool'
+import { getNowShotTime } from '@/utils/tool'
 export default {
   data() {
     return {
-      startTime: getNowTime1(), // 开始时间
-      endTime: getNowTime(), // 结束时间
+      startTime: getNowShotTime(), // 开始时间
+      endTime: getNowShotTime(), // 结束时间
       tableData: [], // 操作者工时统计
       loading: '',
       tableData2: [], // 工序统计表
@@ -160,8 +160,11 @@ export default {
       this.tableData = []
       this.tableData2 = []
       this.total2 = 0
-      searchtable(this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
-        console.log(response.data, 111)
+      var STime = ''
+      var ETime = ''
+      STime = this.startTime + ' 00:00:00'
+      ETime = this.endTime + ' 23:59:59'
+      searchtable(STime, ETime, this.pageCurrent, this.pageSize).then(response => {
         if (response.data.total === 0) {
           this.loading = false
         } else {
@@ -171,12 +174,17 @@ export default {
       }).then(() => {
         this.loading = false
       })
-    }, // 获取工序表
+    },
+    // 获取工序表
     searchTable2(row) {
       this.loading2 = true
       this.tableData2 = []
       this.pageCurrent2 = 1
-      searchtable2(row.人员编号, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
+      var STime = ''
+      var ETime = ''
+      STime = this.startTime + ' 00:00:00'
+      ETime = this.endTime + ' 23:59:59'
+      searchtable2(row.人员编号, STime, ETime, this.pageCurrent2, this.pageSize2).then(response => {
         console.log(response.data, 222)
         if (response.data.rows.length !== 0) {
           this.tableData2 = response.data.rows