|
@@ -58,8 +58,7 @@ const CompanyTabList = ({
|
|
|
if (key !== defaultSelectedKey) {
|
|
if (key !== defaultSelectedKey) {
|
|
|
changePriority(key, id)
|
|
changePriority(key, id)
|
|
|
}
|
|
}
|
|
|
- }}
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ }}>
|
|
|
<Menu.Item key="1">1</Menu.Item>
|
|
<Menu.Item key="1">1</Menu.Item>
|
|
|
<Menu.Item key="2">2</Menu.Item>
|
|
<Menu.Item key="2">2</Menu.Item>
|
|
|
<Menu.Item key="3">3</Menu.Item>
|
|
<Menu.Item key="3">3</Menu.Item>
|
|
@@ -72,7 +71,7 @@ const CompanyTabList = ({
|
|
|
{
|
|
{
|
|
|
title: '优先级',
|
|
title: '优先级',
|
|
|
dataIndex: 'priority',
|
|
dataIndex: 'priority',
|
|
|
- width: '15%',
|
|
|
|
|
|
|
+ width: 80,
|
|
|
headerCellStyle: {
|
|
headerCellStyle: {
|
|
|
backgroundColor: '#fafafa'
|
|
backgroundColor: '#fafafa'
|
|
|
},
|
|
},
|
|
@@ -81,8 +80,7 @@ const CompanyTabList = ({
|
|
|
<Dropdown
|
|
<Dropdown
|
|
|
overlay={priorityMenu(text, record.id)}
|
|
overlay={priorityMenu(text, record.id)}
|
|
|
trigger="click"
|
|
trigger="click"
|
|
|
- className="hover:cursor-pointer"
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ className="hover:cursor-pointer">
|
|
|
<span>
|
|
<span>
|
|
|
{text} <DownOutlined />
|
|
{text} <DownOutlined />
|
|
|
</span>
|
|
</span>
|
|
@@ -141,7 +139,7 @@ const CompanyTabList = ({
|
|
|
{
|
|
{
|
|
|
title: '手机',
|
|
title: '手机',
|
|
|
dataIndex: 'telephone',
|
|
dataIndex: 'telephone',
|
|
|
- width: '15%',
|
|
|
|
|
|
|
+ width: 110,
|
|
|
ellipsis: true,
|
|
ellipsis: true,
|
|
|
headerCellStyle: {
|
|
headerCellStyle: {
|
|
|
backgroundColor: '#fafafa'
|
|
backgroundColor: '#fafafa'
|
|
@@ -151,7 +149,7 @@ const CompanyTabList = ({
|
|
|
{
|
|
{
|
|
|
title: 'QQ',
|
|
title: 'QQ',
|
|
|
dataIndex: 'qq',
|
|
dataIndex: 'qq',
|
|
|
- width: '15%',
|
|
|
|
|
|
|
+ width: 110,
|
|
|
ellipsis: true,
|
|
ellipsis: true,
|
|
|
headerCellStyle: {
|
|
headerCellStyle: {
|
|
|
backgroundColor: '#fafafa'
|
|
backgroundColor: '#fafafa'
|
|
@@ -174,17 +172,32 @@ const CompanyTabList = ({
|
|
|
>
|
|
>
|
|
|
{record.preserveStatus === 3 ? (
|
|
{record.preserveStatus === 3 ? (
|
|
|
<Text delete type="secondary">
|
|
<Text delete type="secondary">
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
{clientName}
|
|
{clientName}
|
|
|
</Text>
|
|
</Text>
|
|
|
) : (
|
|
) : (
|
|
|
clientName
|
|
clientName
|
|
|
|
|
+=======
|
|
|
|
|
+ <span
|
|
|
|
|
+ onClick={() => showLongleDrawer(record.id)}
|
|
|
|
|
+ className="cursor-pointer hover:text-hex-967bbd">
|
|
|
|
|
+ {clientName}
|
|
|
|
|
+ </span>
|
|
|
|
|
+ </Text>
|
|
|
|
|
+ ) : (
|
|
|
|
|
+ <span
|
|
|
|
|
+ onClick={() => showLongleDrawer(record.id)}
|
|
|
|
|
+ className="text-primary cursor-pointer hover:text-hex-967bbd">
|
|
|
|
|
+ {clientName}
|
|
|
|
|
+ </span>
|
|
|
|
|
+>>>>>>> 6b1c324... fix: 客户、单位抽屉表格宽度的调整
|
|
|
)}
|
|
)}
|
|
|
</span>
|
|
</span>
|
|
|
)
|
|
)
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '产品',
|
|
title: '产品',
|
|
|
- width: 240,
|
|
|
|
|
|
|
+ width: 230,
|
|
|
dataIndex: 'product',
|
|
dataIndex: 'product',
|
|
|
render: (_, record) => (
|
|
render: (_, record) => (
|
|
|
<>
|
|
<>
|
|
@@ -200,7 +213,7 @@ const CompanyTabList = ({
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '销售状态',
|
|
title: '销售状态',
|
|
|
- width: 60,
|
|
|
|
|
|
|
+ width: 90,
|
|
|
dataIndex: 'sellStatus',
|
|
dataIndex: 'sellStatus',
|
|
|
render: (_, record) => (
|
|
render: (_, record) => (
|
|
|
<>
|
|
<>
|
|
@@ -218,7 +231,7 @@ const CompanyTabList = ({
|
|
|
title: '维护状态',
|
|
title: '维护状态',
|
|
|
dataIndex: 'preserveStatus',
|
|
dataIndex: 'preserveStatus',
|
|
|
key: 'preserveStatus',
|
|
key: 'preserveStatus',
|
|
|
- width: 60,
|
|
|
|
|
|
|
+ width: 90,
|
|
|
ellipsis: true,
|
|
ellipsis: true,
|
|
|
render: (_, record) => (
|
|
render: (_, record) => (
|
|
|
<>
|
|
<>
|
|
@@ -259,9 +272,14 @@ const CompanyTabList = ({
|
|
|
width: 185,
|
|
width: 185,
|
|
|
render: (text, record) => (
|
|
render: (text, record) => (
|
|
|
<span
|
|
<span
|
|
|
|
|
+<<<<<<< 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]"
|
|
className="text-primary cursor-pointer hover:text-[#967bbd]"
|
|
|
>
|
|
>
|
|
|
|
|
+=======
|
|
|
|
|
+ onClick={() => showDrawerBusiness(record.id)}
|
|
|
|
|
+ className="text-primary cursor-pointer hover:text-[#967bbd]">
|
|
|
|
|
+>>>>>>> 6b1c324... fix: 客户、单位抽屉表格宽度的调整
|
|
|
{text}
|
|
{text}
|
|
|
</span>
|
|
</span>
|
|
|
)
|
|
)
|