|
@@ -6,8 +6,8 @@
|
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="创建时间">
|
|
|
- <rangeDate ref="auditDate" :value="auditDate" @change="dateAuditChange" />
|
|
|
+ <a-form-item label="审核时间">
|
|
|
+ <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -16,36 +16,32 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="关联备货单号">
|
|
|
- <a-input id="collectionDetail-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
|
|
|
+ <a-form-item label="申请人">
|
|
|
+ <employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="收款日期">
|
|
|
+ <rangeDate ref="receiptDate" :value="receiptDate" @change="receiptDateChange" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="客户名称">
|
|
|
+ <dealerSubareaScopeList id="collectionDetail-Employee" ref="settleClientName" @change="custChange" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="客户编码">
|
|
|
+ <a-input id="collectionDetail-kdMidCustomerFnumber" placeholder="请输入客户编码" v-model="queryParam.kdMidCustomerFnumber"></a-input>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="营业执照名称">
|
|
|
+ <a-input id="collectionDetail-licenseName" placeholder="请输入营业执照名称" v-model="queryParam.licenseName"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="申请人">
|
|
|
- <employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="收款日期">
|
|
|
- <rangeDate ref="receiptDate" :value="receiptDate" @change="receiptDateChange" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="客户名称">
|
|
|
- <dealerSubareaScopeList id="collectionDetail-Employee" ref="settleClientName" @change="custChange" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="客户编码">
|
|
|
- <a-input id="collectionDetail-dealerCode" placeholder="请输入客户编码" v-model="queryParam.dealerCode"></a-input>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="营业执照名称">
|
|
|
- <a-input id="collectionDetail-licenseName" placeholder="请输入营业执照名称" v-model="queryParam.licenseName"></a-input>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
<a-col :md="4" :sm="24">
|
|
|
<a-form-item label="足额打款">
|
|
|
<v-select
|
|
@@ -107,7 +103,6 @@
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
:scroll="{ y: tableHeight }"
|
|
|
- :defaultLoadData="false"
|
|
|
bordered>
|
|
|
</s-table>
|
|
|
</a-spin>
|
|
@@ -120,9 +115,10 @@ import { STable, VSelect } from '@/components'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import subarea from '@/views/common/subarea.js'
|
|
|
import Area from '@/views/common/area.js'
|
|
|
+import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
import employee from '../../expenseManagement/expenseReimbursement/employee.js'
|
|
|
import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
|
-import { financeBookQueryPage } from '@/api/financeBook.js'
|
|
|
+import { financeBookDetailQueryPage, financeBookDetailExport } from '@/api/financeBook.js'
|
|
|
export default {
|
|
|
name: 'CollectionDetailStaticList',
|
|
|
mixins: [commonMixin],
|
|
@@ -133,26 +129,29 @@ export default {
|
|
|
exportLoading: false,
|
|
|
tableHeight: 0,
|
|
|
queryParam: { // 查询条件
|
|
|
- receiptBeginDate: '',
|
|
|
- receiptEndDate: '',
|
|
|
+ bookNo: '',
|
|
|
auditBeginDate: '',
|
|
|
auditEndDate: '',
|
|
|
- bookNo: '',
|
|
|
- dispatchBillNo: '',
|
|
|
+ receiptBeginDate: '',
|
|
|
+ receiptEndDate: '',
|
|
|
applyPersonSn: undefined,
|
|
|
- bookReason: '',
|
|
|
- status: undefined
|
|
|
+ dealerSn: undefined,
|
|
|
+ kdMidCustomerFnumber: '',
|
|
|
+ licenseName: '',
|
|
|
+ fullPaymentFlag: undefined,
|
|
|
+ bankName: undefined,
|
|
|
+ subareaSn: undefined,
|
|
|
+ provinceSn: undefined
|
|
|
},
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
receiptDate: [], // 收款时间
|
|
|
auditDate: [], // 审核时间
|
|
|
advanced: false,
|
|
|
- itemSn: null,
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
this.spinning = true
|
|
|
- return financeBookQueryPage(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ return financeBookDetailQueryPage(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
@@ -181,9 +180,9 @@ export default {
|
|
|
{ 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: 'receiptDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '客户名称', dataIndex: 'dealerEntity.dealerName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '客户编码', dataIndex: 'dealerEntity.kdMidCustomerFnumber', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '营业执照名称', dataIndex: 'dealerEntity.licenseName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客户名称', dataIndex: 'dealerName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客户编码', dataIndex: 'kdMidCustomerFnumber', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '营业执照名称', dataIndex: 'licenseName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '订单金额', dataIndex: 'orderAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
|
|
|
{ title: '收款金额', dataIndex: 'receiptAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
|
|
|
{ title: '使用授信', dataIndex: 'useTotalAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
|
|
@@ -214,23 +213,28 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.creatDate = []
|
|
|
- this.$refs.rangeDate.resetDate(this.creatDate)
|
|
|
- this.queryParam.beginDate = ''
|
|
|
- this.queryParam.endDate = ''
|
|
|
- this.auditDate = []
|
|
|
+ this.receiptDate = []
|
|
|
+ this.queryParam.receiptBeginDate = ''
|
|
|
+ this.queryParam.receiptEndDate = ''
|
|
|
if (this.advanced) {
|
|
|
- this.$refs.rangeAuditDate.resetDate(this.auditDate)
|
|
|
+ this.$refs.receiptDate.resetDate(this.receiptDate)
|
|
|
}
|
|
|
+ this.auditDate = []
|
|
|
+ this.$refs.rangeAuditDate.resetDate(this.auditDate)
|
|
|
this.queryParam.auditBeginDate = ''
|
|
|
this.queryParam.auditEndDate = ''
|
|
|
+
|
|
|
this.queryParam.bookNo = ''
|
|
|
this.queryParam.dispatchBillNo = ''
|
|
|
this.queryParam.applyPersonSn = undefined
|
|
|
- this.queryParam.bookReason = ''
|
|
|
- this.queryParam.status = undefined
|
|
|
-
|
|
|
- this.$refs.dealerSubareaScopeList.resetForm()
|
|
|
+ this.queryParam.kdMidCustomerFnumber = ''
|
|
|
+ this.queryParam.dealerSn = undefined
|
|
|
+ this.queryParam.licenseName = ''
|
|
|
+ this.queryParam.fullPaymentFlag = undefined
|
|
|
+ this.queryParam.bankName = undefined
|
|
|
+ this.queryParam.subareaSn = undefined
|
|
|
+ this.queryParam.provinceSn = undefined
|
|
|
+ this.$refs.settleClientName.resetForm()
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
// 导出
|
|
@@ -238,7 +242,7 @@ export default {
|
|
|
const _this = this
|
|
|
_this.exportLoading = true
|
|
|
_this.spinning = true
|
|
|
- hdExportExcel(sendBillExcel, _this.queryParam, '财务收款明细统计', function () {
|
|
|
+ hdExportExcel(financeBookDetailExport, _this.queryParam, '财务收款明细统计', function () {
|
|
|
_this.exportLoading = false
|
|
|
_this.spinning = false
|
|
|
})
|