|
@@ -73,19 +73,19 @@
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="开票状态">
|
|
|
<a-select v-model="queryParam.invoiceDateType" style="width: 100%" placeholder="请选择开票状态">
|
|
|
- <a-select-option value="1">
|
|
|
- 已开票
|
|
|
- </a-select-option>
|
|
|
- <a-select-option value="0">
|
|
|
- 未开票
|
|
|
- </a-select-option>
|
|
|
- </a-select>
|
|
|
+ <a-select-option value="1">
|
|
|
+ 已开票
|
|
|
+ </a-select-option>
|
|
|
+ <a-select-option value="0">
|
|
|
+ 未开票
|
|
|
+ </a-select-option>
|
|
|
+ </a-select>
|
|
|
</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-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="所属区域">
|
|
@@ -141,31 +141,30 @@
|
|
|
bordered>
|
|
|
<!-- 开票日期 -->
|
|
|
<template slot="draftDate" slot-scope="text, record">
|
|
|
- <div @click="handleInvoice(record)">
|
|
|
- <span v-if="record.invoiceBeginDate" class="link-bule">{{ record.invoiceBeginDate }}~{{record.invoiceEndDate}}</span>
|
|
|
+ <div @click="handleInvoice(record)">
|
|
|
+ <span v-if="record.invoiceDate" class="link-bule">{{ record.invoiceDate }}</span>
|
|
|
<span class="link-bule" v-else>--</span>
|
|
|
</div>
|
|
|
</template>
|
|
|
<!-- 收款打印状态 -->
|
|
|
<template slot="printStatus" slot-scope="text, record">
|
|
|
- <span v-if="record.printStatus!='NO_PRINT'&&record.printStatus!='PRINT'">{{record.printStatusDictValue}}</span>
|
|
|
- <span @click="handlePrint(record)" class="link-bule" v-else>{{record.printStatusDictValue}}</span>
|
|
|
+ <span v-if="record.printStatus=='NO_PRINT' || record.printStatus=='PRINT'">{{ record.printStatusDictValue }}</span>
|
|
|
+ <span @click="handlePrint(record)" class="link-bule" v-else>{{ record.printStatusDictValue }}</span>
|
|
|
</template>
|
|
|
<!-- 备注 -->
|
|
|
<template slot="note" slot-scope="text, record">
|
|
|
- <div @click="handleNote(record)">
|
|
|
- <span v-if="record.explainInfo" class="link-bule">备注可修改</span>
|
|
|
- <span class="link-bule" v-else>--</span>
|
|
|
+ <div @click="handleNote(record)">
|
|
|
+ <span class="link-bule">{{ record.remarks || '--' }}</span>
|
|
|
</div>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-spin>
|
|
|
<!-- 开票日期弹窗 -->
|
|
|
- <invoiceModal v-drag :show="invoiceIsShow" :info="invoiceInfo" @cancel="invoiceIsShow=false"></invoiceModal>
|
|
|
- <!-- 备注弹窗 -->
|
|
|
- <noteModal v-drag :show="noteIsShow" :info="noteInfo" @cancel="noteIsShow=false"></noteModal>
|
|
|
- <!-- 收款打印状态 -->
|
|
|
- <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="printIsShow=false"></printModal>
|
|
|
+ <invoiceModal v-drag :show="invoiceIsShow" :info="invoiceInfo" @cancel="cancel"></invoiceModal>
|
|
|
+ <!-- 备注弹窗 -->
|
|
|
+ <noteModal ref="remarksModal" v-drag :show="noteIsShow" @cancel="cancel"></noteModal>
|
|
|
+ <!-- 收款打印状态 -->
|
|
|
+ <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="cancel"></printModal>
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -186,7 +185,7 @@ import { financeBookDetailQueryPage, financeBookDetailExport, financeBookReportD
|
|
|
export default {
|
|
|
name: 'CollectionDetailStaticList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area,invoiceModal,noteModal,printModal },
|
|
|
+ components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area, invoiceModal, noteModal, printModal },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -207,11 +206,11 @@ export default {
|
|
|
bankName: undefined,
|
|
|
subareaSn: undefined,
|
|
|
provinceSn: undefined,
|
|
|
- invoiceDateType:undefined
|
|
|
+ invoiceDateType: undefined
|
|
|
},
|
|
|
- invoiceIsShow:false,
|
|
|
- noteIsShow:false,
|
|
|
- printIsShow:false,
|
|
|
+ invoiceIsShow: false,
|
|
|
+ noteIsShow: false,
|
|
|
+ printIsShow: false,
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
receiptDate: [], // 收款时间
|
|
|
auditDate: [
|
|
@@ -261,9 +260,8 @@ export default {
|
|
|
}
|
|
|
],
|
|
|
bankNameList: [],
|
|
|
- invoiceInfo:null,
|
|
|
- noteInfo:null,
|
|
|
- printInfo:null
|
|
|
+ invoiceInfo: null,
|
|
|
+ printInfo: null
|
|
|
}
|
|
|
},
|
|
|
// 根据权限显示列表字段
|
|
@@ -288,16 +286,23 @@ export default {
|
|
|
{ title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
|
|
|
{ title: '户名', dataIndex: 'bankAccount', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%',customRender: function (text) { return (text == 0 || text) ? text : '--' }},
|
|
|
+ { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
|
|
|
{ title: '说明', dataIndex: 'explainInfo', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '开票日期', scopedSlots: { customRender: 'draftDate' },align: 'center', width: '8%'},
|
|
|
- { title: '收款打印状态', scopedSlots: { customRender: 'printStatus' },align: 'center', width: '8%'},
|
|
|
- { title: '备注', scopedSlots: { customRender: 'note' },align: 'center', width: '8%'},
|
|
|
+ { title: '开票日期', scopedSlots: { customRender: 'draftDate' }, align: 'center', width: '8%' },
|
|
|
+ { title: '收款打印状态', scopedSlots: { customRender: 'printStatus' }, align: 'center', width: '8%' },
|
|
|
+ { title: '备注', scopedSlots: { customRender: 'note' }, align: 'center', width: '8%' }
|
|
|
]
|
|
|
return arr
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 关闭弹窗刷新表格
|
|
|
+ cancel () {
|
|
|
+ this.invoiceIsShow = false
|
|
|
+ this.noteIsShow = false
|
|
|
+ this.printIsShow = false
|
|
|
+ this.$refs.table.refresh(true)
|
|
|
+ },
|
|
|
getCount (params) {
|
|
|
financeBookReportDetailCount(params).then(res => {
|
|
|
this.countData = res.data
|
|
@@ -371,41 +376,43 @@ export default {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
this.tableHeight = window.innerHeight - tableSearchH - 205
|
|
|
},
|
|
|
- handleInvoice(con){
|
|
|
- let obj={
|
|
|
- no:con.bookNo,
|
|
|
- payerName:con.dealerName,
|
|
|
- bookDetailSn:con.bookDetailSn
|
|
|
+ handleInvoice (con) {
|
|
|
+ const obj = {
|
|
|
+ no: con.bookNo,
|
|
|
+ payerName: con.payerName,
|
|
|
+ bookDetailSn: con.bookDetailSn
|
|
|
}
|
|
|
- this.invoiceInfo=obj;
|
|
|
- this.$nextTick(()=>{
|
|
|
- this.invoiceIsShow = true
|
|
|
+ this.invoiceInfo = obj
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.invoiceIsShow = true
|
|
|
})
|
|
|
},
|
|
|
- handleNote(info){
|
|
|
- let obj={
|
|
|
- no:info.bookNo,
|
|
|
- payerName:info.dealerName,
|
|
|
- id:info.id,
|
|
|
- remarks:info.remarks
|
|
|
+ // 修改备注
|
|
|
+ handleNote (info) {
|
|
|
+ const obj = {
|
|
|
+ no: info.bookNo,
|
|
|
+ payerName: info.payerName,
|
|
|
+ id: info.id,
|
|
|
+ remarks: info.remarks ? info.remarks : ''
|
|
|
}
|
|
|
- this.noteInfo=obj;
|
|
|
- this.$nextTick(()=>{
|
|
|
- this.noteIsShow = true
|
|
|
+ this.noteIsShow = true
|
|
|
+ const _this = this
|
|
|
+ _this.$nextTick(() => {
|
|
|
+ _this.$refs.remarksModal.setData(JSON.stringify(obj))
|
|
|
})
|
|
|
},
|
|
|
- handlePrint(item){
|
|
|
- let obj={
|
|
|
- no:item.bookNo,
|
|
|
- payerName:item.dealerName,
|
|
|
- id:item.id,
|
|
|
- printStatus:item.printStatus
|
|
|
+ handlePrint (item) {
|
|
|
+ const obj = {
|
|
|
+ no: item.bookNo,
|
|
|
+ payerName: item.payerName,
|
|
|
+ id: item.id,
|
|
|
+ printStatus: item.printStatus
|
|
|
}
|
|
|
- this.printInfo=obj;
|
|
|
- this.$nextTick(()=>{
|
|
|
- this.printIsShow = true
|
|
|
+ this.printInfo = obj
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.printIsShow = true
|
|
|
})
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
watch: {
|
|
|
advanced (newValue, oldValue) {
|