浏览代码

关联收款单

lilei 2 年之前
父节点
当前提交
f2b2688538

+ 9 - 0
src/api/settleReceipt.js

@@ -38,4 +38,13 @@ export const settleReceiptFindBySn = (params) => {
     url: url,
     method: 'get'
   })
+}
+
+// 收款打印
+export const settleReceiptPrintFindBySn = (params) => {
+  const url = `/settleReceipt/printFindBySn/${params.sn}`
+  return axios({
+    url: url,
+    method: 'get'
+  })
 }

+ 9 - 9
src/views/financialManagement/financialCollection/list.vue

@@ -135,7 +135,6 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import baseModal from './baseModal.vue'
@@ -194,19 +193,20 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '创建时间', dataIndex: 'createDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款单号', scopedSlots: { customRender: 'bookNo' }, width: '10%', align: 'center' },
-        { title: '关联备货单', scopedSlots: { customRender: 'dispatchNum' }, width: '10%', align: 'center' },
-        { title: '申请人', dataIndex: 'applyPersonName', align: 'left', width: '9%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收款事由', dataIndex: 'bookReason', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款单号', scopedSlots: { customRender: 'bookNo' }, width: '8%', align: 'center' },
+        { title: '关联备货单', scopedSlots: { customRender: 'dispatchNum' }, width: '6%', align: 'center' },
+        { title: '申请人', dataIndex: 'applyPersonName', align: 'center', width: '6%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收款事由', dataIndex: 'bookReason', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '订单总金额', dataIndex: 'orderTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '收款总金额', dataIndex: 'receiptTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '授信还款总金额', dataIndex: 'payTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '余款抵扣总金额', dataIndex: 'balanceTotalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'statusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '4%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ]
       return arr
     }
