feats

config/routes.js

@@ -73,14 +73,14 @@ export default [
   },
   {
     path: '/customer',
-    name: '客户管理',
+    name: '农户管理',
     icon: 'IdcardOutlined',
     access: 'customer',
     component: '../layouts/BasicLayout',
     routes: [
       {
         path: '/customer/index.jsx',
-        name: '客户列表',
+        name: '农户列表',
         access: 'customerList',
         icon: 'smile',
         component: './customer',

src/pages/Machinery/Person/index.jsx

@@ -93,22 +93,28 @@ export default (props) => {
       setLoading(false);
       return false;
     }
-    if (!/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(newData.idCard)) {
+    if (
+      !/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
+        newData.idCard,
+      )
+    ) {
       message.warning('请输入正确的身份证号');
       setLoading(false);
       return false;
     }
 
     if (userId) {
-      updateUser(userId, newData).then(() => {
-        setLoading(false);
-        message.success(`修改成功`);
-        onCancel();
-        actionRef.current.reload();
-      }).catch((err) => {
-        setLoading(false);
-        console.log(err.message)
-      });
+      updateUser(userId, newData)
+        .then(() => {
+          setLoading(false);
+          message.success(`修改成功`);
+          onCancel();
+          actionRef.current.reload();
+        })
+        .catch((err) => {
+          setLoading(false);
+          console.log(err.message);
+        });
     } else {
       addUser(newData)
         .then(() => {
@@ -122,7 +128,6 @@ export default (props) => {
           message.error(err.message || err);
         });
     }
-
   };
   //表单点击取消按钮
   const onCancel = () => {
@@ -131,7 +136,7 @@ export default (props) => {
     setEditModal(false);
   };
   // 弹窗表单中合作社搜索框改变事件目前没用
-  const handelChange = () => { };
+  const handelChange = () => {};
 
   // 列表点击编辑按钮
   const handleEdit = (val) => {
@@ -146,7 +151,7 @@ export default (props) => {
         actionRef.current.reload();
       })
       .catch((err) => {
-        console.log(err.message)
+        console.log(err.message);
       });
   };
   //列表切换人员状态方法
@@ -165,7 +170,7 @@ export default (props) => {
             actionRef.current.reload();
           })
           .catch((err) => {
-            console.log(err.message)
+            console.log(err.message);
           });
       },
     });
@@ -173,13 +178,15 @@ export default (props) => {
 
   const handleRole = (val) => {
     setRUserId(val.userId);
-    getUserRoleList({ user_id: val.userId }).then((res) => {
-      if (res.length !== 0) {
-        setCurrentCheckbox(res.map((item) => item.roleId));
-      }
-    }).catch((err) => {
-      console.log(err.message)
-    });
+    getUserRoleList({ user_id: val.userId })
+      .then((res) => {
+        if (res.length !== 0) {
+          setCurrentCheckbox(res.map((item) => item.roleId));
+        }
+      })
+      .catch((err) => {
+        console.log(err.message);
+      });
     setEditRoleModal(true);
   };
   //授权弹窗点击取消按钮
@@ -203,7 +210,7 @@ export default (props) => {
           onRoleCancel();
         })
         .catch((err) => {
-          console.log(err.message)
+          console.log(err.message);
           setRLoading(false);
         });
     } else {
@@ -219,7 +226,7 @@ export default (props) => {
           onRoleCancel();
         })
         .catch((err) => {
-          console.log(err.message)
+          console.log(err.message);
           setRLoading(false);
         });
     }
