|
@@ -85,8 +85,7 @@ const CompanyList: React.FC<ListProps> = ({ base, dispatch, pTypeList }) => {
|
|
|
managerID: record.manager.ID
|
|
|
})
|
|
|
}
|
|
|
- className="text-primary cursor-pointer"
|
|
|
- >
|
|
|
+ className="text-primary cursor-pointer">
|
|
|
{name}
|
|
|
</span>
|
|
|
)
|
|
@@ -99,16 +98,16 @@ const CompanyList: React.FC<ListProps> = ({ base, dispatch, pTypeList }) => {
|
|
|
{
|
|
|
dataIndex: 'institutionAcountTotal',
|
|
|
title: '人员账号',
|
|
|
-<<<<<<< HEAD
|
|
|
renderText: (text, record) => `${text}/${record.memberTotal}`
|
|
|
-=======
|
|
|
width: 96
|
|
|
->>>>>>> ba83460... feat: 调整表格、表单列宽
|
|
|
+ width: 96,
|
|
|
+ align: 'center'
|
|
|
},
|
|
|
{
|
|
|
dataIndex: 'createdTime',
|
|
|
title: '创建时间',
|
|
|
width: 106,
|
|
|
+ align: 'center',
|
|
|
renderText: text => dayjs(text).format('YYYY-MM-DD')
|
|
|
},
|
|
|
// {
|
|
@@ -128,12 +127,14 @@ const CompanyList: React.FC<ListProps> = ({ base, dispatch, pTypeList }) => {
|
|
|
{
|
|
|
dataIndex: 'created',
|
|
|
title: '创建人',
|
|
|
- width: 116
|
|
|
+ width: 116,
|
|
|
+ align: 'center'
|
|
|
},
|
|
|
{
|
|
|
title: '操作',
|
|
|
dataIndex: 'operation',
|
|
|
width: 61,
|
|
|
+ align: 'center',
|
|
|
render: (_, record) => (
|
|
|
<div className="divide-x divide-bg-gray-400 flex flex-row">
|
|
|
<div
|
|
@@ -145,8 +146,7 @@ const CompanyList: React.FC<ListProps> = ({ base, dispatch, pTypeList }) => {
|
|
|
currentModalType: ModalType.UPDATE,
|
|
|
defaultFormData: record
|
|
|
})
|
|
|
- }}
|
|
|
- >
|
|
|
+ }}>
|
|
|
编辑
|
|
|
</div>
|
|
|
{/* <Popconfirm
|
|
@@ -191,8 +191,9 @@ const CompanyList: React.FC<ListProps> = ({ base, dispatch, pTypeList }) => {
|
|
|
actions: [
|
|
|
<Button
|
|
|
type="primary"
|
|
|
- onClick={() => setState({ ...state, visible: true, currentModalType: ModalType.ADD })}
|
|
|
- >
|
|
|
+ onClick={() =>
|
|
|
+ setState({ ...state, visible: true, currentModalType: ModalType.ADD })
|
|
|
+ }>
|
|
|
新建企事业单位
|
|
|
</Button>
|
|
|
]
|
|
@@ -202,8 +203,7 @@ const CompanyList: React.FC<ListProps> = ({ base, dispatch, pTypeList }) => {
|
|
|
<AnimateContent
|
|
|
title={state.currentModalType === ModalType.ADD ? '新增企事业单位' : '编辑企事业单位'}
|
|
|
visible={state.visible}
|
|
|
- onVisibleChange={visible => setState({ ...state, visible })}
|
|
|
- >
|
|
|
+ onVisibleChange={visible => setState({ ...state, visible })}>
|
|
|
<CompanyDrawer
|
|
|
type={state.currentModalType}
|
|
|
defaultFormData={state.defaultFormData}
|