diff --git a/src/views/away/index.vue b/src/views/away/index.vue index 1b0c142..a35b668 100644 --- a/src/views/away/index.vue +++ b/src/views/away/index.vue @@ -310,6 +310,12 @@ export default { MultiExamineList }, data() { + // { + // ((this.$moment().diff(this.$moment(row.end_date), 'days') <= 30) || (row.FLOWSTATUS.expense.getStatus() === 1)) + // ? ({ this.flowStatus.get(row.FLOWSTATUS.expense.getStatus()) || '待申请' }) + // : (超时未办理) + // } + //
return { flowConfig: [], isShowOaModal: false, @@ -428,12 +434,6 @@ export default { customFn: row => { return (
- { - ((this.$moment().diff(this.$moment(row.end_date), 'days') <= 30) || (row.FLOWSTATUS.expense.getStatus() === 1)) - ? ({ this.flowStatus.get(row.FLOWSTATUS.expense.getStatus()) || '待申请' }) - : (超时未办理) - } -
{ (row.FLOWSTATUS.expense.getStatus() !== 2 && row.FLOWSTATUS.expense.getStatus() !== -2) ? { this.toOaDetail('expense', row) @@ -565,8 +565,9 @@ export default { } }, isAuthCanExpense() { + // (this.$moment().diff(this.$moment(row.end_date), 'days') > 30) && return function(row) { - return (this.$moment().diff(this.$moment(row.end_date), 'days') > 30) && this.$store.state.user.adminId === 1 && !row.can_expenses + return this.$store.state.user.adminId === 1 && !row.can_expenses } } }, @@ -780,7 +781,8 @@ export default { flowStatus.away.setExecutable(true) } flowStatus.expense.setStatus(chuchaibaoxiao?.flow_status ?? 2) - if (chuchai?.flow_status === 1 && (!chuchaibaoxiao || chuchaibaoxiao.flow_stauts === 2) && (this.$moment().diff(this.$moment(item.end_date), 'days') <= 30 || item.can_expenses)) { + // && (this.$moment().diff(this.$moment(item.end_date), 'days') <= 30 || item.can_expenses) + if (chuchai?.flow_status === 1 && (!chuchaibaoxiao || chuchaibaoxiao.flow_stauts === 2)) { flowStatus.expense.setExecutable(true) }