|
@@ -28,13 +28,13 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="费用类型">
|
|
<a-form-item label="费用类型">
|
|
- <v-select
|
|
|
|
- v-model="queryParam.expenseType"
|
|
|
|
- ref="expenseType"
|
|
|
|
|
|
+ <expenseType
|
|
id="expenseReimbursementDetailList-expenseType"
|
|
id="expenseReimbursementDetailList-expenseType"
|
|
- code="EXPENSE_TYPE"
|
|
|
|
|
|
+ v-model="expenseTypes"
|
|
|
|
+ :changeOnSelect="true"
|
|
|
|
+ @change="expenseChange"
|
|
placeholder="请选择费用类型"
|
|
placeholder="请选择费用类型"
|
|
- allowClear></v-select>
|
|
|
|
|
|
+ ></expenseType>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -168,7 +168,7 @@
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
- :scroll="{ y: tableHeight,x:2010 }"
|
|
|
|
|
|
+ :scroll="{ y: tableHeight,x:2250 }"
|
|
:defaultLoadData="false"
|
|
:defaultLoadData="false"
|
|
bordered>
|
|
bordered>
|
|
</s-table>
|
|
</s-table>
|
|
@@ -189,13 +189,14 @@ import department from '../expenseReimbursement/department.js'
|
|
import employee from '../expenseReimbursement/employee.js'
|
|
import employee from '../expenseReimbursement/employee.js'
|
|
import custList from '@/views/common/custList.vue'
|
|
import custList from '@/views/common/custList.vue'
|
|
import supplier from '@/views/common/supplier.js'
|
|
import supplier from '@/views/common/supplier.js'
|
|
|
|
+import expenseType from '@/views/common/expenseType.js'
|
|
import { expenseAccountDetailList, expenseAcctDetailReport, expenseAccountDetailCount } from '@/api/expenseManagement'
|
|
import { expenseAccountDetailList, expenseAcctDetailReport, expenseAccountDetailCount } from '@/api/expenseManagement'
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
moment.locale('zh-cn')
|
|
moment.locale('zh-cn')
|
|
export default {
|
|
export default {
|
|
name: 'ExpenseReimbursementDetailList',
|
|
name: 'ExpenseReimbursementDetailList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier },
|
|
|
|
|
|
+ components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -209,6 +210,7 @@ export default {
|
|
moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
],
|
|
],
|
|
countData: null,
|
|
countData: null,
|
|
|
|
+ expenseTypes: [],
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParam: {
|
|
queryParam: {
|
|
expenseDate: undefined, // 月份
|
|
expenseDate: undefined, // 月份
|
|
@@ -218,6 +220,7 @@ export default {
|
|
applyPersonSn: undefined, // 申请人
|
|
applyPersonSn: undefined, // 申请人
|
|
applyDepartmentSn: undefined, // 申请部门
|
|
applyDepartmentSn: undefined, // 申请部门
|
|
expenseType: undefined, // 费用类型
|
|
expenseType: undefined, // 费用类型
|
|
|
|
+ xpenseType2: undefined, // 费用类型
|
|
accountType: undefined, // 记账类型
|
|
accountType: undefined, // 记账类型
|
|
accountNameSn: undefined, // 记账名称
|
|
accountNameSn: undefined, // 记账名称
|
|
splitObjType: undefined, // 费用承担方类型
|
|
splitObjType: undefined, // 费用承担方类型
|
|
@@ -262,9 +265,11 @@ export default {
|
|
{ title: '费用单号', dataIndex: 'expenseAccountNo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '费用单号', dataIndex: 'expenseAccountNo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '申请人', dataIndex: 'applyPersonName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '申请人', dataIndex: 'applyPersonName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '申请部门', dataIndex: 'applyDepartmentName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '申请部门', dataIndex: 'applyDepartmentName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '费用类型', dataIndex: 'expenseTypeDictValue', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '费用类型(一级)', dataIndex: 'expenseTypeName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '费用类型(二级)', dataIndex: 'expenseTypeName2', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '费用发生月份', dataIndex: 'expenseDate', width: 90, align: 'center', customRender: function (text) { return moment(text).format('YYYY年MM月') || '--' } },
|
|
{ title: '费用发生月份', dataIndex: 'expenseDate', width: 90, align: 'center', customRender: function (text) { return moment(text).format('YYYY年MM月') || '--' } },
|
|
{ title: '主题', dataIndex: 'title', align: 'center', width: 150, customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '主题', dataIndex: 'title', align: 'center', width: 150, customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '详细说明', dataIndex: 'content', align: 'center', width: 150, customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '记账类型', dataIndex: 'accountTypeDictValue', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '记账类型', dataIndex: 'accountTypeDictValue', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '记账名称', dataIndex: 'accountName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '记账名称', dataIndex: 'accountName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '财务编码', dataIndex: 'accountNameFnumber', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '财务编码', dataIndex: 'accountNameFnumber', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -289,6 +294,12 @@ export default {
|
|
onChange (date, dateString) {
|
|
onChange (date, dateString) {
|
|
this.queryParam.expenseDate = dateString
|
|
this.queryParam.expenseDate = dateString
|
|
},
|
|
},
|
|
|
|
+ expenseChange (val, opts) {
|
|
|
|
+ console.log(val, opts)
|
|
|
|
+ this.expenseTypes = val || []
|
|
|
|
+ this.queryParam.expenseType = val && val[0] ? val[0] : ''
|
|
|
|
+ this.queryParam.expenseType2 = val && val[1] ? val[1] : ''
|
|
|
|
+ },
|
|
custChange (val) {
|
|
custChange (val) {
|
|
this.queryParam.splitObjSn = val.key
|
|
this.queryParam.splitObjSn = val.key
|
|
},
|
|
},
|
|
@@ -345,6 +356,7 @@ export default {
|
|
applyPersonSn: undefined, // 申请人
|
|
applyPersonSn: undefined, // 申请人
|
|
applyDepartmentSn: undefined, // 申请部门
|
|
applyDepartmentSn: undefined, // 申请部门
|
|
expenseType: undefined, // 费用类型
|
|
expenseType: undefined, // 费用类型
|
|
|
|
+ expenseType2: undefined, // 费用类型2
|
|
accountType: undefined, // 记账类型
|
|
accountType: undefined, // 记账类型
|
|
accountNameSn: undefined, // 记账名称
|
|
accountNameSn: undefined, // 记账名称
|
|
splitObjType: undefined, // 费用承担方类型
|
|
splitObjType: undefined, // 费用承担方类型
|
|
@@ -356,6 +368,7 @@ export default {
|
|
provinceSn: undefined,
|
|
provinceSn: undefined,
|
|
citySn: undefined
|
|
citySn: undefined
|
|
}
|
|
}
|
|
|
|
+ this.expenseTypes = []
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
pageInit () {
|
|
pageInit () {
|
|
@@ -366,7 +379,7 @@ export default {
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 195
|
|
|
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 215
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|