@@ -288,7 +288,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '操作提示',
-        content: '系统将自动生成一个新的费用报销单,与原审核不通过的单据内容相同。您可以对新单据进行编辑、提交等操作,原单据保持不变,确认操作吗?',
+        content: '系统将自动生成一个新的财务收款单,与原审核不通过的单据内容相同。您可以对新单据进行编辑、提交等操作,原单据保持不变,确认操作吗?',
         centered: true,
         closable: true,
         onOk () {

+ 49 - 34
src/views/salesManagement/receiptPrint/printModel.vue

@@ -16,8 +16,8 @@
           <div style="width: 50%;">收款人:{{ detail.settlePersonName||'--' }}</div>
         </div>
         <!-- 财务收款单 -->
-        <div>
-          <div style="line-height: 30pt;">共 2 个财务收款单,以下是第 1 个</div>
+        <div v-for="(fcItem,index) in financeBookList" :key="fcItem.bookSn">
+          <div style="line-height: 30pt;">共 {{ financeBookList.length }} 个财务收款单,以下是第 {{ index+1 }} 个</div>
           <div>
             <table border="1" style="width: 100%;border-collapse: collapse;text-align: center;">
               <tr>
@@ -29,28 +29,28 @@
                 <th style="line-height: 24pt;width: 10%;">足额打款</th>
                 <th style="line-height: 24pt;width: 14%;">备注</th>
               </tr>
-              <tr v-for="(item,index) in 5">
-                <td style="padding:7px;width: 60px;">{{ index+1 }}</td>
-                <td style="padding:7px;width:120px">6月15日</td>
+              <tr v-for="(item,dindex) in fcItem.financeBookDetailList" :key="item.bookDetailSn">
+                <td style="padding:7px;width: 60px;">{{ dindex+1 }}</td>
+                <td style="padding:7px;width:120px">{{ moment(item.receiptDate).format('M月D日') }}</td>
                 <td style="padding:7px;width: 240px;">
-                  箭冠汽配西安大兴店<br>
-                  CUST1547<br>
-                  东台宇新汽车配件有限公司
+                  {{ item.dealerEntity.dealerName }}<br>
+                  {{ item.dealerEntity.dealerCode }}<br>
+                  {{ item.dealerEntity.licenseName }}
                 </td>
                 <td style="padding:7px;width: 150px;">
-                  订单金额:60553<br>
-                  收款金额:60553<br>
-                  使用授信:0<br>
-                  授信还款:0<br>
-                  余款抵扣:0<br>
-                  跨月打款:0
+                  订单金额:{{ item.orderAmount }}<br>
+                  收款金额:{{ item.receiptAmount }}<br>
+                  使用授信:{{ getTotal(item.detailItemUseList||[]) }}<br>
+                  授信还款:{{ getTotal(item.detailItemPayList||[]) }}<br>
+                  余款抵扣:{{ item.balanceAmount }}<br>
+                  跨月打款:{{ item.nextMonthAmount }}
                 </td>
                 <td style="padding:7px;width: 200px;">
-                  东莞箭冠<br>
-                  东莞银行<br>
+                  {{ item.bankAccount }}<br>
+                  {{ item.bankName }}<br>
                 </td>
-                <td style="padding:7px;width: 80px;"></td>
-                <td style="padding:7px;">备注撒打发</td>
+                <td style="padding:7px;width: 80px;">{{ item.fullPaymentFlagDictValue }}</td>
+                <td style="padding:7px;">{{ item.remarks }}</td>
               </tr>
             </table>
             <div style="line-height: 30pt;">附:钉钉审批明细</div>
@@ -62,12 +62,12 @@
                 <th style="line-height: 24pt;width: 20%;">审批意见</th>
                 <th style="line-height: 24pt;width: 20%;">操作时间</th>
               </tr>
-              <tr>
-                <td style="padding:7px;">王明</td>
-                <td style="padding:7px;">审批人</td>
-                <td style="padding:7px;">已同意</td>
-                <td style="padding:7px;">--</td>
-                <td style="padding:7px;">2022-06-13 09:59:10</td>
+              <tr v-for="(item,six) in fcItem.processInstanceTaskList" :key="six+'-processInstanceTask'">
+                <td style="padding:7px;">{{ item.userName||'--' }}</td>
+                <td style="padding:7px;">{{ item.userType||'--' }}</td>
+                <td style="padding:7px;">{{ item.state||'--' }}</td>
+                <td style="padding:7px;">{{ item.remark||'--' }}</td>
+                <td style="padding:7px;">{{ item.date||'--' }}</td>
               </tr>
             </table>
           </div>
@@ -83,15 +83,26 @@
 
 <script>
 import { jGPrint } from '@/libs/JGPrint.js'
-import { settleReceiptFindBySn } from '@/api/settleReceipt.js'
+import moment from 'moment'
+import { settleReceiptPrintFindBySn } from '@/api/settleReceipt.js'
 export default {
   data () {
     return {
       spinning: false,
-      detail: null
+      detail: null,
+      financeBookList: []
     }
   },
   methods: {
+    moment,
+    getTotal (data) {
+      let ret = 0
+      data.map(item => {
+        ret = ret + item.itemAmount
+        delete item.id
+      })
+      return ret.toFixed(2)
+    },
     handleCommonOk () {
       const _this = this
       const html = document.getElementById('sendGood-print').innerHTML
@@ -109,19 +120,23 @@ export default {
       })
     },
     getData (data, flag) {
-      if (!flag) {
-        this.spinning = true
-        settleReceiptFindBySn({ sn: data.accountReceiptSn }).then(res => {
+      this.spinning = true
+      settleReceiptPrintFindBySn({ sn: data.accountReceiptSn }).then(res => {
+        if (res.status == 200) {
           this.detail = res.data || null
-          this.spinning = false
-        })
-      } else {
-        this.detail = data
-      }
+          if (res.data && res.data.financeBookList) {
+            this.financeBookList = res.data.financeBookList
+          }
+        } else {
+          this.handleCommonCancel()
+        }
+        this.spinning = false
+      })
     },
     handleCommonCancel () {
       this.$emit('cancel')
       this.detail = null
+      this.financeBookList = []
     }
   }
 }

+ 80 - 48
src/views/salesManagement/salesCollection/detailModal.vue

@@ -16,10 +16,10 @@
           <a-button type="primary" class="button-primary" @click="handleCommonOk">{{ okText }}</a-button>
         </div>
         <div>
-          <a-table :columns="chooseColumns" :pagination="false" :data-source="chooseData" bordered>
+          <a-table :columns="columns" :scroll="{ y: 400 }" :pagination="false" :data-source="chooseData" bordered>
             <!-- 收款单号 -->
-            <template slot="salesBillNo" slot-scope="text, record">
-              <span class="link-bule">{{ record.salesBillNo }}</span>
+            <template slot="bookNo" slot-scope="text, record">
+              <span class="link-bule">{{ record.bookNo }}</span>
             </template>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
@@ -43,17 +43,17 @@
             <a-row :gutter="15">
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款单号">
-                  <a-input v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入收款单号"/>
+                  <a-input v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务收款事由">
-                  <a-input v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入财务收款事由"/>
+                  <a-input v-model.trim="queryParam.bookReason" allowClear placeholder="请输入财务收款事由"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="申请人">
-
+                  <employee style="width: 100%;" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -67,17 +67,17 @@
         </div>
         <!-- 表格数据 -->
         <s-table
-          class="sTable fixPagination"
+          class="sTable"
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :defaultLoadData="false"
+          :scroll="{ y: 400 }"
           bordered>
