|
|
@@ -537,7 +537,7 @@
|
|
|
if (type === 'plan') {
|
|
|
return b + (86400000 * 7) > c
|
|
|
} else {
|
|
|
- return a + (86400000 * 3) > b
|
|
|
+ return a + (86400000 * 3) < b
|
|
|
}
|
|
|
},
|
|
|
// 处理已过期数据
|
|
|
@@ -560,17 +560,23 @@
|
|
|
// 无部门信息的用户无往主管表加数据
|
|
|
if (this.orgInfo.groupID) {
|
|
|
let obj = {
|
|
|
- ren_wu_ming_cheng: item.subject,
|
|
|
- code_: item.workName,
|
|
|
+ // 完成名称
|
|
|
+ code_: item.subject,
|
|
|
+ // 事务说明
|
|
|
+ names_: item.subject.includes('#') ? item.subject.split('#')[1] : '',
|
|
|
+ // 任务名称
|
|
|
+ ren_wu_ming_cheng: item.workName,
|
|
|
chu_li_ren_: this.getInfoByName(item.ownerName, 'id'),
|
|
|
chu_li_ren_dian_h: this.getInfoByName(item.ownerName, 'phone'),
|
|
|
bu_men_: this.orgInfo.orgName,
|
|
|
bu_men_id_: this.orgInfo.groupID,
|
|
|
- zhu_guan_: this.orgInfo.id,
|
|
|
- zhu_guan_dian_hua: this.orgInfo.mobile,
|
|
|
+ // 主管ID与当前用户id相等时将主管ID设置为总裁【罗晓玲】的ID，主管电话设为空
|
|
|
+ zhu_guan_: this.orgInfo.id === userId ? '990927120278487040' : this.orgInfo.id,
|
|
|
+ zhu_guan_dian_hua: this.orgInfo.id === userId ? '' : this.orgInfo.mobile,
|
|
|
ren_wu_kai_shi_sh: item.createTime,
|
|
|
zhuang_tai_: `待${item.name}`,
|
|
|
shu_ju_id_: item.taskId,
|
|
|
+ // 任务类型
|
|
|
type_: item.workType
|
|
|
}
|
|
|
addList.push(obj)
|
|
|
@@ -588,6 +594,7 @@
|
|
|
tableName: 't_zgrwtxb',
|
|
|
paramWhere: addList
|
|
|
}
|
|
|
+ // console.log(addList, sendList)
|
|
|
if (addList.length) {
|
|
|
curdPost('add', JSON.stringify(addParams))
|
|
|
}
|
|
|
@@ -635,7 +642,7 @@
|
|
|
res.phone.push(t.phone)
|
|
|
}
|
|
|
})
|
|
|
- return res[type].join(',')
|
|
|
+ return res[type].filter(i => i).join(',')
|
|
|
}
|
|
|
}
|
|
|
}
|
cfort