|
|
@ -348,6 +348,9 @@ export default { |
|
|
...mapGetters(["userInfo", "roles"]), |
|
|
...mapGetters(["userInfo", "roles"]), |
|
|
tasksTreeData() { |
|
|
tasksTreeData() { |
|
|
let xmTasks = JSON.parse(JSON.stringify(this.xmTasks || [])); |
|
|
let xmTasks = JSON.parse(JSON.stringify(this.xmTasks || [])); |
|
|
|
|
|
if(this.filters.key){ |
|
|
|
|
|
xmTasks=xmTasks.filter(k=>k.name.indexOf(this.filters.key)>=0) |
|
|
|
|
|
} |
|
|
const tasksTreeData = treeTool.translateDataToTree(xmTasks,"parentTaskid","id"); |
|
|
const tasksTreeData = treeTool.translateDataToTree(xmTasks,"parentTaskid","id"); |
|
|
return tasksTreeData; |
|
|
return tasksTreeData; |
|
|
}, |
|
|
}, |
|
|
@ -418,8 +421,8 @@ export default { |
|
|
pageInfo: { |
|
|
pageInfo: { |
|
|
//分页数据 |
|
|
//分页数据 |
|
|
total: 0, //服务器端收到0时,会自动计算总记录数,如果上传>0的不自动计算。 |
|
|
total: 0, //服务器端收到0时,会自动计算总记录数,如果上传>0的不自动计算。 |
|
|
pageSize: 100, //每页数据 |
|
|
|
|
|
count:true, //是否需要重新计算总记录数 |
|
|
|
|
|
|
|
|
pageSize: 500, //每页数据 |
|
|
|
|
|
count:false, //是否需要重新计算总记录数 |
|
|
pageNum: 1, //当前页码、从1开始计算 |
|
|
pageNum: 1, //当前页码、从1开始计算 |
|
|
orderFields: ["sort_level"], //排序列 如 ['sex','student_id'],必须为数据库字段 |
|
|
orderFields: ["sort_level"], //排序列 如 ['sex','student_id'],必须为数据库字段 |
|
|
orderDirs: ["asc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] |
|
|
orderDirs: ["asc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] |
|
|
@ -584,7 +587,7 @@ export default { |
|
|
this.getXmTasks(); |
|
|
this.getXmTasks(); |
|
|
}, |
|
|
}, |
|
|
searchXmTasks() { |
|
|
searchXmTasks() { |
|
|
this.pageInfo.count = true; |
|
|
|
|
|
|
|
|
//this.pageInfo.count = true; |
|
|
this.getXmTasks(); |
|
|
this.getXmTasks(); |
|
|
}, |
|
|
}, |
|
|
//获取列表 XmTask xm_task |
|
|
//获取列表 XmTask xm_task |
|
|
@ -1063,9 +1066,7 @@ export default { |
|
|
if (this.filters.skillTags && this.filters.skillTags.length > 0) { |
|
|
if (this.filters.skillTags && this.filters.skillTags.length > 0) { |
|
|
params.skillIds = this.filters.skillTags.map((i) => i.skillId); |
|
|
params.skillIds = this.filters.skillTags.map((i) => i.skillId); |
|
|
} |
|
|
} |
|
|
if (this.filters.key) { |
|
|
|
|
|
params.key = "%" + this.filters.key + "%"; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (this.filters.taskOut) { |
|
|
if (this.filters.taskOut) { |
|
|
params.taskOut = this.filters.taskOut; |
|
|
params.taskOut = this.filters.taskOut; |
|
|
} |
|
|
} |
|
|
|