|
|
@@ -93,9 +93,6 @@
|
|
|
:label="item.name"
|
|
|
:value="item.id"
|
|
|
></el-option>
|
|
|
- <!-- <el-option :label="$t('yi-ban')" :value="0"></el-option>
|
|
|
- <el-option :label="$t('cha-lv')" :value="1"></el-option>
|
|
|
- <el-option :label="$t('wai-bao')" :value="2"></el-option> -->
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
@@ -223,7 +220,7 @@
|
|
|
</el-form-item>
|
|
|
<!-- 费用主类型 -->
|
|
|
<el-form-item :label="'费用主类型'">
|
|
|
- <el-select size="small" v-model="expenseMainTypeValue" style="width: 150px">
|
|
|
+ <el-select size="small" v-model="queryExpenseMainType" style="width: 150px" clearable placeholder="全部类型">
|
|
|
<el-option
|
|
|
v-for="item in expenseMainTypes"
|
|
|
:key="item.id"
|
|
|
@@ -321,11 +318,12 @@
|
|
|
|
|
|
<!--工具条-->
|
|
|
<el-col :span="24" class="toolbar">
|
|
|
- <el-pagination
|
|
|
+ <el-pagination key="expenseListTblPager"
|
|
|
@size-change="handleSizeChange"
|
|
|
@current-change="handleCurrentChange"
|
|
|
:page-sizes="[20 , 50 , 80 , 100]"
|
|
|
:page-size="20"
|
|
|
+ :current-page.sync="page"
|
|
|
layout="total, sizes, prev, pager, next"
|
|
|
:total="total"
|
|
|
style="float:right;"
|
|
|
@@ -821,6 +819,7 @@ export default {
|
|
|
props: {},
|
|
|
data() {
|
|
|
return {
|
|
|
+ queryExpenseMainType: null,
|
|
|
denyReasonDialog: false,
|
|
|
denyForm:{
|
|
|
reason: '',
|
|
|
@@ -1531,7 +1530,7 @@ export default {
|
|
|
startDate: stat,
|
|
|
endDate: end,
|
|
|
ownerId:this.ownerId,
|
|
|
- type:this.expenseMainTypeValue,
|
|
|
+ type:this.queryExpenseMainType,
|
|
|
};
|
|
|
if (this.isAuditList) {
|
|
|
param.status = 1;
|
|
|
@@ -1685,6 +1684,7 @@ export default {
|
|
|
//分页
|
|
|
handleCurrentChange(val) {
|
|
|
this.page = val;
|
|
|
+ console.log('page=======',this.page);
|
|
|
this.getList();
|
|
|
},
|
|
|
|
|
|
@@ -1914,7 +1914,7 @@ export default {
|
|
|
const sums = [];
|
|
|
columns.forEach((column, index) => {
|
|
|
if (index === 0) {
|
|
|
- sums[index] = this.$t('other.totals');
|
|
|
+ sums[index] = '本页金额合计';//this.$t('other.totals');
|
|
|
return;
|
|
|
}
|
|
|
if(index === 1) {
|
|
|
@@ -1931,6 +1931,7 @@ export default {
|
|
|
var zhi = +sums[index] + 0
|
|
|
var sl = zhi.toFixed(2)
|
|
|
sl += this.$t('yuan');
|
|
|
+ sums[index] = sl;
|
|
|
} else {
|
|
|
sums[index] = '';
|
|
|
}
|
