Merge remote-tracking branch 'origin/main' into main
commit
8c370ead0e
|
@ -40,6 +40,7 @@ class ReimbursementTab extends React.Component<any, any> {
|
||||||
dataIndex: 'id',
|
dataIndex: 'id',
|
||||||
search: false,
|
search: false,
|
||||||
sorter: true,
|
sorter: true,
|
||||||
|
fixed: 'left',
|
||||||
//render: (_) => <a>{_}</a>,
|
//render: (_) => <a>{_}</a>,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -49,6 +50,7 @@ class ReimbursementTab extends React.Component<any, any> {
|
||||||
dataIndex: 'uploaderName',
|
dataIndex: 'uploaderName',
|
||||||
search: false,
|
search: false,
|
||||||
sorter: false,
|
sorter: false,
|
||||||
|
fixed: 'left',
|
||||||
//valueType: 'date',
|
//valueType: 'date',
|
||||||
//render: (_) => <>{_}天</>,
|
//render: (_) => <>{_}天</>,
|
||||||
},
|
},
|
||||||
|
@ -299,6 +301,7 @@ class ReimbursementTab extends React.Component<any, any> {
|
||||||
accessLevel={this.props.accessLevel}
|
accessLevel={this.props.accessLevel}
|
||||||
/>
|
/>
|
||||||
<ProTable<TableListItem>
|
<ProTable<TableListItem>
|
||||||
|
scroll={{x:1000}}
|
||||||
formRef={this.formRef}
|
formRef={this.formRef}
|
||||||
actionRef={this.tableAction}
|
actionRef={this.tableAction}
|
||||||
columns={this.columns}
|
columns={this.columns}
|
||||||
|
|
|
@ -115,6 +115,7 @@ class Subpage extends React.Component<any, any> {
|
||||||
dataIndex: 'id',
|
dataIndex: 'id',
|
||||||
search: false,
|
search: false,
|
||||||
sorter: true,
|
sorter: true,
|
||||||
|
fixed: 'left',
|
||||||
//render: (_) => <a>{_}</a>,
|
//render: (_) => <a>{_}</a>,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -122,6 +123,7 @@ class Subpage extends React.Component<any, any> {
|
||||||
width: 60,
|
width: 60,
|
||||||
dataIndex: 'OD',
|
dataIndex: 'OD',
|
||||||
search: false,
|
search: false,
|
||||||
|
fixed: 'left',
|
||||||
render: (_, row) => <>{row.OD[0] + (row.back ? " ⇌ " : " → ") + row.OD[1]}</>,
|
render: (_, row) => <>{row.OD[0] + (row.back ? " ⇌ " : " → ") + row.OD[1]}</>,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -373,6 +375,7 @@ class Subpage extends React.Component<any, any> {
|
||||||
accessLevel={0}
|
accessLevel={0}
|
||||||
/>
|
/>
|
||||||
<ProTable<TableListItem>
|
<ProTable<TableListItem>
|
||||||
|
scroll={{x:1000}}
|
||||||
actionRef={this.tableAction}
|
actionRef={this.tableAction}
|
||||||
columns={this.columns}
|
columns={this.columns}
|
||||||
request={async (params, sorter, filter) => {
|
request={async (params, sorter, filter) => {
|
||||||
|
|
Loading…
Reference in New Issue