|
@@ -98,13 +98,6 @@
|
|
|
:data="loadData"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
- <!-- 付款时间 审核不通过/已取消/待审核 不显示付款时间-->
|
|
|
- <template slot="auditDateInfo" slot-scope="text, record">
|
|
|
- <div v-if="record.billStatus&&(record.billStatus=='WAIT_OUT_WAREHOUSE'||record.billStatus=='FINISH')">
|
|
|
- {{ record.auditDate }}
|
|
|
- </div>
|
|
|
- <div v-else>--</div>
|
|
|
- </template>
|
|
|
<!-- 财务状态 -->
|
|
|
<template slot="financialStatusInfo" slot-scope="text, record">
|
|
|
<div v-if="record.financialStatus&&record.financialStatusDictValue">
|
|
@@ -128,7 +121,7 @@ import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
// 接口
|
|
|
-import { queryByBizTradeList, queryShelfSettleRuleCount, bizTradeQueryGroupCount } from '@/api/merchantNew'
|
|
|
+import { queryByBizTradeList, queryShelfSettleRuleCount, queryByBizTradeCount } from '@/api/merchantNew'
|
|
|
export default {
|
|
|
name: 'OnlinePayInvoiceDetail',
|
|
|
components: { STable, VSelect, rangeDate },
|
|
@@ -181,7 +174,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
detailData: null, // 详情数据
|
|
|
- isShowBisiceInfo: false, // 显示基础内容
|
|
|
+ isShowBisiceInfo: true, // 显示基础内容
|
|
|
countData: null, // 统计信息
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
@@ -191,7 +184,7 @@ export default {
|
|
|
{ title: '财务收款单号', dataIndex: 'settleNo', width: '9%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
|
|
|
{ title: '订单金额', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '结算方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '付款时间', dataIndex: 'auditDate', width: '8%', align: 'center', scopedSlots: { customRender: 'auditDateInfo' } },
|
|
|
+ { title: '付款时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '退款时间', dataIndex: 'refundData', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '财务状态', dataIndex: 'financialStatusDictValue', width: '6%', align: 'center', scopedSlots: { customRender: 'financialStatusInfo' } },
|
|
@@ -206,7 +199,7 @@ export default {
|
|
|
},
|
|
|
// 统计
|
|
|
getCount (val) {
|
|
|
- bizTradeQueryGroupCount(val).then(res => {
|
|
|
+ queryByBizTradeCount(val).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
this.countData = res.data
|
|
|
}
|