|
|
@@ -47,8 +47,13 @@
|
|
|
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
|
|
|
- <el-button type="primary" style="margin-right: 40px;" @click="queryData">查询</el-button>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="2" class="u-f u-f-je" style="height: 40px;">
|
|
|
+ <el-button type="primary" icon="el-icon-arrow-left" size="mini" @click="returnUpper">返回上层</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="22" class="u-f u-f-je" style="height: 40px;">
|
|
|
+ <el-button type="primary" style="margin-right: 40px;" @click="queryData">查询</el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
@@ -128,8 +133,14 @@
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
isDrilling:"0",//是否下钻查询
|
|
|
+ isReturnBack:"0"//是否返回上层
|
|
|
},
|
|
|
dataList: [],//查询结果数据
|
|
|
+ //返回上层查询对象
|
|
|
+ returnForm:{
|
|
|
+ deptId: "",
|
|
|
+ teamCode:"",
|
|
|
+ }
|
|
|
};
|
|
|
},
|
|
|
created(){
|
|
|
@@ -152,6 +163,13 @@
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
+ //返回上层
|
|
|
+ returnUpper(){
|
|
|
+ this.queryForm.isReturnBack="1";
|
|
|
+ this.queryForm.deptId= this.returnForm.deptId;
|
|
|
+ this.queryForm.teamCode= this.returnForm.teamCode;
|
|
|
+ this.findPage();
|
|
|
+ },
|
|
|
// 按照查询条件查询
|
|
|
drillingData(obj,type) {
|
|
|
this.queryForm.pageNum = 1;
|
|
|
@@ -160,6 +178,7 @@
|
|
|
this.queryForm.userId="";
|
|
|
this.queryForm.teamCode="";
|
|
|
this.queryForm.deptId="";
|
|
|
+ this.queryForm.isReturnBack="0";
|
|
|
if(type=='jg'){
|
|
|
this.queryForm.deptId=obj.institutionId;
|
|
|
}else if(type='td'){
|
|
|
@@ -236,6 +255,7 @@
|
|
|
this.queryForm.pageNum = 1;
|
|
|
this.queryForm.pageSize = 10;
|
|
|
this.queryForm.isDrilling="0";
|
|
|
+ this.queryForm.isReturnBack="0";
|
|
|
this.findPage();
|
|
|
},
|
|
|
//数据
|
|
|
@@ -245,6 +265,10 @@
|
|
|
if (res.code == "200") {
|
|
|
this.loading = false;
|
|
|
this.dataList = res.data.content;
|
|
|
+ for(let item of this.dataList){
|
|
|
+ this.returnForm.deptId=item.institutionId;
|
|
|
+ this.returnForm.teamCode=item.deptId;
|
|
|
+ }
|
|
|
this.currentPage = res.data.pageNum;
|
|
|
this.totalSum = res.data.totalSize;
|
|
|
} else {
|