Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/pages/TaskManage/Detail/TaskOrder/TaskOrder.tsx

@@ -131,8 +131,7 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
           : '-',
         Reason: temp.Reason,
         Repairman: userList.find((item) => item.ID === temp.Repairman) || '-',
-        DispatchMan:
-          userList.find((item) => item.ID === temp.operator_id) || '-',
+        DispatchMan: '-',
         OrderStatus:
           OrderStatus.find((item) => item.value === temp.AcceptanceStatus) ||
           '-',

src/pages/TaskManage/Detail/WorkOrderList/WorkOrderList.js

@@ -171,7 +171,7 @@ const WorkOrderList = (props) => {
                 } else if (order_type === 5) {
                   temp = '-';
                 } else {
-                  temp = item.checker_id;
+                  temp = item.operator_id;
                 }
                 return temp === user.ID;
               }),

src/pages/TaskManage/index.tsx

@@ -3,14 +3,15 @@ import TabsContent from '@/components/TabsContent';
 import styles from '@/pages/TaskManage/index.less';
 import { getMandateList } from '@/services/TaskManage';
 import { RightOutlined } from '@ant-design/icons';
-import { useParams } from '@umijs/max';
+import { connect, useParams } from '@umijs/max';
 import { List, Spin } from 'antd';
 import { BaseOptionType } from 'rc-select/es/Select';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'umi';
 import { MandateType, OrderType } from './constent';
 
-const TaskManage = () => {
+const TaskManage = (props) => {
+  const { userList, dispatch } = props;
   const { projectID } = useParams();
   const project_id = Number(projectID === '' ? '0' : projectID);
 
@@ -52,6 +53,15 @@ const TaskManage = () => {
       });
   }, []);
 
+  useEffect(() => {
+    if (userList.length === 0) {
+      dispatch({
+        type: 'taskUser/fetchUserList',
+        payload: { project_id },
+      });
+    }
+  }, []);
+
   const goTaskList = (item: number) => {
     navigate(`/task-manage/list?project_id=${project_id}&mandateType=${item}`);
   };
@@ -152,4 +162,8 @@ const TaskManage = () => {
   );
 };
 
-export default TaskManage;
+export default connect(({ taskUser }: any): { userList: IUserType[] } => {
+  return {
+    userList: taskUser.userList,
+  };
+})(TaskManage);