Merge branch 'master' of http://192.168.1.41:3000/outaozhen/cldV2react

src/pages/Customer/Business/index.jsx

@@ -11,12 +11,13 @@ import { useTableScroll } from '@/hooks/useAutoTable'
 import CompanyDetail from '../Company/components/CompanyDetail'
 import { Funnel } from '@ant-design/charts'
 
-const Business = ({ dispatch, groupList, shouldUpdate }) => {
+const Business = ({ dispatch, groupList, shouldUpdate, loading }) => {
   const tRef = useRef(null)
   const { toggleDrawer, setDrawerProps } = useModal()
   const [state, setState] = useState({
     orderIds: [],
-    funnelData: groupList[0]?.items || []
+    businessGroupId: null,
+    funnelData: []
   })
   useEffect(() => {
     if (!groupList.length) {
@@ -31,7 +32,17 @@ const Business = ({ dispatch, groupList, shouldUpdate }) => {
         payload: 'business '
       })
     }
-  }, [shouldUpdate])
+    if (groupList.length) {
+      const group = groupList[0]
+      setState({
+        ...state,
+        businessGroupId: group.value,
+        funnelData: group.items
+          ?.filter(item => !item.endProcess)
+          ?.map(item => ({ ...item, percentage: parseInt(item.percentage, 10) }))
+      })
+    }
+  }, [loading, shouldUpdate])
 
   // 展示drawer
   const showDrawer = (id, isCompany = false) => {
@@ -93,7 +104,8 @@ const Business = ({ dispatch, groupList, shouldUpdate }) => {
     },
     {
       dataIndex: 'remark',
-      title: '备注'
+      title: '备注',
+      width: '5%'
     },
     {
       dataIndex: 'updateTime',
@@ -110,7 +122,7 @@ const Business = ({ dispatch, groupList, shouldUpdate }) => {
   ]
   const conifg = {
     xField: 'name',
-    yField: 'percentage',
+    yField: 'count',
     legend: false,
     shape: 'pyramid'
   }
@@ -128,9 +140,10 @@ const Business = ({ dispatch, groupList, shouldUpdate }) => {
                 bordered={false}
                 options={groupList}
                 defaultValue={groupList[0]?.value}
-                onChange={(_, option) => {
+                onChange={(id, option) => {
                   setState({
                     ...state,
+                    businessGroupId: id,
                     funnelData: option.items
                       .filter(item => !item.endProcess)
                       .map(item => ({ ...item, percentage: parseInt(item.percentage, 10) }))
@@ -148,45 +161,50 @@ const Business = ({ dispatch, groupList, shouldUpdate }) => {
       </div>
       <div className="w-17/20">
         <div className="ml-8 bg-white shadow-card">
-          <ProTable
-            bordered
-            actionRef={tRef}
-            rowKey={record => record.id}
-            columns={columns}
-            onLoadingChange={loadingStatus => {
-              loadingStatus && redoHeight()
-            }}
-            scroll={getScrollRef}
-            request={async (params, sort, filter) => {
-              const {
-                code = -1,
-                data: { business = [], total = 0 }
-              } = await getBusinessList({ ...params, ...sort, ...filter })
-              setState({ ...state, orderIds: business.map(item => item.id) })
-              return {
-                data: business,
-                success: code === consts.RET_CODE.SUCCESS,
-                total
-              }
-            }}
-            search={false}
-            toolbar={{
-              actions: [
-                <AddBusiness
-                  key="add"
-                  groupList={state.groupList}
-                  reload={() => tRef.current?.reload()}
-                />
-              ]
-            }}
-          />
+          {state.businessGroupId ? (
+            <ProTable
+              bordered
+              actionRef={tRef}
+              params={{ businessGroupId: state.businessGroupId }}
+              rowKey={record => record.id}
+              columns={columns}
+              onLoadingChange={loadingStatus => {
+                loadingStatus && redoHeight()
+              }}
+              scroll={getScrollRef}
+              request={async (params, sort, filter) => {
+                console.log('params', params)
+                const {
+                  code = -1,
+                  data: { business = [], total = 0 }
+                } = await getBusinessList({ ...params, ...sort, ...filter })
+                setState({ ...state, orderIds: business.map(item => item.id) })
+                return {
+                  data: business,
+                  success: code === consts.RET_CODE.SUCCESS,
+                  total
+                }
+              }}
+              search={false}
+              toolbar={{
+                actions: [
+                  <AddBusiness
+                    key="add"
+                    groupList={state.groupList}
+                    reload={() => tRef.current?.reload()}
+                  />
+                ]
+              }}
+            />
+          ) : null}
         </div>
       </div>
     </div>
   )
 }
 
-export default connect(({ business, refresh }) => ({
+export default connect(({ business, refresh, loading }) => ({
   groupList: business.groupList,
+  loading: loading.models.business,
   shouldUpdate: refresh.business
 }))(Business)

src/services/customer.js

@@ -190,8 +190,10 @@ export async function getBusinessGroupList() {
 }
 
 /** 获取商机列表 */
-export async function getBusinessList() {
-  return request.get('/business/list')
+export async function getBusinessList(params) {
+  return request.get('/business/list', {
+    params
+  })
 }
 
 /** 新增商机 */