|
|
@@ -382,7 +382,7 @@
|
|
|
// 获取用户部门信息
|
|
|
getOrgInfo() {
|
|
|
const { org = {} } = this.$store.getters
|
|
|
- if (!org.id) {
|
|
|
+ if (!org || !org.id) {
|
|
|
return
|
|
|
}
|
|
|
let params = {
|
|
|
@@ -432,7 +432,7 @@
|
|
|
dataResult[index].workType = dataResult[index].workName.includes('计划') ? 'plan' : 'normal'
|
|
|
dataResult[index].state = this.judgeExpire(dataResult[index].createTime, currentTime, dataResult[index].workType, '1')
|
|
|
})
|
|
|
- this.dataList = dataResult
|
|
|
+ this.dataList = dataResult.sort((a, b) => b.createTime.localeCompare(a.createTime))
|
|
|
this.paginate = pageResult
|
|
|
})
|
|
|
this.urgeToManager()
|
|
|
@@ -494,8 +494,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) {
|
|
|
@@ -600,7 +599,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