ソースを参照

fix: 过滤掉单位名称是空的不允许点击

outaozhen 4 年 前
コミット
46360fe6d2
2 ファイル変更15 行追加17 行削除
  1. 10 7
      src/pages/Customer/Client/index.jsx
  2. 5 10
      src/pages/Customer/Company/index.jsx

+ 10 - 7
src/pages/Customer/Client/index.jsx

@@ -185,13 +185,16 @@ const Client = props => {
       key: 'companyName',
       width: 100,
       ellipsis: true,
-      render: (companyName, record) => (
-        <span
-          onClick={() => showDrawerComapny(record.companyId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
-          {companyName}
-        </span>
-      ),
+      render: (companyName, record) =>
+        record.companyId !== consts.ENCRYPTION_ZERO ? (
+          <span
+            onClick={() => showDrawerComapny(record.companyId)}
+            className="text-primary cursor-pointer hover:text-[#967bbd]">
+            {companyName}
+          </span>
+        ) : (
+          '-'
+        ),
       sorter: true,
       search: false
     },

+ 5 - 10
src/pages/Customer/Company/index.jsx

@@ -168,8 +168,7 @@ const Company = props => {
       render: (companyName, record) => (
         <span
           onClick={() => showDrawer(record.id)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {companyName}
         </span>
       )
@@ -215,8 +214,7 @@ const Company = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}
-          >
+            modeType={LabelModeType.column}>
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -247,8 +245,7 @@ const Company = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}
-          >
+            modeType={LabelModeType.column}>
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -405,8 +402,7 @@ const Company = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}
-          >
+            modeType={LabelModeType.toolbar}>
             {tagState.tagIds.length ? (
               <Button>
                 {tagState.tagIds.map(item => (
@@ -431,8 +427,7 @@ const Company = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}
-          >
+            modeType={LabelModeType.toolbar}>
             {tagState.tagCooperationIds.length ? (
               <Button>
                 {tagState.tagCooperationIds.map(item => (