|
|
@@ -29,7 +29,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="完成状态" prop="name">
|
|
|
- <el-select @change="changecompletionstatus" size="medium" filterable
|
|
|
+ <el-select @change="changetasknames" size="medium" filterable
|
|
|
v-model="completionstatus" placeholder="请选择">
|
|
|
<el-option v-for="item in completionstatuslist" :key="item.id" :label="item.name"
|
|
|
:value="item.id">
|
|
|
@@ -37,7 +37,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="人员名称" prop="name">
|
|
|
- <el-select @change="changecompletionstatus" size="medium" filterable
|
|
|
+ <el-select @change="changetasknames" size="medium" filterable
|
|
|
v-model="taskUserId" placeholder="请选择">
|
|
|
<el-option v-for="item in taskUserIdArr" :key="item.id" :label="item.name"
|
|
|
:value="item.id">
|
|
|
@@ -360,19 +360,12 @@ export default {
|
|
|
if(to.name!='MyTasksinif'||to.name!='AssignTasks'){
|
|
|
from.meta.keepAlive = false;
|
|
|
}
|
|
|
+ if(to.name!='MyTasksinif'&&to.name!='AssignTasks'){
|
|
|
+ localStorage.removeItem('cacheobg');
|
|
|
+ }
|
|
|
next()
|
|
|
},
|
|
|
beforeRouteEnter(to, from, next) {
|
|
|
- // console.log(to)
|
|
|
- // console.log(from)
|
|
|
- // if(from.name=='MyTasksinif'){
|
|
|
- // to.meta.keepAlive=true;
|
|
|
- // //判断是从哪个路由过来的,
|
|
|
- // }else{
|
|
|
- // to.meta.keepAlive=false;
|
|
|
- // }
|
|
|
- console.log(to)
|
|
|
- console.log(from)
|
|
|
next();
|
|
|
},
|
|
|
data () {
|
|
|
@@ -467,7 +460,6 @@ export default {
|
|
|
userId: that.userId
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
- console.log(res)
|
|
|
if(res.data.code==200){
|
|
|
that.tasknamelist=res.data.data.taskNameInfos;
|
|
|
that.PostTaskAllocationPage()
|
|
|
@@ -485,6 +477,12 @@ export default {
|
|
|
}else{
|
|
|
this.assignmenttype=2;
|
|
|
}
|
|
|
+ var cacheobg=JSON.parse(localStorage.getItem('cacheobg'))
|
|
|
+ if (cacheobg!=null) {
|
|
|
+ this.completionstatus=cacheobg.status;
|
|
|
+ this.tasknames=cacheobg.taskName;
|
|
|
+ this.taskUserId=cacheobg.taskUserId;
|
|
|
+ }
|
|
|
var url = "/api/PersonnelModule/PostTaskAllocationPage"
|
|
|
var that = this
|
|
|
this.$axios({
|
|
|
@@ -576,16 +574,21 @@ export default {
|
|
|
},
|
|
|
changetasknames(){
|
|
|
this.currentPage = 1;
|
|
|
+ var cacheobg={}
|
|
|
+ cacheobg.status=this.completionstatus;
|
|
|
+ cacheobg.taskName=this.tasknames;
|
|
|
+ cacheobg.taskUserId=this.taskUserId;
|
|
|
+ localStorage.setItem('cacheobg', JSON.stringify(cacheobg));
|
|
|
this.PostTaskAllocationPage()
|
|
|
},
|
|
|
- changecompletionstatus(){
|
|
|
- this.currentPage = 1;
|
|
|
- this.PostTaskAllocationPage()
|
|
|
- },
|
|
|
- changeassignmenttype(){
|
|
|
- this.currentPage = 1;
|
|
|
- this.PostTaskAllocationPage()
|
|
|
- },
|
|
|
+ // changecompletionstatus(){
|
|
|
+ // this.currentPage = 1;
|
|
|
+ // this.PostTaskAllocationPage()
|
|
|
+ // },
|
|
|
+ // changeassignmenttype(){
|
|
|
+ // this.currentPage = 1;
|
|
|
+ // this.PostTaskAllocationPage()
|
|
|
+ // },
|
|
|
//编辑
|
|
|
taskedit(index,val){
|
|
|
// this.$router.push({path: '/home/AssignTasks?id='+val.id+''});
|