From ecb2095a7334bafdb5d5a3dc041a728ff93ace2d Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 15 Mar 2019 09:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvoiceSettlementApprove.js               |  12 --
 .../InvoiceSettlementApplication/index.vue    |  35 ++---
 .../InvoiceSettlementApprove/index.vue        | 130 ++++--------------
 3 files changed, 44 insertions(+), 133 deletions(-)

diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
index 6c8898e1..15f3e5ac 100644
--- a/src/api/PurchasingCenter/InvoiceSettlementApprove.js
+++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
@@ -25,18 +25,6 @@ export function searchTable2(num) {
     }
   })
 }
-// 入库单明细查询
-export function searchInboundCardDetail(data1) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '库存管理_采购入库单_入库单明细_查询数据',
-      param: '采购入库单流水号=' + data1
-    }
-  })
-}
 // 执行审批
 export function excuteApprove(...data) {
   return request({
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index 3cd8fa9b..0503011f 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -122,7 +122,7 @@
       <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
       <span>发票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
+      <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
       <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
@@ -271,7 +271,7 @@
         </el-table-column>
       </el-table>
       <el-table ref="multipleTable" :data="tableData02" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="35"/>
+        <el-table-column :selectable="selectable" type="selection" align="center" width="35"/>
         <el-table-column label="名称" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
@@ -536,14 +536,14 @@ export default {
       this.searchTable1()
     },
     submitApply(row) {
-      this.$confirm('确认提交申请吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (this.tableData2.length === 0) {
-          this.$message.warning('发票结算申请明细为空！')
-        } else {
+      if (this.tableData2.length === 0) {
+        this.$message.warning('发票结算申请明细为空！')
+      } else {
+        this.$confirm('确认提交申请吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           submitApply(row.发票结算申请单流水号, this.id).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('提交成功')
@@ -551,13 +551,13 @@ export default {
               this.tableData2 = []
             } else { this.$message.error('提交失败') }
           })
-        }
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
         })
-      })
+      }
     },
     searchTable2(row) {
       this.applyOrderNum = row.发票结算申请单流水号
@@ -675,6 +675,9 @@ export default {
           message: '已取消操作'
         })
       })
+    },
+    selectable(row) {
+      return Number(row.本次到票数量) > 0
     }
   }
 }
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
index 6b002293..64b91dec 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
@@ -42,6 +42,11 @@
             </el-form>
           </template>
         </el-table-column>
+        <el-table-column label="供应商" align="center" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
         <el-table-column label="发票号" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
@@ -72,7 +77,7 @@
             {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="生产审批" align="center" min-width="60">
+        <el-table-column label="财务审批" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
           </template>
@@ -82,7 +87,7 @@
             {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" align="center" min-width="60">
+        <el-table-column label="总经理审批" align="center" min-width="70">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
@@ -92,16 +97,6 @@
             {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="110">
-          <template slot-scope="scope">
-            {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
-          </template>
-        </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
             <el-button :disabled="false" type="primary" size="mini" @click="excuteApprove(scope.row)">审批</el-button>
@@ -122,111 +117,43 @@
     </el-card>
 
     <el-card>
-      <h4 style="margin-top: 5px;display: inline-block;width: 150px;">采购入库单</h4>
+      <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
       <span>发票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
-      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini" @row-click="searchTable3">
-        <el-table-column label="入库单号" align="center" min-width="100">
+      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
+        <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.入库单号 }}
+            {{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库日期" align="center" min-width="100">
+        <el-table-column label="图号或型号" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.入库日期 ? scope.row.入库日期.split(' ')[0] : '—' }}
+            {{ scope.row.采购物料型号 || scope.row.离线物料型号 || scope.row.采购零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库" align="center" min-width="100">
+        <el-table-column label="规格" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ scope.row.仓库 }}
+            {{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="供应商" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
         <el-table-column label="合同编号" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.合同编号 }}
+            {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
           </template>
         </el-table-column>
         <el-table-column label="合同名称" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.合同名称 }}
+            {{ scope.row.采购合同名称 || scope.row.离线合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="到货日期" align="center" min-width="100">
+        <el-table-column label="到票数量" align="center" width="100">
           <template slot-scope="scope">
-            {{ scope.row.到货日期 ? scope.row.到货日期.split(' ')[0] : '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="业务号" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.业务号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.供应商 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="业务员" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.业务员 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="业务类型" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.业务类型 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购类型" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.采购类型 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="入库类型" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.入库类型 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.备注 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <h4>采购入库单明细</h4>
-      <el-table :data="tableData3" border style="width: 100%;max-height: 250px;" height="250px" size="mini">
-        <el-table-column label="名称" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件图号" align="center" min-width="130">
-          <template slot-scope="scope">
-            {{ scope.row.图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" min-width="100" prop="数量">
-          <template slot-scope="scope">
-            {{ scope.row.数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="本币单价" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.本币单价 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="本币金额" align="center" min-width="100" prop="sum">
-          <template slot-scope="scope">
-            {{ scope.row.sum = scope.row.本币单价 * scope.row.数量 }}
+            {{ scope.row.到票数量 }}
           </template>
         </el-table-column>
       </el-table>
@@ -235,7 +162,7 @@
 </template>
 
 <script>
-import { searchTable1, searchTable2, searchInboundCardDetail, excuteApprove } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
+import { searchTable1, searchTable2, excuteApprove } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
 import { mapGetters } from 'vuex'
 import { readFile } from '@/utils/request'
 import request from '@/utils/request'
@@ -326,17 +253,10 @@ export default {
       })
     },
     searchTable2(row) {
-      console.log(row)
       this.invoiceNumber = row.发票号
       searchTable2(row.发票结算申请单流水号).then(response => {
         this.tableData2 = response.data
       })
-    },
-    searchTable3(row) {
-      console.log(row)
-      searchInboundCardDetail(row.采购入库单流水号).then(response => {
-        this.tableData3 = response.data
-      })
     }
   }
 }