Merge remote-tracking branch 'origin/main' into main

main
wuyize 2023-01-08 16:23:43 +08:00
commit 8c370ead0e
2 changed files with 6 additions and 0 deletions

View File

@ -40,6 +40,7 @@ class ReimbursementTab extends React.Component<any, any> {
dataIndex: 'id',
search: false,
sorter: true,
fixed: 'left',
//render: (_) => <a>{_}</a>,
},
@ -49,6 +50,7 @@ class ReimbursementTab extends React.Component<any, any> {
dataIndex: 'uploaderName',
search: false,
sorter: false,
fixed: 'left',
//valueType: 'date',
//render: (_) => <>{_}天</>,
},
@ -299,6 +301,7 @@ class ReimbursementTab extends React.Component<any, any> {
accessLevel={this.props.accessLevel}
/>
<ProTable<TableListItem>
scroll={{x:1000}}
formRef={this.formRef}
actionRef={this.tableAction}
columns={this.columns}

View File

@ -115,6 +115,7 @@ class Subpage extends React.Component<any, any> {
dataIndex: 'id',
search: false,
sorter: true,
fixed: 'left',
//render: (_) => <a>{_}</a>,
},
{
@ -122,6 +123,7 @@ class Subpage extends React.Component<any, any> {
width: 60,
dataIndex: 'OD',
search: false,
fixed: 'left',
render: (_, row) => <>{row.OD[0] + (row.back ? " ⇌ " : " → ") + row.OD[1]}</>,
},
{
@ -373,6 +375,7 @@ class Subpage extends React.Component<any, any> {
accessLevel={0}
/>
<ProTable<TableListItem>
scroll={{x:1000}}
actionRef={this.tableAction}
columns={this.columns}
request={async (params, sorter, filter) => {