|
|
@@ -369,7 +369,7 @@
|
|
|
// 获取用户部门信息
|
|
|
getOrgInfo() {
|
|
|
const { org = {} } = this.$store.getters
|
|
|
- if (!org.id) {
|
|
|
+ if (!org || !org.id) {
|
|
|
return
|
|
|
}
|
|
|
let params = {
|
|
|
@@ -472,8 +472,7 @@
|
|
|
if (this.activeTab === 'finish') {
|
|
|
params.end = '1'
|
|
|
}
|
|
|
- let s = this.activeTab === 'wait' ? {createTime: 'DESC'} : this.sorts
|
|
|
- return ActionUtils.formatParams(params, pagination, s)
|
|
|
+ return ActionUtils.formatParams(params, pagination, this.sorts)
|
|
|
},
|
|
|
// 处理表格点击事件
|
|
|
handleLinkClick(data) {
|
|
|
@@ -577,7 +576,7 @@
|
|
|
let a = new Date(time).getTime()
|
|
|
let b = new Date(current).getTime()
|
|
|
// 创建时间当月最后一天的时间戳
|
|
|
- let c = new Date(D.getFullYear(), D.getMonth() + 1, 0).getTime()
|
|
|
+ let c = new Date(D.getFullYear(), D.getMonth() + 1, 0).getTime() + 86400000
|
|
|
// 返回办理状态
|
|
|
if (isState) {
|
|
|
let state = ''
|
cfort