|
@@ -14,96 +14,37 @@
|
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
<a-form layout="inline">
|
|
|
<a-row :gutter="15">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="创建时间">
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
+ <a-form-item label="允许打印时间">
|
|
|
<rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
+ <a-form-item label="收款单号">
|
|
|
+ <a-input id="salesCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入备货单号"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
<a-form-item label="客户名称">
|
|
|
- <dealerSubareaScopeList ref="settleClientName" id="salesCollectionList-settleClientName" @change="custChange" />
|
|
|
+ <dealerSubareaScopeList ref="payerName" id="salesCollectionList-payerName" @change="custChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="销售单号">
|
|
|
- <a-input id="salesCollectionList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入销售单号"/>
|
|
|
+ <a-col :md="8" :sm="24" v-if="currentTab == 1">
|
|
|
+ <a-form-item label="收款打印状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.printState"
|
|
|
+ ref="printState"
|
|
|
+ id="salesCollectionList-printState"
|
|
|
+ code="RECEIPT_PRINT"
|
|
|
+ placeholder="请选择打印状态"
|
|
|
+ allowClear
|
|
|
+ ></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <template v-if="advanced">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="备货单号">
|
|
|
- <a-input id="salesCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="收货客户名称">
|
|
|
- <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="业务状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.billStatus"
|
|
|
- ref="billStatus"
|
|
|
- id="salesCollectionList-billStatus"
|
|
|
- code="DISPATCH_BILL_STATUS"
|
|
|
- placeholder="请选择业务状态"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24" v-if="currentTab == 1">
|
|
|
- <a-form-item label="单据状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.voidFlag"
|
|
|
- ref="voidFlag"
|
|
|
- id="salesCollectionList-voidFlag"
|
|
|
- code="VOID_FLAG"
|
|
|
- placeholder="请选择单据状态"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24" v-if="currentTab == 1">
|
|
|
- <a-form-item label="收款打印状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.printState"
|
|
|
- ref="printState"
|
|
|
- id="salesCollectionList-printState"
|
|
|
- code="RECEIPT_PRINT"
|
|
|
- placeholder="请选择打印状态"
|
|
|
- allowClear
|
|
|
- ></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="收款时间">
|
|
|
- <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
- <a-form-item label="所在区域">
|
|
|
- <subarea id="salesCollectionList-subarea" v-model="queryParam.subareaSn"></subarea>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="4" :sm="24">
|
|
|
- <a-row>
|
|
|
- <a-form-item label="地区">
|
|
|
- <a-col span="24">
|
|
|
- <a-form-item prop="dealerProvinceSn" style="margin: 0;">
|
|
|
- <Area id="salesCollectionList-dealerProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省"></Area>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- </a-form-item>
|
|
|
- </a-row>
|
|
|
- </a-col>
|
|
|
- </template>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
<span class="table-page-search-submitButtons">
|
|
|
<a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
<a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
- </a>
|
|
|
</span>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
@@ -113,7 +54,7 @@
|
|
|
<s-table
|
|
|
class="sTable fixPagination"
|
|
|
ref="table"
|
|
|
- :style="{ height: tableHeight+60.5+'px' }"
|
|
|
+ :style="{ height: tableHeight+80.5+'px' }"
|
|
|
size="small"
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
@@ -126,11 +67,6 @@
|
|
|
<span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record,0)">{{ record.bizNo }}</span>
|
|
|
<span v-else>{{ record.bizNo }}</span>
|
|
|
</template>
|
|
|
- <!-- 下推单号 -->
|
|
|
- <template slot="dispatchBillNo" slot-scope="text, record">
|
|
|
- <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
|
|
|
- <span v-else>{{ record.dispatchBillNo || '--' }}</span>
|
|
|
- </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<a-button
|
|
@@ -191,7 +127,7 @@ import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
|
|
|
import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
|
|
|
import recordModal from './recordModal.vue'
|
|
|
import printModel from './printModel.vue'
|
|
|
-import { settleReceiptList } from '@/api/settleReceipt'
|
|
|
+import { financeBookDetailList } from '@/api/financeBook'
|
|
|
export default {
|
|
|
name: 'ReceiptPrintList',
|
|
|
mixins: [commonMixin],
|
|
@@ -206,7 +142,6 @@ export default {
|
|
|
bizSn: null,
|
|
|
tableHeight: 0,
|
|
|
time: [],
|
|
|
- settleDate: [],
|
|
|
currentTab: 2,
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
@@ -214,10 +149,8 @@ export default {
|
|
|
endDate: '',
|
|
|
beginDateSettle: '',
|
|
|
endDateSettle: '',
|
|
|
- bizNo: '',
|
|
|
- dispatchBillNo: '',
|
|
|
- settleClientName: '',
|
|
|
- receiverName: '',
|
|
|
+ bookNo: '',
|
|
|
+ payerName: '',
|
|
|
subareaSn: undefined,
|
|
|
billStatus: undefined,
|
|
|
voidFlag: 0,
|
|
@@ -235,7 +168,7 @@ export default {
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
this.spinning = true
|
|
|
- return settleReceiptList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ return financeBookDetailList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
@@ -255,26 +188,23 @@ export default {
|
|
|
columns () {
|
|
|
const arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
- { title: '创建时间', dataIndex: 'createDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '销售单号', scopedSlots: { customRender: 'bizNo' }, width: '9%', align: 'center' },
|
|
|
- { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '9%', align: 'center' },
|
|
|
- { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '客户名称', dataIndex: 'settleClientName', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '收货客户名称', dataIndex: 'receiverName', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '产品款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品数量', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '收款时间', dataIndex: 'settleTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '允许打印时间', dataIndex: 'auditDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '收款单号', dataIndex: 'bookNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '收款日期', dataIndex: 'receiptDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客户名称', dataIndex: 'payerName', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '财务编码', dataIndex: 'kdMidCustomerFnumber', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '订单金额', dataIndex: 'orderAmount', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '收款金额', dataIndex: 'receiptAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '使用授信', dataIndex: 'useCreditAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '余款抵扣', dataIndex: 'balanceAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '户名', dataIndex: 'bankAccount', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '汇入银行', dataIndex: 'bankName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '说明', dataIndex: 'remarks', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '收款打印状态', dataIndex: 'printStateDictValue', width: '6%', align: 'center' },
|
|
|
{ title: '打印次数', dataIndex: 'printCount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
|
|
|
]
|
|
|
-
|
|
|
- if (this.$hasPermissions('B_isShowPrice')) { // 售价权限
|
|
|
- arr.splice(9, 0, { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- }
|
|
|
return arr
|
|
|
}
|
|
|
},
|
|
@@ -289,16 +219,8 @@ export default {
|
|
|
this.queryParam.beginDate = date[0] ? date[0] : ''
|
|
|
this.queryParam.endDate = date[1] ? date[1] : ''
|
|
|
},
|
|
|
- // 收款时间 change
|
|
|
- dateSettleChange (date) {
|
|
|
- this.queryParam.beginDateSettle = date[0] ? date[0] : ''
|
|
|
- this.queryParam.endDateSettle = date[1] ? date[1] : ''
|
|
|
- },
|
|
|
custChange (val) {
|
|
|
- this.queryParam.settleClientName = val.name
|
|
|
- },
|
|
|
- receiverChange (val) {
|
|
|
- this.queryParam.receiverName = val.name
|
|
|
+ this.queryParam.payerName = val.name
|
|
|
},
|
|
|
handleDetail (row, type) {
|
|
|
this.detailType = type
|
|
@@ -335,25 +257,18 @@ export default {
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.time = []
|
|
|
- if (this.advanced) {
|
|
|
- this.$refs.rangeDate.resetDate(this.time)
|
|
|
- this.$refs.receiverName.resetForm()
|
|
|
- this.settleDate = []
|
|
|
- this.$refs.rangeSettleDate.resetDate()
|
|
|
- }
|
|
|
- this.$refs.settleClientName.resetForm()
|
|
|
+ this.$refs.rangeDate.resetDate(this.time)
|
|
|
+ this.$refs.payerName.resetForm()
|
|
|
this.queryParam = {
|
|
|
beginDate: '',
|
|
|
endDate: '',
|
|
|
- bizNo: '',
|
|
|
- dispatchBillNo: '',
|
|
|
- settleClientName: '',
|
|
|
- receiverName: '',
|
|
|
+ bookNo: '',
|
|
|
+ payerName: '',
|
|
|
subareaSn: undefined,
|
|
|
billStatus: undefined,
|
|
|
voidFlag: this.currentTab == 2 ? '0' : undefined,
|
|
|
dealerProvinceSn: undefined,
|
|
|
- printState: this.currentTab == 2 ? 'NO_PRINT' : undefined
|
|
|
+ printState: this.currentTab == 2 ? 'NO_PRINT' : 'AUDIT_PASS'
|
|
|
}
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
@@ -365,16 +280,10 @@ export default {
|
|
|
},
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 228
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 250
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
- advanced (newValue, oldValue) {
|
|
|
- const _this = this
|
|
|
- this.$nextTick(() => { // 页面渲染完成后的回调
|
|
|
- _this.setTableH()
|
|
|
- })
|
|
|
- },
|
|
|
'$store.state.app.winHeight' (newValue, oldValue) { // 窗口变更时,需同时更改表格高度
|
|
|
this.setTableH()
|
|
|
}
|