From 04ad2181783c22681687cbb592d8fdebdb352c08 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 22 Nov 2019 15:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=88=B0=E7=A5=A8=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcingPaymentPlanManagement.js       |  2 +-
 .../index.vue                                 | 43 +++++++++++--------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index 75360d87..ef2d26f0 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -68,7 +68,7 @@ export function getParts(check, Number, pageCurrent, pageSize) {
     data: {
       type: '1',
       name: '车间生产管理工艺_外协发票管理_查询数据',
-      param: '外协厂家流水号_check=' + check + '外协厂家流水号=' + Number + '=int',
+      param: '外协厂家流水号_check=' + check + '&外协厂家流水号=' + Number + '=int',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index bf2a7eeb..aca6079e 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -219,21 +219,26 @@
         </el-tooltip>
       </el-row>
       <el-table v-loading="loading2" :data="tableData2" :summary-method="getSummaries" size="mini" stripe height="370" show-summary style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table-column label="厂家" prop="发票号" align="center" width="230px">
+          <template slot-scope="scope">
+            {{ scope.row.外协厂家名称 }}
+          </template>
+        </el-table-column>
         <el-table-column label="发票号" prop="发票号" align="center" width="230px">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
         </el-table-column>
-        <el-table-column label="接收人" prop="接收人" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.接收人 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="开户行" align="center" width="150px" show-overflow-tooltip="">
-          <template slot-scope="scope">
-            {{ scope.row.开户行 }}
-          </template>
-        </el-table-column>
+        <!--<el-table-column label="接收人" prop="接收人" align="center" width="100px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.接收人 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="开户行" align="center" width="150px" show-overflow-tooltip="">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.开户行 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
         <el-table-column label="开票金额" align="center" width="100px" prop="开票金额">
           <template slot-scope="scope">
             {{ scope.row.开票金额 }}
@@ -241,12 +246,12 @@
         </el-table-column>
         <el-table-column label="开票日期" align="center" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.开票时间 }}
+            {{ scope.row.开票时间 === '1900/1/1' ? '-' : scope.row.开票时间 }}
           </template>
         </el-table-column>
         <el-table-column label="接收日期" align="center" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.接收时间 }}
+            {{ scope.row.接收时间 === '1900/1/1' ? '-' : scope.row.接收时间 }}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">
@@ -517,7 +522,6 @@ export default {
         this.date3_check = true
       }
       this.tableData = []
-      this.tableData2 = []
       searchtable(this.FormNumber_check, this.FormNumber, this.ManufacturerNameValue_check, this.ManufacturerNameValue, this.date1_check, this.date1, this.date2, this.date3_check, this.date3, this.date4, this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substring(0, response.data.rows[i].任务下达日期.indexOf(' '))
@@ -605,9 +609,8 @@ export default {
       let check
       this.ManufacturerNameValue2 ? check = 1 : check = 0
       getParts(check, this.ManufacturerNameValue2, this.pageCurrent2, this.pageSize2).then(response => {
-        if (response.data.rows.length === 0) {
-          this.loading2 = false
-        } else {
+        this.loading2 = false
+        if (response.data.rows.length !== 0) {
           for (let i = 0; i < response.data.rows.length; i++) {
             response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
             response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
@@ -615,8 +618,6 @@ export default {
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
         }
-      }).then(() => {
-        this.loading2 = false
       })
     },
     getParts2() {
@@ -673,6 +674,12 @@ export default {
       if (this.count2 !== 1) {
         this.$refs[formName].resetFields()
       }
+      if (row.开票时间 === '1900/1/1') {
+        row.开票时间 = ''
+      }
+      if (row.接收时间 === '1900/1/1') {
+        row.接收时间 = ''
+      }
       this.form.外协厂家 = row.外协厂家流水号
       this.form.发票号 = row.发票号
       this.form.开户行 = row.开户行