|
@@ -120,8 +120,7 @@ const CompanyTabList = ({
|
|
|
<div className="text-primary hover:text-[#967bbd] line-clamp-1">
|
|
<div className="text-primary hover:text-[#967bbd] line-clamp-1">
|
|
|
<span
|
|
<span
|
|
|
onClick={() => dispatchModal('D_CLIENT_DETAIL', { dataId: record.id })}
|
|
onClick={() => dispatchModal('D_CLIENT_DETAIL', { dataId: record.id })}
|
|
|
- className="cursor-pointer "
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ className="cursor-pointer ">
|
|
|
{clientName}
|
|
{clientName}
|
|
|
</span>
|
|
</span>
|
|
|
</div>
|
|
</div>
|
|
@@ -168,22 +167,13 @@ const CompanyTabList = ({
|
|
|
className={[
|
|
className={[
|
|
|
'cursor-pointer hover:text-hex-967bbd',
|
|
'cursor-pointer hover:text-hex-967bbd',
|
|
|
record.preserveStatus === 3 ? null : 'text-primary'
|
|
record.preserveStatus === 3 ? null : 'text-primary'
|
|
|
- ].join(' ')}
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ ].join(' ')}>
|
|
|
{record.preserveStatus === 3 ? (
|
|
{record.preserveStatus === 3 ? (
|
|
|
<Text delete type="secondary">
|
|
<Text delete type="secondary">
|
|
|
- <span
|
|
|
|
|
- onClick={() => showLongleDrawer(record.id)}
|
|
|
|
|
- className="cursor-pointer hover:text-hex-967bbd">
|
|
|
|
|
- {clientName}
|
|
|
|
|
- </span>
|
|
|
|
|
|
|
+ {clientName}
|
|
|
</Text>
|
|
</Text>
|
|
|
) : (
|
|
) : (
|
|
|
- <span
|
|
|
|
|
- onClick={() => showLongleDrawer(record.id)}
|
|
|
|
|
- className="text-primary cursor-pointer hover:text-hex-967bbd">
|
|
|
|
|
- {clientName}
|
|
|
|
|
- </span>
|
|
|
|
|
|
|
+ clientName
|
|
|
)}
|
|
)}
|
|
|
</span>
|
|
</span>
|
|
|
)
|
|
)
|
|
@@ -265,19 +255,8 @@ const CompanyTabList = ({
|
|
|
width: 185,
|
|
width: 185,
|
|
|
render: (text, record) => (
|
|
render: (text, record) => (
|
|
|
<span
|
|
<span
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- onClick={() => showDrawerBusiness(record.id)}
|
|
|
|
|
- className="text-primary cursor-pointer hover:text-[#967bbd]">
|
|
|
|
|
-=======
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
onClick={() => dispatchModal('D_BUSINESS_DETAIL', { dataId: record.id })}
|
|
onClick={() => dispatchModal('D_BUSINESS_DETAIL', { dataId: record.id })}
|
|
|
- className="text-primary cursor-pointer hover:text-[#967bbd]"
|
|
|
|
|
- >
|
|
|
|
|
-=======
|
|
|
|
|
- onClick={() => showDrawerBusiness(record.id)}
|
|
|
|
|
className="text-primary cursor-pointer hover:text-[#967bbd]">
|
|
className="text-primary cursor-pointer hover:text-[#967bbd]">
|
|
|
->>>>>>> 6b1c324... fix: 客户、单位抽屉表格宽度的调整
|
|
|
|
|
->>>>>>> 4bb3d4dec0c6c298c57baf1d23b6189be6e0ae15
|
|
|
|
|
{text}
|
|
{text}
|
|
|
</span>
|
|
</span>
|
|
|
)
|
|
)
|
|
@@ -352,23 +331,6 @@ const CompanyTabList = ({
|
|
|
data={client.client}
|
|
data={client.client}
|
|
|
pagination={false}
|
|
pagination={false}
|
|
|
/>
|
|
/>
|
|
|
- {/* <ProTable
|
|
|
|
|
- size="small"
|
|
|
|
|
- columns={columns}
|
|
|
|
|
- search={false}
|
|
|
|
|
- dataSource={client.client}
|
|
|
|
|
- toolBarRender={false}
|
|
|
|
|
- rowKey={record => record.id}
|
|
|
|
|
- pagination={false}
|
|
|
|
|
- scroll={{ y: clientHeight }}
|
|
|
|
|
- /> */}
|
|
|
|
|
- {/* <VirtualTable
|
|
|
|
|
- size="small"
|
|
|
|
|
- columns={columns}
|
|
|
|
|
- search={false}
|
|
|
|
|
- dataSource={client.client}
|
|
|
|
|
- rowKey={record => record.id}
|
|
|
|
|
- /> */}
|
|
|
|
|
</div>
|
|
</div>
|
|
|
</TabPane>
|
|
</TabPane>
|
|
|
<TabPane tab={<span>软件锁{renderBadge(software.total, true)}</span>} key="2">
|
|
<TabPane tab={<span>软件锁{renderBadge(software.total, true)}</span>} key="2">
|
|
@@ -418,8 +380,7 @@ const CompanyTabList = ({
|
|
|
landmarks: customer.landmarks
|
|
landmarks: customer.landmarks
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
- }
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ }>
|
|
|
<Plus className="mr-1" />
|
|
<Plus className="mr-1" />
|
|
|
客户
|
|
客户
|
|
|
</Button>
|
|
</Button>
|