Przeglądaj źródła

feat: 单位优先级排序

outaozhen 5 lat temu
rodzic
commit
9e873ceea4

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

@@ -172,8 +172,7 @@ const Client = props => {
       render: (clientName, record) => (
         <span
           onClick={() => showDrawer(record.id)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {clientName}
         </span>
       ),
@@ -189,8 +188,7 @@ const Client = props => {
       render: (companyName, record) => (
         <span
           onClick={() => showDrawerComapny(record.companyId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {companyName}
         </span>
       ),
@@ -294,8 +292,7 @@ const Client = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}
-          >
+            modeType={LabelModeType.column}>
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -332,8 +329,7 @@ const Client = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}
-          >
+            modeType={LabelModeType.column}>
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -437,7 +433,7 @@ const Client = props => {
   }
 
   const handleSearch = value => {
-    tRef.current.reload()
+    tRef.current.reset()
     setState({ ...state, params: { ...state.params, search: value } })
   }
 
@@ -484,8 +480,7 @@ const Client = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}
-          >
+            modeType={LabelModeType.toolbar}>
             {tagState.tagIds.length ? (
               <Button>
                 {tagState.tagIds.map(item => (
@@ -510,8 +505,7 @@ const Client = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}
-          >
+            modeType={LabelModeType.toolbar}>
             {tagState.tagCooperationIds.length ? (
               <Button>
                 {tagState.tagCooperationIds.map(item => (

+ 13 - 0
src/pages/Customer/Company/components/CompanyDetail/TabList.jsx

@@ -70,6 +70,19 @@ const CompanyTabList = ({ initData, customerId, client, software, customer, busi
   }
   const columns = [
     {
+      title: '优先级',
+      dataIndex: 'priority',
+      onFilter: true,
+      width: '17%',
+      sorter: true
+      // filters: Array.from(
+      //   new Set(client.client?.map(item => item.priority)).map(item => ({
+      //     text: item,
+      //     value: item
+      //   }))
+      // )
+    },
+    {
       title: '所有部门',
       dataIndex: 'department',
       onFilter: true,

+ 4 - 8
src/pages/Product/Lock/Lockstore/index.jsx

@@ -196,8 +196,7 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (keyNum, record) => (
         <span
           onClick={() => showDrawer(record.id)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {keyNum}
         </span>
       )
@@ -288,8 +287,7 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (text, record) => (
         <span
           onClick={() => showDrawerClient(record.clientId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {text}
         </span>
       )
@@ -302,8 +300,7 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (text, record) => (
         <span
           onClick={() => showCompanyDrawer(record.customerId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {text}
         </span>
       )
@@ -315,8 +312,7 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (text, record) => (
         <span
           onClick={() => showDrawerResponsible(record.responsibleId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {text}
         </span>
       )