|
|
@@ -250,6 +250,47 @@ export default {
|
|
|
// 获取数据列表
|
|
|
refreshList() {
|
|
|
this.loading = true;
|
|
|
+ //let loginUserId = this.$store.state.user.id // 获取当前登录用户id
|
|
|
+
|
|
|
+ console.log("this.sessionStorage", sessionStorage)
|
|
|
+ console.log(this.searchDates)
|
|
|
+ if(sessionStorage){
|
|
|
+ var beginDate = sessionStorage.getItem("beginDate")
|
|
|
+ var endDate = sessionStorage.getItem("endDate")
|
|
|
+ var title = sessionStorage.getItem("title")
|
|
|
+ var assigneeId = sessionStorage.getItem("assigneeId")
|
|
|
+ if(beginDate){
|
|
|
+ this.searchForm.beginDate = beginDate;
|
|
|
+ }
|
|
|
+ if(endDate){
|
|
|
+ this.searchForm.endDate = endDate;
|
|
|
+ }
|
|
|
+ if (beginDate && endDate){
|
|
|
+ var searchDates = []
|
|
|
+ searchDates.push(beginDate)
|
|
|
+ searchDates.push(endDate)
|
|
|
+ this.searchDates = searchDates
|
|
|
+ }
|
|
|
+ if(title){
|
|
|
+ this.searchForm.title = title;
|
|
|
+ }
|
|
|
+ if(assigneeId){
|
|
|
+ this.searchForm.assigneeId = assigneeId;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(this.searchForm.beginDate){
|
|
|
+ sessionStorage.setItem("beginDate",this.searchForm.beginDate)
|
|
|
+ }
|
|
|
+ if(this.searchForm.endDate){
|
|
|
+ sessionStorage.setItem("endDate",this.searchForm.endDate)
|
|
|
+ }
|
|
|
+ if(this.searchForm.title){
|
|
|
+ sessionStorage.setItem("title",this.searchForm.title)
|
|
|
+ }
|
|
|
+ if(this.searchForm.assigneeId){
|
|
|
+ sessionStorage.setItem("assigneeId",this.searchForm.assigneeId)
|
|
|
+ }
|
|
|
+
|
|
|
taskService
|
|
|
.todoList({
|
|
|
current: this.tablePage.currentPage,
|
|
|
@@ -263,19 +304,6 @@ export default {
|
|
|
this.tablePage.total = data.total;
|
|
|
this.loading = false;
|
|
|
});
|
|
|
- console.log(this.searchForm.assigneeId)
|
|
|
- //判断sessionStorage中是否有值
|
|
|
- if (JSON.stringify(sessionStorage)!=='{}'){
|
|
|
- //从sessionStorage中取出值
|
|
|
- let _obj = JSON.parse(sessionStorage.getItem('nowPageData'));
|
|
|
- //对sessionStorage中的值进行遍历
|
|
|
- Object.keys(this.searchParams).forEach((key) => {
|
|
|
- //将遍历后的值赋给当前页的筛选项
|
|
|
- this.searchParams[key] = _obj[key] || this.searchParams[key];
|
|
|
- });
|
|
|
- // 数据存放之后，清除缓存
|
|
|
- sessionStorage.removeItem('nowPageData');
|
|
|
- }
|
|
|
},
|
|
|
// 当前页
|
|
|
currentChangeHandle({ currentPage, pageSize }) {
|
|
|
@@ -347,6 +375,7 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
this.refreshList();
|
|
|
});
|
|
|
+ sessionStorage.clear()
|
|
|
},
|
|
|
openUserDia(){
|
|
|
this.$refs.userSelect2.init()
|
user5