-          <!-- 销售单号 -->
-          <template slot="salesBillNo" slot-scope="text, record">
-            <span class="link-bule">{{ record.salesBillNo }}</span>
+          <!-- 单号 -->
+          <template slot="bookNo" slot-scope="text, record">
+            <span class="link-bule">{{ record.bookNo }}</span>
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -85,8 +85,10 @@
               size="small"
               type="link"
               class="button-warning"
+              v-if="!record.checked"
               @click="handleChoose(record)"
             >选择</a-button>
+            <span style="color:green;" v-else>已选</span>
           </template>
         </s-table>
       </div>
@@ -95,12 +97,13 @@
 </template>
 
 <script>
-import { salesList } from '@/api/sales'
 import { STable, VSelect } from '@/components'
-import { settleReceiptBookBatch } from '@/api/settleReceipt.js'
+import { financeBookQueryPage } from '@/api/financeBook.js'
+import employee from '../../expenseManagement/expenseReimbursement/employee.js'
+import { settleReceiptBookBatch } from '@/api/settleReceipt'
 export default {
   name: 'CommonModal',
-  components: { STable, VSelect },
+  components: { STable, VSelect, employee },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -130,54 +133,49 @@ export default {
       spinning: false,
       handlePlData: [],
       queryParam: {
-
+        bookNo: '',
+        bookReason: '',
+        applyPersonSn: undefined,
+        status: 'AUDIT_PASS'
       },
-      // 已选列
-      chooseColumns: [
-        { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
-        { title: '申请人', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '财务收款事由', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '订单总金额', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
-        { title: '收款总金额', dataIndex: 'totalAmount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '授信总金额', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '余款抵扣总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
-      ],
       chooseData: [],
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
-        { title: '申请人', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '财务收款事由', dataIndex: 'buyerName1', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '订单总金额', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
-        { title: '收款总金额', dataIndex: 'totalAmount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '授信总金额', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '余款抵扣总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
+        { title: '收款单号', scopedSlots: { customRender: 'bookNo' }, width: '8%', align: 'center' },
+        { title: '申请人', dataIndex: 'applyPersonName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '财务收款事由', dataIndex: 'bookReason', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '订单总金额', dataIndex: 'orderTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款总金额', dataIndex: 'receiptTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '授信还款总金额', dataIndex: 'payTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '余款抵扣总金额', dataIndex: 'balanceTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'auditDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'statusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
+      orginData: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return salesList(Object.assign(parameter, this.queryParam)).then(res => {
+        return financeBookQueryPage(Object.assign(parameter, this.queryParam)).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
+              const index = this.chooseData.findIndex(item => data.list[i].bookSn == item.bookSn)
+              data.list[i].checked = index >= 0
             }
             this.disabled = false
           }
           this.spinning = false
+          this.orginData = data.list
           return data
         })
-      }
+      },
+      snList: []
     }
   },
   computed: {
@@ -190,28 +188,62 @@ export default {
     }
   },
   methods: {
-    setData (data) {
+    setData (data, snList) {
       this.handlePlData = data
+      this.snList = snList
     },
     // 删除
     handleDel (row) {
-
+      const i = this.chooseData.findIndex(item => row.bookSn == item.bookSn)
+      const oi = this.orginData.findIndex(item => row.bookSn == item.bookSn)
+      this.chooseData.splice(i, 1)
+      if (oi >= 0) {
+        this.orginData[oi].checked = false
+      }
     },
     // 选择
     handleChoose (row) {
-
+      row.checked = true
+      this.chooseData.push(row)
     },
-    // 确定
+    // 获取sn
+    // 确定收款
     handleCommonOk () {
-      this.$emit('ok')
+      const snList = this.snList
+      const bookSnList = []
+      this.chooseData.map(item => {
+        bookSnList.push(item.bookSn)
+      })
+
+      if (bookSnList.length) {
+        this.spinning = true
+        settleReceiptBookBatch({
+          bookSnList: bookSnList,
+          snList: snList
+        }).then(res => {
+          this.spinning = false
+          if (res.status == 200) {
+            this.$emit('ok')
+            this.$message.info(res.message)
+          }
+        })
+      } else {
+        this.$message.info('请选择关联的财务收款单')
+      }
     },
     // 取消
     handleCommonCancel () {
       this.$emit('cancel')
+      this.chooseData = []
     },
     // 重置
     resetSearchForm () {
-
+      this.queryParam = {
+        bookNo: '',
+        bookReason: '',
+        applyPersonSn: undefined,
+        status: 'AUDIT_PASS'
+      }
     }
   },
   watch: {
@@ -222,7 +254,7 @@ export default {
     //  重定义的弹框状态
     isShow (newValue, oldValue) {
       if (!newValue) {
-        this.$emit('cancel')
+        this.handleCommonCancel()
       }
     }
   }

+ 15 - 5
src/views/salesManagement/salesCollection/list.vue

@@ -109,7 +109,7 @@
               </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesCollectionList-refresh">查询</a-button>
+              <a-button type="primary" @click="searchTable" :disabled="disabled" id="salesCollectionList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesCollectionList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
@@ -192,7 +192,7 @@
         </div>
       </commonModal>
       <!-- 关联收款单 -->
-      <detailModal ref="detailModal" modalTit="关联收款单" :openModal="showDetail" @cancel="showDetail=false"></detailModal>
+      <detailModal ref="detailModal" modalTit="关联收款单" @ok="relationSuccess" :openModal="showDetail" @cancel="showDetail=false"></detailModal>
       <!-- 销售收款凭证 -->
       <voucherModal ref="voucherModal" modalTit="销售收款凭证" :openModal="showVoucher" @cancel="showVoucher=false"></voucherModal>
     </a-spin>
@@ -202,7 +202,6 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
-import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
@@ -216,7 +215,7 @@ import { settleReceiptList, settleReceiptBatch } from '@/api/settleReceipt'
 export default {
   name: 'SalesCollectionList',
   mixins: [commonMixin],
-  components: { STable, VSelect, subarea, rangeDate, commonModal, detailModal, Area, voucherModal,dealerSubareaScopeList },
+  components: { STable, VSelect, subarea, rangeDate, commonModal, detailModal, Area, voucherModal, dealerSubareaScopeList },
   data () {
     return {
       spinning: false,
@@ -316,7 +315,7 @@ export default {
     custChange (val) {
       this.queryParam.settleClientName = val.name
     },
-    receiverChange(val){
+    receiverChange (val) {
       this.queryParam.receiverName = val.name
     },
     // 表格选中项
@@ -333,6 +332,10 @@ export default {
       this.queryParam.beginDateSettle = date[0] ? date[0] + ' 00:00:00' : ''
       this.queryParam.endDateSettle = date[1] ? date[1] + ' 23:59:59' : ''
     },
+    searchTable () {
+      this.$refs.table.refresh(true)
+      this.$refs.table.clearSelected()
+    },
     //  重置
     resetSearchForm () {
       this.auditDate = []
@@ -362,6 +365,7 @@ export default {
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
       this.$refs.table.refresh(true)
+      this.$refs.table.clearSelected()
     },
     // 销售单详情
     handleDetail (row) {
@@ -433,6 +437,12 @@ export default {
         })
       }
     },
+    // 关联收款成功
+    relationSuccess () {
+      this.$refs.table.refresh()
+      this.showDetail = false
+      this.$refs.table.clearSelected()
+    },
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调

+ 19 - 11
src/views/salesManagement/salesCollection/voucherModal.vue

@@ -60,8 +60,8 @@
         <div v-if="detail.keepType == 'RELATION_BOOK'">
           <a-table :columns="columns" :pagination="false" :data-source="tableData" bordered>
             <!-- 收款单号 -->
-            <template slot="salesBillNo" slot-scope="text, record">
-              <span class="link-bule">{{ record.salesBillNo }}</span>
+            <template slot="bookNo" slot-scope="text, record">
+              <span class="link-bule">{{ record.bookNo }}</span>
             </template>
           </a-table>
         </div>
@@ -120,15 +120,16 @@ export default {
       detail: null,
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
-        { title: '申请人', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '财务收款事由', dataIndex: 'buyerName1', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '订单总金额', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
-        { title: '收款总金额', dataIndex: 'totalAmount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '授信总金额', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '余款抵扣总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '收款单号', scopedSlots: { customRender: 'bookNo' }, width: '8%', align: 'center' },
+        { title: '申请人', dataIndex: 'applyPersonName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '财务收款事由', dataIndex: 'bookReason', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '订单总金额', dataIndex: 'orderTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款总金额', dataIndex: 'receiptTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '授信还款总金额', dataIndex: 'payTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '余款抵扣总金额', dataIndex: 'balanceTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'auditDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'statusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       tableData: []
     }
@@ -138,6 +139,13 @@ export default {
       this.spinning = true
       settleReceiptFindBySn({ sn: data.accountReceiptSn }).then(res => {
         this.detail = res.data || null
+        if (res.data.keepType !== 'LABEL_RECEIPT') {
+          this.tableData = res.data ? res.data.financeBookList : []
+          const no = 1
+          for (var i = 0; i < this.tableData.length; i++) {
+            this.tableData[i].no = no + i
+          }
+        }
         this.spinning = false
       })
     },