修正了全部记录
parent
ab4ebe68fa
commit
a18526141c
|
@ -44,7 +44,7 @@ class ReimbursementTab extends React.Component<any, any> {
|
||||||
|
|
||||||
{
|
{
|
||||||
title: '申请人',
|
title: '申请人',
|
||||||
width: 60,
|
width: 80,
|
||||||
dataIndex: 'uploaderName',
|
dataIndex: 'uploaderName',
|
||||||
search: false,
|
search: false,
|
||||||
sorter: false,
|
sorter: false,
|
||||||
|
@ -53,14 +53,14 @@ class ReimbursementTab extends React.Component<any, any> {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '行程',
|
title: '行程',
|
||||||
width: 60,
|
width: 100,
|
||||||
dataIndex: 'OD',
|
dataIndex: 'OD',
|
||||||
search: false,
|
search: false,
|
||||||
render: (_, row) => <>{row.OD[0] + (row.back ? " ⇌ " : " → ") + row.OD[1]}</>,
|
render: (_, row) => <>{row.OD[0] + (row.back ? " ⇌ " : " → ") + row.OD[1]}</>,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '出发日期',
|
title: '出发日期',
|
||||||
width: 70,
|
width: 80,
|
||||||
dataIndex: 'beginDate',
|
dataIndex: 'beginDate',
|
||||||
search: false,
|
search: false,
|
||||||
valueType: 'date',
|
valueType: 'date',
|
||||||
|
@ -69,7 +69,7 @@ class ReimbursementTab extends React.Component<any, any> {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '总金额',
|
title: '总金额',
|
||||||
width: 60,
|
width: 80,
|
||||||
dataIndex: 'amount',
|
dataIndex: 'amount',
|
||||||
search: false,
|
search: false,
|
||||||
render: (_, item) =>
|
render: (_, item) =>
|
||||||
|
@ -83,7 +83,7 @@ class ReimbursementTab extends React.Component<any, any> {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '状态',
|
title: '状态',
|
||||||
width: 80,
|
width: 100,
|
||||||
dataIndex: 'status',
|
dataIndex: 'status',
|
||||||
filters: true,
|
filters: true,
|
||||||
onFilter: false,
|
onFilter: false,
|
||||||
|
@ -103,7 +103,7 @@ class ReimbursementTab extends React.Component<any, any> {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '申请时间',
|
title: '申请时间',
|
||||||
width: 80,
|
width: 120,
|
||||||
dataIndex: 'submitDateTime',
|
dataIndex: 'submitDateTime',
|
||||||
valueType: 'dateTime',
|
valueType: 'dateTime',
|
||||||
search: false,
|
search: false,
|
||||||
|
@ -235,7 +235,11 @@ class ReimbursementTab extends React.Component<any, any> {
|
||||||
else if (this.state.mode === 1)
|
else if (this.state.mode === 1)
|
||||||
url = "approval/reimbursement/history"
|
url = "approval/reimbursement/history"
|
||||||
else {
|
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
|
params['reimbursementSubmitDepartments'] = store.getState().staff.managingDepartment?.departmentId
|
||||||
}
|
}
|
||||||
url = "common/reimbursement"
|
url = "common/reimbursement"
|
||||||
|
|
Loading…
Reference in New Issue