Bläddra i källkod

fix: 客户下特殊情况下搜索异常

lanjianrong 5 år sedan
förälder
incheckning
edd921e85d
2 ändrade filer med 15 tillägg och 8 borttagningar
  1. 13 7
      src/pages/Customer/Client/index.jsx
  2. 2 1
      src/pages/Customer/Company/index.jsx

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

@@ -172,7 +172,8 @@ 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>
       ),
@@ -188,7 +189,8 @@ 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>
       ),
@@ -292,7 +294,8 @@ 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>
@@ -329,7 +332,8 @@ 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>
@@ -433,7 +437,7 @@ const Client = props => {
   }
 
   const handleSearch = value => {
-    tRef.current.reset()
+    tRef.current.reload()
     setState({ ...state, params: { ...state.params, search: value } })
   }
 
@@ -480,7 +484,8 @@ 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 => (
@@ -505,7 +510,8 @@ 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 => (

+ 2 - 1
src/pages/Customer/Company/index.jsx

@@ -131,7 +131,7 @@ const Company = props => {
     }
   }
   const handleSearch = value => {
-    tRef.current.reset()
+    tRef.current.reload()
     setState({ ...state, params: { ...state.params, search: value } })
   }
   // const onDistrictChange = value => {
@@ -470,6 +470,7 @@ const Company = props => {
         columnStateType="COMPANY"
         params={state.params}
         request={async (params, sort, filter) => {
+          console.log('filter', filter)
           const srotOrder = refactorSortField(sort)
           const nFilter = refactorFilterField(filter)
           const { code = -1, data: { customer = [], total = 0 } = { customer: [], total: 0 } } =