feats

src/components/QueryTable/index.jsx

@@ -6,7 +6,7 @@ export default React.forwardRef((props, ref) => {
   const tableRef = useRef()
   const searchRef = useRef()
   const [searchData, setSearchData] = useState({})
-  const {api, searchFields, params, onPageChange,searchProps, ...leftProps} = props
+  const {api, searchFields, searchPre, params, onPageChange,searchProps, ...leftProps} = props
   const handleSearch = (data) => setSearchData(data)
 
   useImperativeHandle(ref, () => ({
@@ -23,6 +23,7 @@ export default React.forwardRef((props, ref) => {
     <>
       <Search
         ref={searchRef}
+        preBtn={searchPre}
         fields={searchFields}
         onSearch={handleSearch}
         onReset={handleSearch}

src/components/Search/SearchForm.jsx

@@ -4,7 +4,7 @@ import SearchItem from './SearchItem'
 import { defaultLayout, getFormDataFrom } from './utils'
 
 export default (props) => {
-  const { fields = [], extraParams = {}, onSearch, onReset } = props
+  const { fields = [], extraParams = {}, preBtn, onSearch, onReset } = props
   const initValue = useRef(getFormDataFrom(fields))
   const [formData, setFormData] = useState(initValue.current)
 
@@ -32,6 +32,11 @@ export default (props) => {
 
   return (
     <Form layout="inline">
+      {
+        preBtn && (
+          <Form.Item>{preBtn}</Form.Item>
+        )
+      }
       {
         fields.map((field) => (
           <SearchItem

src/pages/broker/announcement/util.js

@@ -7,10 +7,10 @@ export const pages = [
   {
     title: '成为经纪人',
     page: '/subpackages/pages/broker/toBeBroker/index',
-    queryStr: 'recommendAgent={personId}'
+    queryStr: ''
   },
   {
-    title: '报备客户',
+    title: '推荐客户',
     page: '/pages/mine/addCustomer/index',
     queryStr: ''
   },

src/pages/broker/customer/index.jsx

@@ -1,10 +1,9 @@
 import React, { useMemo, useRef, useState } from 'react'
-import { Button, notification, Spin, Badge, Select } from 'antd'
-import { router } from 'umi'
+import { Button} from 'antd'
 import moment from 'moment'
+import router from 'umi/router';
 import QueryTable from '@/components/QueryTable'
 import { fetch, apis } from '@/utils/request';
-import { useEffect } from 'react'
 
 const searchFields = [
   {
@@ -24,7 +23,6 @@ export default (props) => {
   const { recommendPerson } = history.location.query
 
   const ref = useRef()
-  const [notQuery, setNotQuery] = useState(true);
 
   const tableColumns = [
     {
@@ -102,19 +100,12 @@ export default (props) => {
     },
   ]
 
-  useEffect(() => {
-    setNotQuery(!recommendPerson);
-
-    if (!recommendPerson) {
-      notification.warning({ message: "请设置经纪人" })
-    }
-  }, [recommendPerson])
-
   return (
     <QueryTable
       ref={ref}
       rowKey="channelCustomerId"
       api={apis.broker.getCustomerList}
+      searchPre={<Button type="link" icon="arrow-left" onClick={() => router.goBack()}>返回</Button>}
       searchFields={searchFields}
       columns={tableColumns}
       params={{ recommendPerson }}