From fe9f3e4d89249513d8d3934147c5a4b51ab6fda3 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Sat, 25 Apr 2020 18:03:14 +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

---
 .../GroupMatching/index.vue                   | 25 +++++++++++--------
 .../PurchaseContractSearch/index.vue          |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index d70fcc81..d2d7e3ec 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -375,7 +375,7 @@
 </template>
 
 <script>
-import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus, searchTable22, searchTable01, searchTable02 } from '@/api/ManufacturingCenter/GroupMatching'
+import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus, searchTable01, searchTable02 } from '@/api/ManufacturingCenter/GroupMatching'
 export default {
   data() {
     return {
@@ -400,7 +400,7 @@ export default {
       pageCurrent00: 1,
       pageSize00: 50,
       pageCurrent01: 1,
-      pageSize01: 10,
+      pageSize01: 50,
       pageCurrent02: 1,
       pageSize02: 50,
       pageCurrent: 1,
@@ -412,7 +412,7 @@ export default {
       pageCurrent4: 1,
       pageSize4: 10,
       pageCurrent5: 1,
-      pageSize5: 10,
+      pageSize5: 50,
       tableData7: [],
       tableData6: [],
       tableData: [],
@@ -499,6 +499,7 @@ export default {
         for (let i = 0; i < response.data.result.length; i++) {
           if (response.data.result[i].入库时间) {
             response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
+            this.totalNum += 1
           }
           if (response.data.result[i].计划完成时间) {
             response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
@@ -511,13 +512,14 @@ export default {
         this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
-      searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].入库时间 !== null) {
-            this.totalNum += 1
-          }
-        }
-      })
+      // searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
+      //   console.log(response.data, 123243)
+      //   for (let i = 0; i < response.data.length; i++) {
+      //     if (response.data[i].入库时间 !== null) {
+      //       this.totalNum += 1
+      //     }
+      //   }
+      // })
       searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
         this.tableData1 = response.data.rows
         this.total5 = parseInt(response.data.total)
@@ -527,9 +529,12 @@ export default {
       this.dialogFormVisible4 = true
       this.titleaa = row.零件图号
       processingStatus(row.工艺计划流水号).then(response => {
+        console.log(response.data, 1123)
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].计划日期 !== '' && response.data[i].计划日期 !== null) {
             response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
+          }
+          if (response.data[i].完成日期 !== '' && response.data[i].完成日期 !== null) {
             response.data[i].完成日期 = response.data[i].完成日期.split(' ')[0]
           }
         }
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 343407ce..7fc9bd6d 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -562,7 +562,7 @@ export default {
         this.returns = response.data[0].合同内容
       }).then(() => {
         $('#contractName').next('td').html(`<img id="img">`)
-        this.useqrcode(row.采购合同流水号) // 显示二维码
+        this.useqrcode(row.采购合同编号) // 显示二维码
       })
     }
   }