|
@@ -12,7 +12,7 @@
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<div class="common-main">
|
|
<div class="common-main">
|
|
<div class="toolsBar">
|
|
<div class="toolsBar">
|
|
- <div v-if="handlePlData.length">{{ handlePlData[0].settleClientName }},共 {{ handlePlData && handlePlData.length }} 个备货单,合计 {{ totalAmount }} 元,已选择 {{ chooseData.length }} 个收款单</div>
|
|
|
|
|
|
+ <!-- <div v-if="handlePlData.length">{{ handlePlData[0].settleClientName }},共 {{ handlePlData && handlePlData.length }} 个备货单,合计 {{ totalAmount }} 元,已选择 {{ chooseData.length }} 个收款单</div> -->
|
|
<a-button type="primary" class="button-primary" @click="handleCommonOk">{{ okText }}</a-button>
|
|
<a-button type="primary" class="button-primary" @click="handleCommonOk">{{ okText }}</a-button>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
@@ -59,7 +59,7 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="申请时间">
|
|
<a-form-item label="申请时间">
|
|
- <rangeDate ref="rangeApply" :value="settleDate" @change="dateSettleChange" />
|
|
|
|
|
|
+ <rangeDate ref="rangeApply" :value="applyDate" @change="dateApplyChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -117,13 +117,16 @@
|
|
<script>
|
|
<script>
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import { financeBookQueryPage } from '@/api/financeBook.js'
|
|
import { financeBookQueryPage } from '@/api/financeBook.js'
|
|
|
|
+import rangeDate from '@/views/common/rangeDate.vue'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
import detailModal from '@/views/financialManagement/financialCollection/detail.vue'
|
|
import detailModal from '@/views/financialManagement/financialCollection/detail.vue'
|
|
|
|
+import moment from 'moment'
|
|
|
|
+import getDate from '@/libs/getDate.js'
|
|
import employee from '../../expenseManagement/expenseReimbursement/employee.js'
|
|
import employee from '../../expenseManagement/expenseReimbursement/employee.js'
|
|
import { settleReceiptBookBatch } from '@/api/settleReceipt'
|
|
import { settleReceiptBookBatch } from '@/api/settleReceipt'
|
|
export default {
|
|
export default {
|
|
name: 'GlDetailModal',
|
|
name: 'GlDetailModal',
|
|
- components: { STable, VSelect, employee, commonModal, detailModal },
|
|
|
|
|
|
+ components: { STable, VSelect, employee, commonModal, detailModal, rangeDate },
|
|
props: {
|
|
props: {
|
|
openModal: { // 弹框显示状态
|
|
openModal: { // 弹框显示状态
|
|
type: Boolean,
|
|
type: Boolean,
|
|
@@ -153,11 +156,17 @@ export default {
|
|
spinning: false,
|
|
spinning: false,
|
|
showDetailModal: false,
|
|
showDetailModal: false,
|
|
handlePlData: [],
|
|
handlePlData: [],
|
|
|
|
+ applyDate: [
|
|
|
|
+ moment(getDate.getCurrMonthDays().starttime, 'YYYY-MM-DD'),
|
|
|
|
+ moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
|
|
+ ],
|
|
queryParam: {
|
|
queryParam: {
|
|
bookNo: '',
|
|
bookNo: '',
|
|
bookReason: '',
|
|
bookReason: '',
|
|
applyPersonSn: undefined,
|
|
applyPersonSn: undefined,
|
|
- status: 'AUDIT_PASS'
|
|
|
|
|
|
+ status: 'AUDIT_PASS',
|
|
|
|
+ auditBeginDate: undefined,
|
|
|
|
+ auditEndDate: undefined
|
|
},
|
|
},
|
|
chooseData: [],
|
|
chooseData: [],
|
|
columns: [
|
|
columns: [
|
|
@@ -165,7 +174,7 @@ export default {
|
|
{ title: '收款单号', scopedSlots: { customRender: 'bookNo' }, width: '8%', align: 'center' },
|
|
{ title: '收款单号', scopedSlots: { customRender: 'bookNo' }, width: '8%', align: 'center' },
|
|
{ title: '申请人', dataIndex: 'applyPersonName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '申请人', dataIndex: 'applyPersonName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '财务收款事由', dataIndex: 'bookReason', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '财务收款事由', dataIndex: 'bookReason', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
- { title: '付款方', dataIndex: 'bookReason', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '付款方', dataIndex: 'payerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '订单总金额', dataIndex: 'orderTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '订单总金额', dataIndex: 'orderTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '收款总金额', dataIndex: 'receiptTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '收款总金额', dataIndex: 'receiptTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '使用授信总金额', dataIndex: 'useTotalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -221,6 +230,10 @@ export default {
|
|
this.handlePlData = data
|
|
this.handlePlData = data
|
|
this.snList = snList
|
|
this.snList = snList
|
|
},
|
|
},
|
|
|
|
+ dateApplyChange (date) {
|
|
|
|
+ this.queryParam.auditBeginDate = date[0]
|
|
|
|
+ this.queryParam.auditEndDate = date[1]
|
|
|
|
+ },
|
|
// 删除
|
|
// 删除
|
|
handleDel (row) {
|
|
handleDel (row) {
|
|
const i = this.chooseData.findIndex(item => row.bookSn == item.bookSn)
|
|
const i = this.chooseData.findIndex(item => row.bookSn == item.bookSn)
|