|
@@ -15,9 +15,9 @@
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="单据类型">
|
|
|
<v-select
|
|
|
- v-model="queryParam.state"
|
|
|
- ref="state"
|
|
|
- id="fundAcountDetail-state"
|
|
|
+ v-model="queryParam.bizType"
|
|
|
+ ref="bizType"
|
|
|
+ id="fundAcountDetail-bizType"
|
|
|
code="EXPENSE_AUDIT_TYPE"
|
|
|
placeholder="请选择单据类型"
|
|
|
allowClear></v-select>
|
|
@@ -25,18 +25,18 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="关联单据号">
|
|
|
- <a-input id="fundAcountDetail-accountExpensesNo" v-model.trim="queryParam.accountExpensesNo" allowClear placeholder="请输入关联单据号"/>
|
|
|
+ <a-input id="fundAcountDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单据号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="操作时间">
|
|
|
- <rangeDate id="fundAcountDetail-accountExpensesNo" ref="rangeDate" @change="dateChange" />
|
|
|
+ <rangeDate id="fundAcountDetail-settleTime" ref="rangeDate" @change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="往来单位">
|
|
|
- <a-input id="fundAcountDetail-accountExpensesNo" v-model.trim="queryParam.accountExpensesNo" allowClear placeholder="请输入往来单位名称"/>
|
|
|
+ <a-input id="fundAcountDetail-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入往来单位名称"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
@@ -79,8 +79,7 @@
|
|
|
import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
-import { settleExpenseQuery, delExpense, settleExpenseQuerySum, auditExpense } from '@/api/settleExpense'
|
|
|
-import { costTypeAllQuery } from '@/api/costType'
|
|
|
+import { findSettleFlowPage } from '@/api/settleAcount'
|
|
|
export default {
|
|
|
name: 'ExpenseManagementList',
|
|
|
components: { STable, VSelect, rangeDate },
|
|
@@ -113,28 +112,26 @@ export default {
|
|
|
queryParam: {
|
|
|
beginDate: '',
|
|
|
endDate: '',
|
|
|
- accountExpensesNo: '',
|
|
|
- expensesTypeSn1: '',
|
|
|
- expensesTypeSn2: '',
|
|
|
- expensesTypeSn3: '',
|
|
|
- state: '',
|
|
|
- settleState: ''
|
|
|
+ bizType: '',
|
|
|
+ bizNo: '',
|
|
|
+ settleClientName: ''
|
|
|
},
|
|
|
// 表头
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
|
- { title: '单据类型', scopedSlots: { customRender: 'expensesType' }, width: '20%', align: 'center' },
|
|
|
- { title: '关联单据号', dataIndex: 'accountExpensesNo', width: '20%', align: 'center' },
|
|
|
- { title: '操作时间', dataIndex: 'createDate', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '操作人', dataIndex: 'czr', width: '20%', align: 'center' },
|
|
|
- { title: '往来单位', dataIndex: 'accountExpensesNo', width: '20%', align: 'center' },
|
|
|
- { title: '结算金额', scopedSlots: { customRender: 'accountExpensesNo' }, dataIndex: 'settleAmount', width: '10%', align: 'center' }
|
|
|
+ { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '关联单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '操作时间', dataIndex: 'settleTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '操作人', dataIndex: 'operateName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '往来单位', dataIndex: 'settleClientName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '结算金额', dataIndex: 'settleAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
this.spinning = true
|
|
|
- return settleExpenseQuery(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ this.queryParam.settleAccountSn = this.$route.params.sn
|
|
|
+ return findSettleFlowPage(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
@@ -143,10 +140,6 @@ export default {
|
|
|
data.list[i].no = no + i + 1
|
|
|
}
|
|
|
this.disabled = false
|
|
|
- // 费用类型
|
|
|
- if (this.costTypeList.length == 0) {
|
|
|
- this.getCostTypeList()
|
|
|
- }
|
|
|
}
|
|
|
this.spinning = false
|
|
|
return data
|
|
@@ -162,46 +155,16 @@ export default {
|
|
|
this.queryParam.beginDate = date[0]
|
|
|
this.queryParam.endDate = date[1]
|
|
|
},
|
|
|
- // 递归函数
|
|
|
- recursionFun (data) {
|
|
|
- if (data) {
|
|
|
- data.map((item, index) => {
|
|
|
- if (item.children && item.children.length == 0) {
|
|
|
- delete item.children
|
|
|
- } else {
|
|
|
- this.recursionFun(item.children)
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
- },
|
|
|
- // 获取费用类型数据
|
|
|
- getCostTypeList () {
|
|
|
- costTypeAllQuery({}).then(res => {
|
|
|
- // 递归去除空children
|
|
|
- this.recursionFun(res.data)
|
|
|
- this.costTypeList = res.data
|
|
|
- })
|
|
|
- },
|
|
|
- // 费用类型 change
|
|
|
- changeCostType (val, opt) {
|
|
|
- this.queryParam.expensesTypeSn1 = val[0] ? val[0] : ''
|
|
|
- this.queryParam.expensesTypeSn2 = val[1] ? val[1] : ''
|
|
|
- this.queryParam.expensesTypeSn3 = val[2] ? val[2] : ''
|
|
|
- },
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.$refs.rangeDate.resetDate()
|
|
|
- this.queryParam.beginDate = ''
|
|
|
- this.queryParam.endDate = ''
|
|
|
- this.queryParam.accountExpensesNo = ''
|
|
|
- this.queryParam.expensesTypeSn1 = ''
|
|
|
- this.queryParam.expensesTypeSn2 = ''
|
|
|
- this.queryParam.expensesTypeSn3 = ''
|
|
|
- this.queryParam.state = ''
|
|
|
- this.queryParam.settleState = ''
|
|
|
- this.queryParam.beginDate = ''
|
|
|
- this.queryParam.endDate = ''
|
|
|
- this.costType = []
|
|
|
+ this.queryParam = {
|
|
|
+ beginDate: '',
|
|
|
+ endDate: '',
|
|
|
+ bizType: '',
|
|
|
+ bizNo: '',
|
|
|
+ settleClientName: ''
|
|
|
+ }
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
pageInit () {
|