|
|
@@ -12,7 +12,7 @@
|
|
|
<div class="selectsBlock">
|
|
|
<div class="selectLabel">项目筛选</div>
|
|
|
<el-select v-model="pavalues.value" @change="getData" placeholder="请选择">
|
|
|
- <el-option label="所有项目" :value="0"/>
|
|
|
+ <el-option label="所有项目" value=""/>
|
|
|
<el-option
|
|
|
v-for="item in options"
|
|
|
:key="item.courseId"
|
|
|
@@ -25,7 +25,7 @@
|
|
|
<div class="selectsBlock">
|
|
|
<div class="selectLabel">所在部门</div>
|
|
|
<el-select v-model="pavalues.value1" @change="getData" placeholder="请选择">
|
|
|
- <el-option label="所有部门" :value="0"/>
|
|
|
+ <el-option label="所有部门" value=""/>
|
|
|
<el-option
|
|
|
v-for="item in options1"
|
|
|
:key="item.id"
|
|
|
@@ -51,7 +51,7 @@
|
|
|
<div class="selectsBlock">
|
|
|
<div class="selectLabel">状态</div>
|
|
|
<el-select v-model="pavalues.value3" @change="getData" placeholder="请选择">
|
|
|
- <el-option label="所有状态" :value="99"/>
|
|
|
+ <el-option label="所有状态" value=""/>
|
|
|
<el-option label="未报销" :value="0"/>
|
|
|
<el-option label="已报销" :value="1"/>
|
|
|
</el-select>
|
|
|
@@ -317,10 +317,10 @@ import beUpload from '../../components/tool/beUpload'
|
|
|
tableData:[],
|
|
|
// 四个下拉框数据
|
|
|
pavalues:{
|
|
|
- value:0,//项目ID
|
|
|
- value1:0,//部门ID
|
|
|
+ value:'',//项目ID
|
|
|
+ value1:'',//部门ID
|
|
|
value2:'',//负责人
|
|
|
- value3:99,//状态
|
|
|
+ value3:'',//状态
|
|
|
},
|
|
|
Page:{
|
|
|
nowPage:1,
|
|
|
@@ -455,6 +455,10 @@ import beUpload from '../../components/tool/beUpload'
|
|
|
lim:this.Page.lim,
|
|
|
}).then(res=>{
|
|
|
let data = res.data;
|
|
|
+ if(data[0].length==0&&data[4][0]['total']!=0){
|
|
|
+ this.Page.nowPage = 1;
|
|
|
+ this.getData();
|
|
|
+ }
|
|
|
data[0].forEach(item=>item.reportFile = item.reportFile==''||item.reportFile==null?[]:JSON.parse(item.reportFile));
|
|
|
this.tableData = data[0];
|
|
|
this.options = data[1];
|
yuanyiming