diff --git a/src/pages/reimbursement/approval/ReimbursementApproval.tsx b/src/pages/reimbursement/approval/ReimbursementApproval.tsx index 8578c2e..a346c71 100644 --- a/src/pages/reimbursement/approval/ReimbursementApproval.tsx +++ b/src/pages/reimbursement/approval/ReimbursementApproval.tsx @@ -44,7 +44,7 @@ class ReimbursementTab extends React.Component { { title: '申请人', - width: 60, + width: 80, dataIndex: 'uploaderName', search: false, sorter: false, @@ -53,14 +53,14 @@ class ReimbursementTab extends React.Component { }, { title: '行程', - width: 60, + width: 100, dataIndex: 'OD', search: false, render: (_, row) => <>{row.OD[0] + (row.back ? " ⇌ " : " → ") + row.OD[1]}, }, { title: '出发日期', - width: 70, + width: 80, dataIndex: 'beginDate', search: false, valueType: 'date', @@ -69,7 +69,7 @@ class ReimbursementTab extends React.Component { }, { title: '总金额', - width: 60, + width: 80, dataIndex: 'amount', search: false, render: (_, item) => @@ -83,7 +83,7 @@ class ReimbursementTab extends React.Component { }, { title: '状态', - width: 80, + width: 100, dataIndex: 'status', filters: true, onFilter: false, @@ -103,7 +103,7 @@ class ReimbursementTab extends React.Component { }, { title: '申请时间', - width: 80, + width: 120, dataIndex: 'submitDateTime', valueType: 'dateTime', search: false, @@ -235,7 +235,11 @@ class ReimbursementTab extends React.Component { else if (this.state.mode === 1) url = "approval/reimbursement/history" else { - if (store.getState().staff.managingDepartment?.departmentId !== 1) { + let d1 = store.getState().staff.managingDepartment + let d2 = store.getState().staff.staffDepartments + if ((d1 && d1.departmentId === 1) || (d2 && d2.find((value, index, obj) => value.departmentId === 1))) { + + } else { params['reimbursementSubmitDepartments'] = store.getState().staff.managingDepartment?.departmentId } url = "common/reimbursement"