|
@@ -18,23 +18,23 @@
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="收款打印状态">
|
|
<a-form-item label="收款打印状态">
|
|
<v-select
|
|
<v-select
|
|
- v-model="queryParam.printStatus"
|
|
|
|
- code="PRINT_STATUS"
|
|
|
|
- placeholder="请选择收款打印状态"
|
|
|
|
- allowClear
|
|
|
|
- ></v-select>
|
|
|
|
|
|
+ v-model="queryParam.printStatus"
|
|
|
|
+ code="PRINT_STATUS"
|
|
|
|
+ placeholder="请选择收款打印状态"
|
|
|
|
+ allowClear
|
|
|
|
+ ></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="开票状态">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.invoiceStatus"
|
|
|
|
- code="FINANCE_BOOK_INVOICE_STATUS"
|
|
|
|
- placeholder="请选择开票状态"
|
|
|
|
- allowClear
|
|
|
|
- ></v-select>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
|
|
+ <a-form-item label="开票状态">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.invoiceStatus"
|
|
|
|
+ code="FINANCE_BOOK_INVOICE_STATUS"
|
|
|
|
+ placeholder="请选择开票状态"
|
|
|
|
+ allowClear
|
|
|
|
+ ></v-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="申请人">
|
|
<a-form-item label="申请人">
|
|
<employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
|
|
<employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
|
|
@@ -46,19 +46,19 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="付款方类型">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.payerType"
|
|
|
|
- code="PAYER_TYPE"
|
|
|
|
- placeholder="请选择付款方类型"
|
|
|
|
- ></v-select>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="付款方">
|
|
|
|
- <a-input id="financialCollectionList-payerName" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
|
|
+ <a-form-item label="付款方类型">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.payerType"
|
|
|
|
+ code="PAYER_TYPE"
|
|
|
|
+ placeholder="请选择付款方类型"
|
|
|
|
+ ></v-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="付款方">
|
|
|
|
+ <a-input id="financialCollectionList-payerName" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="财务编码">
|
|
<a-form-item label="财务编码">
|
|
@@ -70,7 +70,7 @@
|
|
<a-input id="collectionDetail-payerAccountInfo" placeholder="请输入付款账户" v-model="queryParam.payerAccountInfo"></a-input>
|
|
<a-input id="collectionDetail-payerAccountInfo" placeholder="请输入付款账户" v-model="queryParam.payerAccountInfo"></a-input>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <a-col :md="4" :sm="24">
|
|
<a-form-item label="足额打款">
|
|
<a-form-item label="足额打款">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.fullPaymentFlag"
|
|
v-model="queryParam.fullPaymentFlag"
|
|
@@ -81,16 +81,17 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="户名/汇入银行">
|
|
|
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
|
+ <a-form-item label="户名">
|
|
<a-select placeholder="请选择户名" allowClear v-model="queryParam.bankAccount" style="width: 100%" @change="handleChange">
|
|
<a-select placeholder="请选择户名" allowClear v-model="queryParam.bankAccount" style="width: 100%" @change="handleChange">
|
|
<a-select-option v-for="item in bankList" :value="item.bankAccount">
|
|
<a-select-option v-for="item in bankList" :value="item.bankAccount">
|
|
{{ item.bankAccount }}
|
|
{{ item.bankAccount }}
|
|
</a-select-option>
|
|
</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
- </a-form-item></a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item>
|
|
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
|
+ <a-form-item label="汇入银行">
|
|
<a-select placeholder="请选择汇入银行" allowClear v-model="queryParam.bankName" style="width: 100%">
|
|
<a-select placeholder="请选择汇入银行" allowClear v-model="queryParam.bankName" style="width: 100%">
|
|
<a-select-option v-for="item in bankNameList" :value="item">
|
|
<a-select-option v-for="item in bankNameList" :value="item">
|
|
{{ item }}
|
|
{{ item }}
|
|
@@ -113,6 +114,11 @@
|
|
<Area id="collectionDetail-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
|
|
<Area id="collectionDetail-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="仓库">
|
|
|
|
+ <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
</template>
|
|
</template>
|
|
<a-col :md="24" :sm="24" style="text-align:center;">
|
|
<a-col :md="24" :sm="24" style="text-align:center;">
|
|
<a-button type="primary" @click="searchForm" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
|
|
<a-button type="primary" @click="searchForm" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
|
|
@@ -214,11 +220,12 @@ import invoiceModal from './invoiceModal.vue'
|
|
import plInvoiceModal from './plInvoiceModal.vue'
|
|
import plInvoiceModal from './plInvoiceModal.vue'
|
|
import noteModal from './noteModal.vue'
|
|
import noteModal from './noteModal.vue'
|
|
import printModal from './printModal.vue'
|
|
import printModal from './printModal.vue'
|
|
|
|
+import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
import { financeBookDetailQueryPage, financeBookDetailExport, financeBookReportDetailCount, financeBookDetailUpdateBatch } from '@/api/financeBook.js'
|
|
import { financeBookDetailQueryPage, financeBookDetailExport, financeBookReportDetailCount, financeBookDetailUpdateBatch } from '@/api/financeBook.js'
|
|
export default {
|
|
export default {
|
|
name: 'CollectionDetailStaticList',
|
|
name: 'CollectionDetailStaticList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area, invoiceModal, plInvoiceModal, noteModal, printModal },
|
|
|
|
|
|
+ components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area, invoiceModal, plInvoiceModal, noteModal, printModal, chooseWarehouse },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -238,7 +245,7 @@ export default {
|
|
fullPaymentFlag: undefined,
|
|
fullPaymentFlag: undefined,
|
|
bankAccount: undefined,
|
|
bankAccount: undefined,
|
|
bankName: undefined,
|
|
bankName: undefined,
|
|
- subareaArea:{
|
|
|
|
|
|
+ subareaArea: {
|
|
subareaSn: undefined,
|
|
subareaSn: undefined,
|
|
subareaAreaSn: undefined
|
|
subareaAreaSn: undefined
|
|
},
|
|
},
|
|
@@ -248,7 +255,8 @@ export default {
|
|
invoiceDateType: undefined,
|
|
invoiceDateType: undefined,
|
|
invoiceBeginDate: '',
|
|
invoiceBeginDate: '',
|
|
invoiceEndDate: '',
|
|
invoiceEndDate: '',
|
|
- payerType: undefined
|
|
|
|
|
|
+ payerType: undefined,
|
|
|
|
+ warehouseSn: undefined // 仓库
|
|
},
|
|
},
|
|
invoiceIsShow: false,
|
|
invoiceIsShow: false,
|
|
noteIsShow: false,
|
|
noteIsShow: false,
|
|
@@ -321,6 +329,7 @@ export default {
|
|
{ title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收款单号', dataIndex: 'bookNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收款单号', dataIndex: 'bookNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '申请人', dataIndex: 'applyPersonName', align: 'center', width: '5%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '申请人', dataIndex: 'applyPersonName', align: 'center', width: '5%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '收款事由', dataIndex: 'bookReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收款事由', dataIndex: 'bookReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收款日期', dataIndex: 'receiptDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收款日期', dataIndex: 'receiptDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '付款方类型', dataIndex: 'payerTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
|
|
{ title: '付款方类型', dataIndex: 'payerTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
|
|
@@ -352,7 +361,7 @@ export default {
|
|
this.noteIsShow = false
|
|
this.noteIsShow = false
|
|
this.printIsShow = false
|
|
this.printIsShow = false
|
|
this.plinvoiceIsShow = false
|
|
this.plinvoiceIsShow = false
|
|
- if(flag === 1){
|
|
|
|
|
|
+ if (flag === 1) {
|
|
this.searchForm()
|
|
this.searchForm()
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -371,9 +380,9 @@ export default {
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
|
|
|
|
- if(e.key == 1){ // 批量允许打印
|
|
|
|
- const dataList = rows.filter(item => !(item.printStatus=='NO_PRINT' || item.printStatus=='PRINT'))
|
|
|
|
- if(dataList.length){
|
|
|
|
|
|
+ if (e.key == 1) { // 批量允许打印
|
|
|
|
+ const dataList = rows.filter(item => !(item.printStatus == 'NO_PRINT' || item.printStatus == 'PRINT'))
|
|
|
|
+ if (dataList.length) {
|
|
this.$confirm({
|
|
this.$confirm({
|
|
title: '批量允许打印',
|
|
title: '批量允许打印',
|
|
content: `已选有效数据 ${dataList.length} 条,确认将收款打印状态变更为允许打印吗?`,
|
|
content: `已选有效数据 ${dataList.length} 条,确认将收款打印状态变更为允许打印吗?`,
|
|
@@ -384,37 +393,37 @@ export default {
|
|
// 批量允许打印接口
|
|
// 批量允许打印接口
|
|
const data = []
|
|
const data = []
|
|
dataList.map(item => {
|
|
dataList.map(item => {
|
|
- data.push({id: item.id, printStatus: 'NO_PRINT' })
|
|
|
|
|
|
+ data.push({ id: item.id, printStatus: 'NO_PRINT' })
|
|
})
|
|
})
|
|
_this.plUpdateStatus(data)
|
|
_this.plUpdateStatus(data)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
_this.$message.warning('没有可操作的有效数据!')
|
|
_this.$message.warning('没有可操作的有效数据!')
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if(e.key == 2){ // 批量开票
|
|
|
|
|
|
+ if (e.key == 2) { // 批量开票
|
|
const data = []
|
|
const data = []
|
|
rows.map(item => {
|
|
rows.map(item => {
|
|
- data.push({id: item.id, invoiceDate: '', remarks: '' })
|
|
|
|
|
|
+ data.push({ id: item.id, invoiceDate: '', remarks: '' })
|
|
})
|
|
})
|
|
_this.plinvoiceInfo = data
|
|
_this.plinvoiceInfo = data
|
|
_this.plinvoiceIsShow = true
|
|
_this.plinvoiceIsShow = true
|
|
}
|
|
}
|
|
},
|
|
},
|
|
// 批量操作
|
|
// 批量操作
|
|
- plUpdateStatus(data){
|
|
|
|
|
|
+ plUpdateStatus (data) {
|
|
this.spinning = true
|
|
this.spinning = true
|
|
financeBookDetailUpdateBatch(data).then(res => {
|
|
financeBookDetailUpdateBatch(data).then(res => {
|
|
- if(res.status == 200){
|
|
|
|
|
|
+ if (res.status == 200) {
|
|
this.searchForm()
|
|
this.searchForm()
|
|
}
|
|
}
|
|
this.spinning = false
|
|
this.spinning = false
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 确定批量开票
|
|
// 确定批量开票
|
|
- plinvoiceOk(data){
|
|
|
|
|
|
+ plinvoiceOk (data) {
|
|
this.plinvoiceInfo.map(item => {
|
|
this.plinvoiceInfo.map(item => {
|
|
item.invoiceDate = data.invoiceDate
|
|
item.invoiceDate = data.invoiceDate
|
|
item.remarks = data.remarks
|
|
item.remarks = data.remarks
|
|
@@ -450,11 +459,11 @@ export default {
|
|
this.queryParam.auditBeginDate = date[0] ? date[0] : ''
|
|
this.queryParam.auditBeginDate = date[0] ? date[0] : ''
|
|
this.queryParam.auditEndDate = date[1] ? date[1] : ''
|
|
this.queryParam.auditEndDate = date[1] ? date[1] : ''
|
|
},
|
|
},
|
|
- searchForm(){
|
|
|
|
|
|
+ searchForm () {
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.clearSelected()
|
|
this.$refs.table.clearSelected()
|
|
},
|
|
},
|
|
- subareaChange(val){
|
|
|
|
|
|
+ subareaChange (val) {
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
},
|
|
},
|
|
@@ -499,7 +508,8 @@ export default {
|
|
this.queryParam.printStatus = undefined
|
|
this.queryParam.printStatus = undefined
|
|
this.queryParam.invoiceStatus = undefined
|
|
this.queryParam.invoiceStatus = undefined
|
|
this.queryParam.payerType = undefined
|
|
this.queryParam.payerType = undefined
|
|
- if(this.advanced){
|
|
|
|
|
|
+ this.queryParam.warehouseSn = undefined
|
|
|
|
+ if (this.advanced) {
|
|
this.$refs.subarea.clearData()
|
|
this.$refs.subarea.clearData()
|
|
}
|
|
}
|
|
this.searchForm()
|
|
this.searchForm()
|
|
@@ -533,7 +543,7 @@ export default {
|
|
payerName: con.payerName,
|
|
payerName: con.payerName,
|
|
bookDetailSn: con.bookDetailSn,
|
|
bookDetailSn: con.bookDetailSn,
|
|
invoiceDate: con.invoiceDate,
|
|
invoiceDate: con.invoiceDate,
|
|
- remarks: con.remarks ? con.remarks : '',
|
|
|
|
|
|
+ remarks: con.remarks ? con.remarks : ''
|
|
}
|
|
}
|
|
this.invoiceInfo = obj
|
|
this.invoiceInfo = obj
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|