@@ -229,39 +236,47 @@ export default (props) => {
   };
   useEffect(() => {
     //获取账号默认密码
-    getDefaultPassword().then((res) => {
-      setPassWord(res);
-    }).catch((err) => {
-      console.log(err.message)
-    });
+    getDefaultPassword()
+      .then((res) => {
+        setPassWord(res);
+      })
+      .catch((err) => {
+        console.log(err.message);
+      });
     //获取合作社列表数据
-    getCooperativeList({ pageSize: 999 }).then((res) => {
-      setCooperativeList(res.records);
-      const list = res.records?.map((item) => {
-        return { title: item.name, key: item.orgId };
+    getCooperativeList({ pageSize: 999 })
+      .then((res) => {
+        setCooperativeList(res.records);
+        const list = res.records?.map((item) => {
+          return { title: item.name, key: item.orgId };
+        });
+        setData(list);
+      })
+      .catch((err) => {
+        console.log(err.message);
       });
-      setData(list);
-    }).catch((err) => {
-      console.log(err.message)
-    });
     //获取角色列表数据
-    getRoleList({ pageSize: 999 }).then((res) => {
-      setRoleList(res.records);
-    }).catch((err) => {
-      console.log(err.message)
-    });
+    getRoleList({ pageSize: 999 })
+      .then((res) => {
+        setRoleList(res.records);
+      })
+      .catch((err) => {
+        console.log(err.message);
+      });
   }, []);
   useEffect(() => {
     if (userId) {
-      getUserDetail(userId).then((res) => {
-        if (res.orgId === '-1') {
-          form.setFieldsValue({ ...res, orgId: cooperativeList[0].orgId });
-        } else {
-          form.setFieldsValue(res);
-        }
-      }).catch((err) => {
-        console.log(err.message)
-      });
+      getUserDetail(userId)
+        .then((res) => {
+          if (res.orgId === '-1') {
+            form.setFieldsValue({ ...res, orgId: cooperativeList[0].orgId });
+          } else {
+            form.setFieldsValue(res);
+          }
+        })
+        .catch((err) => {
+          console.log(err.message);
+        });
     } else {
       form.resetFields();
     }
@@ -274,10 +289,16 @@ export default (props) => {
   ];
   const columns = [
     {
-      title: '用户名',
+      title: '姓名',
       dataIndex: 'userName',
       key: 'userName',
     },
+    {
+      title: '昵称',
+      dataIndex: 'nickName',
+      key: 'nickName',
+      search: false,
+    },
     {
       title: '性别',
       dataIndex: 'sex',
@@ -404,7 +425,11 @@ export default (props) => {
           <FormItem label="身份证" name="idCard" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="登录账号" name="loginName" rules={[{ required: true, message: '请输入登录账号' }]}>
+          <FormItem
+            label="登录账号"
+            name="loginName"
+            rules={[{ required: true, message: '请输入登录账号' }]}
+          >
             <Input placeholder="请输入" />
           </FormItem>
           <FormItem label=" " colon={false} style={{ height: '4px', marginTop: '-28px' }}>
@@ -413,14 +438,18 @@ export default (props) => {
           <FormItem label="所属合作社" name="orgId" rules={[{ required: true, message: '请输入' }]}>
             <Search placeholder="请输入合作社" onChange={handelChange} />
           </FormItem>
-          {
-            userId && <FormItem label="合作社管理员" name="isOrgManager" rules={[{ required: true, message: '请选择' }]}>
+          {userId && (
+            <FormItem
+              label="合作社管理员"
+              name="isOrgManager"
+              rules={[{ required: true, message: '请选择' }]}
+            >
               <Select placeholder="请选择是否启用">
                 <Option value={false}>否</Option>
                 <Option value={true}>是</Option>
               </Select>
             </FormItem>
-          }
+          )}
           <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
             <Select placeholder="请选择是否启用">
               <Option value={1}>启用</Option>

src/pages/OrderManage/JobWarning/detail.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Card, Form, Button } from 'antd';
 import ProCard from '@ant-design/pro-card';
-import { getOrderDetail } from '@/services/order'
+import { getOrderDetail } from '@/services/order';
 import { history } from 'umi';
 
 const FormItem = Form.Item;
@@ -15,44 +15,28 @@ export default (props) => {
   const [dispatch, setDispatch] = useState();
 
   useEffect(() => {
-    getOrderDetail(id).then((res) => {
-      setDispatch(res)
-    }).catch((err) => {
-      console.log(err.message)
-    });
-  }, [id])
+    getOrderDetail(id)
+      .then((res) => {
+        setDispatch(res);
+      })
+      .catch((err) => {
+        console.log(err.message);
+      });
+  }, [id]);
   return (
     <Card>
       <ProCard tabs={{ type: 'card' }}>
         <ProCard.TabPane key={1} tab="订单详情">
           <Form {...formItemLayout}>
-            <FormItem label="订单号">
-              {dispatch?.orderNo}
-            </FormItem>
-            <FormItem label="客户姓名">
-              {dispatch?.personName}
-            </FormItem>
-            <FormItem label="联系电话">
-              {dispatch?.phone}
-            </FormItem>
-            <FormItem label="预约地址">
-              {dispatch?.address}
-            </FormItem>
-            <FormItem label="预约时间">
-              {dispatch?.appointmentDate}
-            </FormItem>
-            <FormItem label="合作社名">
-              {dispatch?.orgName}
-            </FormItem>
-            <FormItem label="农机类型">
-              {dispatch?.typeName}
-            </FormItem>
-            <FormItem label="农机">
-              {dispatch?.machineryName}
-            </FormItem>
-            <FormItem label="农机手">
-              {dispatch?.workName}
-            </FormItem>
+            <FormItem label="订单号">{dispatch?.orderNo}</FormItem>
+            <FormItem label="农户姓名">{dispatch?.personName}</FormItem>
+            <FormItem label="联系电话">{dispatch?.phone}</FormItem>
+            <FormItem label="预约地址">{dispatch?.address}</FormItem>
+            <FormItem label="预约时间">{dispatch?.appointmentDate}</FormItem>
+            <FormItem label="合作社名">{dispatch?.orgName}</FormItem>
+            <FormItem label="农机类型">{dispatch?.typeName}</FormItem>
+            <FormItem label="农机">{dispatch?.machineryName}</FormItem>
+            <FormItem label="农机手">{dispatch?.workName}</FormItem>
             <FormItem label=" " colon={false}>
               <Button type="default" onClick={() => goBack()}>
                 返回

src/pages/OrderManage/dispatch.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Card, Form, Button, Select, message, Modal } from 'antd';
 import ProCard from '@ant-design/pro-card';
-import { getOrderDetail } from '@/services/order'
+import { getOrderDetail } from '@/services/order';
 import { getMachineryList, getduty } from '@/services/machinery';
 import { history } from 'umi';
 import { getUserList } from '@/services/user';
@@ -18,116 +18,123 @@ export default (props) => {
   const { id } = location.query;
   const [dispatch, setDispatch] = useState();
   const [loading, setLoading] = useState(false);
-  const [dispatchId, setDispatchId] = useState()
+  const [dispatchId, setDispatchId] = useState();
   const [machineryList, setMachineryList] = useState([]);
-  const [userList, setUserList] = useState([])
+  const [userList, setUserList] = useState([]);
 
   const [cancelLoading, setCancelLoading] = useState(false);
 
   const submit = () => {
     if (!dispatch.machineryId) {
       message.warning('请选择调度的农机');
-      return
+      return;
     }
     if (!dispatch.workerId) {
       message.warning('请选择农机手');
-      return
+      return;
     }
-    setLoading(true)
-    addDispatch(dispatch).then(res => {
-      message.success('调度成功');
-      setLoading(false);
-      goBack()
-    }).catch((err) => {
-      setLoading(false);
-      message.error(err.message || err);
-    });
+    setLoading(true);
+    addDispatch(dispatch)
+      .then((res) => {
+        message.success('调度成功');
+        setLoading(false);
+        goBack();
+      })
+      .catch((err) => {
+        setLoading(false);
+        message.error(err.message || err);
+      });
   };
   const changeMachinery = (e) => {
-    getduty(e, { date: dispatch.appointmentDate.substr(0, 10) }).then((res => {
-      if (res.length != 0) {
-        message.info('该农机当天已有' + res.length + '条调度信息');
-      }
-      setDispatch({ ...dispatch, machineryId: e })
-    })).catch((err) => {
-      console.log(err.message)
-    });
-  }
+    getduty(e, { date: dispatch.appointmentDate.substr(0, 10) })
+      .then((res) => {
+        if (res.length != 0) {
+          message.info('该农机当天已有' + res.length + '条调度信息');
+        }
+        setDispatch({ ...dispatch, machineryId: e });
+      })
+      .catch((err) => {
+        console.log(err.message);
+      });
+  };
   const changeUser = (e) => {
-    setDispatch({ ...dispatch, workerId: e })
-  }
+    setDispatch({ ...dispatch, workerId: e });
+  };
   const onCancel = () => {
     Modal.confirm({
       title: '确认取消？',
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        setCancelLoading(true)
-        cancelDispatch(dispatchId).then(() => {
-          setCancelLoading(false)
-          setDispatchId()
-          setDispatch({ ...dispatch, machineryId: null, workerId: null })
-          message.success('取消成功');
-        }).catch((err) => {
-          setCancelLoading(false);
-          message.error(err.message || err);
-        });
+        setCancelLoading(true);
+        cancelDispatch(dispatchId)
+          .then(() => {
+            setCancelLoading(false);
+            setDispatchId();
+            setDispatch({ ...dispatch, machineryId: null, workerId: null });
+            message.success('取消成功');
+          })
+          .catch((err) => {
+            setCancelLoading(false);
+            message.error(err.message || err);
+          });
       },
     });
-  }
+  };
   useEffect(() => {
-
-    getOrderDetail(id).then((res) => {
-      res.machineryId = null
-      res.typeId = res.machineryType
-      setDispatch(res)
-      getMachineryList({ orgId: res.orgId, status: 1, typeId: res.typeId, pageSize: 999 }).then((res2) => {
-        setMachineryList(res2.records)
-      }).catch((err) => {
-        console.log(err.message)
+    getOrderDetail(id)
+      .then((res) => {
+        res.machineryId = null;
+        res.typeId = res.machineryType;
+        setDispatch(res);
+        getMachineryList({ orgId: res.orgId, status: 1, typeId: res.typeId, pageSize: 999 })
+          .then((res2) => {
+            setMachineryList(res2.records);
+          })
+          .catch((err) => {
+            console.log(err.message);
+          });
+        getUserList({ org_id: res.orgId, pageSize: 999 })
+          .then((res3) => {
+            setUserList(res3.records);
+          })
+          .catch((err) => {
+            console.log(err.message);
+          });
+        if (res.dispatchStatus == 1) {
+          getdispatchId(id)
+            .then((res4) => {
+              setDispatchId(res4.dispatchId);
+              setDispatch({ ...res, machineryId: res4.machineryId, workerId: res4.workerId });
+            })
+            .catch((err) => {
+              console.log(err.message);
+            });
+        }
+      })
+      .catch((err) => {
+        console.log(err.message);
       });
-      getUserList({ org_id: res.orgId, pageSize: 999 }).then(res3 => {
-        setUserList(res3.records)
-      }).catch((err) => {
-        console.log(err.message)
-      });
-      if (res.dispatchStatus == 1) {
-        getdispatchId(id).then(res4 => {
-          setDispatchId(res4.dispatchId)
-          setDispatch({ ...res, machineryId: res4.machineryId, workerId: res4.workerId })
-        }).catch((err) => {
-          console.log(err.message)
-        });
-      }
-    }).catch((err) => {
-      console.log(err.message)
-    });
-  }, [id])
+  }, [id]);
   return (
     <Card>
       <ProCard tabs={{ type: 'card' }}>
         <ProCard.TabPane key={1} tab="订单调度">
           <Form {...formItemLayout}>
-            <FormItem label="客户姓名">
-              {dispatch?.personName}
-            </FormItem>
-            <FormItem label="联系电话">
-              {dispatch?.phone}
-            </FormItem>
-            <FormItem label="预约地址">
-              {dispatch?.address}
-            </FormItem>
-            <FormItem label="预约时间">
-              {dispatch?.appointmentDate}
-            </FormItem>
-            <FormItem label="合作社名">
-              {dispatch?.orgName}
-            </FormItem>
-            <FormItem label="农机类型">
-              {dispatch?.typeName}
-            </FormItem>
+            <FormItem label="农户姓名">{dispatch?.personName}</FormItem>
+            <FormItem label="联系电话">{dispatch?.phone}</FormItem>
+            <FormItem label="预约地址">{dispatch?.address}</FormItem>
+            <FormItem label="预约时间">{dispatch?.appointmentDate}</FormItem>
+            <FormItem label="合作社名">{dispatch?.orgName}</FormItem>
+            <FormItem label="农机类型">{dispatch?.typeName}</FormItem>
             <FormItem label="农机">
-              <Select placeholder="请选择" value={dispatch?.machineryId} onChange={changeMachinery} allowClear style={{ width: '350px' }}>
+              <Select
+                placeholder="请选择"
+                value={dispatch?.machineryId}
+                onChange={changeMachinery}
+                allowClear
+                style={{ width: '350px' }}
+              >
                 {machineryList.map((item) => (
                   <Option value={item.machineryId} key={item.machineryId}>
                     {item.name}
@@ -136,7 +143,13 @@ export default (props) => {
               </Select>
             </FormItem>
             <FormItem label="农机手">
-              <Select placeholder="请选择" value={dispatch?.workerId} onChange={changeUser} allowClear style={{ width: '350px' }}>
+              <Select
+                placeholder="请选择"
+                value={dispatch?.workerId}
+                onChange={changeUser}
+                allowClear
+                style={{ width: '350px' }}
+              >
                 {userList.map((item) => (
                   <Option value={item.userId} key={item.userId}>
                     {item.userName}
@@ -148,15 +161,20 @@ export default (props) => {
               <Button type="default" onClick={() => goBack()}>
                 返回
               </Button>
-              {
-                dispatchId ?
-                  <Button loading={cancelLoading} onClick={onCancel} style={{ marginLeft: '4em' }}>
-                    取消调度
-                  </Button> :
-                  <Button type="primary" loading={loading} onClick={submit} style={{ marginLeft: '4em' }}>
-                    保存
-                  </Button>
-              }
+              {dispatchId ? (
+                <Button loading={cancelLoading} onClick={onCancel} style={{ marginLeft: '4em' }}>
+                  取消调度
+                </Button>
+              ) : (
+                <Button
+                  type="primary"
+                  loading={loading}
+                  onClick={submit}
+                  style={{ marginLeft: '4em' }}
+                >
+                  保存
+                </Button>
+              )}
             </FormItem>
           </Form>
         </ProCard.TabPane>

src/pages/customer/index.jsx

@@ -3,69 +3,46 @@ import { DatePicker } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
-import { getUserList } from '@/services/user'
+import { getPersonList } from '@/services/person';
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
 };
-const { RangePicker } = DatePicker;
 
 export default (props) => {
-  const [start, setStartDate] = useState()
-  const [end, setEndDate] = useState()
-
-  const handelChange = (date, dateStrings) => {
-    setStartDate(dateStrings[0])
-    setEndDate(dateStrings[1])
-  }
   const ref = useRef();
+
   const Reset = () => {
-    setStartDate()
-    setEndDate()
     ref.current.reload();
-  }
+  };
 
   const columns = [
     {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
+      title: '昵称',
+      dataIndex: 'nickName',
+      key: 'nickName',
     },
     {
       title: '头像',
       dataIndex: 'avatar',
       key: 'avatar',
-      search: false
+      render: (src) =>
+        src != '-' && (
+          <img src={src} alt="" style={{ width: '64px', height: '64px', borderRadius: '4px' }} />
+        ),
+      search: false,
     },
     {
       title: '手机号',
       dataIndex: 'phone',
       key: 'phone',
     },
-    {
-      title: '身份',
-      dataIndex: 'type',
-      key: 'type',
-      dataIndex: 'position',
-      render: (_, record) => {
-        return record.position === 'farmer'
-          ? '农户'
-          : record.position === 'worker'
-            ? '农机手' : ''
-      },
-      valueType: 'select',
-      valueEnum: {
-        'farmer': { text: '农户' },
-        'worker': { text: '农机手' },
-      },
-    },
-
     {
       title: '注册时间',
       dataIndex: 'createDate',
       key: 'createDate',
       render: (t, render) => formatterTime(render.createDate),
-      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelChange} />
+      search: false,
     },
   ];
 
@@ -73,11 +50,11 @@ export default (props) => {
     <PageHeaderWrapper>
       <PageTable
         actionRef={ref}
-        request={getUserList}
+        request={getPersonList}
         // expfunc={exportPersonList}
         columns={columns}
-        rowKey="userId"
-        params={{ start, end }}
+        rowKey="personId"
+        params={{ identity: 'farmer' }}
         onReset={Reset}
         options={false}
       />

src/services/person.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request';
+
+/**
+ * 查询用户列表
+ * @param {*} params
+ * @returns
+ */
+export const getPersonList = (params) => request('/person', { params });