出差报销

master
lion 3 weeks ago
parent 3b9787d36c
commit 5e78e0029b

@ -310,6 +310,12 @@ export default {
MultiExamineList MultiExamineList
}, },
data() { data() {
// {
// ((this.$moment().diff(this.$moment(row.end_date), 'days') <= 30) || (row.FLOWSTATUS.expense.getStatus() === 1))
// ? (<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.expense.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.expense.getStatus()) || '' }</span>)
// : (<span style='color: red'></span>)
// }
// <br/>
return { return {
flowConfig: [], flowConfig: [],
isShowOaModal: false, isShowOaModal: false,
@ -428,12 +434,6 @@ export default {
customFn: row => { customFn: row => {
return ( return (
<div> <div>
{
((this.$moment().diff(this.$moment(row.end_date), 'days') <= 30) || (row.FLOWSTATUS.expense.getStatus() === 1))
? (<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.expense.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.expense.getStatus()) || '待申请' }</span>)
: (<span style='color: red'>超时未办理</span>)
}
<br/>
{ {
(row.FLOWSTATUS.expense.getStatus() !== 2 && row.FLOWSTATUS.expense.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => { (row.FLOWSTATUS.expense.getStatus() !== 2 && row.FLOWSTATUS.expense.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => {
this.toOaDetail('expense', row) this.toOaDetail('expense', row)
@ -565,8 +565,9 @@ export default {
} }
}, },
isAuthCanExpense() { isAuthCanExpense() {
// (this.$moment().diff(this.$moment(row.end_date), 'days') > 30) &&
return function(row) { 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.away.setExecutable(true)
} }
flowStatus.expense.setStatus(chuchaibaoxiao?.flow_status ?? 2) 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) flowStatus.expense.setExecutable(true)
} }

Loading…
Cancel
Save