.

config/routes.js

@@ -71,6 +71,22 @@ export default [
       },
     ],
   },
+  {
+    path: '/customer',
+    name: '客户管理',
+    icon: 'IdcardOutlined',
+    access: 'customer',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/customer/index.jsx',
+        name: '客户列表',
+        access: 'sys-customer',
+        icon: 'smile',
+        component: './customer',
+      },
+    ],
+  },
   {
     path: '/Machinery',
     name: '农机管理',

src/pages/Machinery/Machinery/edit.jsx

@@ -172,9 +172,9 @@ export default (props) => {
               <DatePicker format="YYYY-MM-DD" onChange={onDateChange} style={{ width: '350px' }} />
             </FormItem>
             <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
-              <Select placeholder="请选择是否发布" style={{ width: '350px' }}>
-                <Option value={1}>发布</Option>
-                <Option value={0}>未发布</Option>
+              <Select placeholder="请选择农机状态" style={{ width: '350px' }}>
+                <Option value={1}>正常</Option>
+                <Option value={0}>维修</Option>
               </Select>
             </FormItem>
             {id && (

src/pages/Machinery/Person/index.jsx

@@ -93,6 +93,12 @@ 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.ID)) {
+      message.warning('请输入正确的身份证号');
+      setLoading(false);
+      return false;
+    }
+
     if (userId) {
       updateUser(userId, newData).then(() => {
         setLoading(false);
@@ -115,6 +121,7 @@ export default (props) => {
           message.error(err.message || err);
         });
     }
+
   };
   //表单点击取消按钮
   const onCancel = () => {
@@ -286,12 +293,6 @@ export default (props) => {
       key: 'phone',
       width: 120,
     },
-    {
-      title: '邮箱',
-      dataIndex: 'email',
-      key: 'email',
-      search: false,
-    },
     {
       title: '注册时间',
       dataIndex: 'createDate',
@@ -399,7 +400,7 @@ export default (props) => {
           <FormItem label="手机号" name="phone" rules={[{ required: true, message: '请输入' }]}>
             <Input maxLength="11" placeholder="请输入" />
           </FormItem>
-          <FormItem label="邮箱" name="email" rules={[{ required: true, message: '请输入' }]}>
+          <FormItem label="身份证" name="ID" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
           <FormItem label="登录账号" name="loginName" rules={[{ required: true, message: '请输入登录账号' }]}>

src/pages/OrderManage/dispatch.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Card, Form, Button, Select, message } from 'antd';
+import { Card, Form, Button, Select, message, Modal } from 'antd';
 import ProCard from '@ant-design/pro-card';
 import { getOrderDetail } from '@/services/order'
 import { getMachineryList, getduty } from '@/services/machinery';
@@ -57,15 +57,22 @@ export default (props) => {
     setDispatch({ ...dispatch, workerId: e })
   }
   const onCancel = () => {
-    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);
+    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);
+        });
+      },
     });
   }
   useEffect(() => {
@@ -144,7 +151,7 @@ export default (props) => {
               {
                 dispatchId ?
                   <Button loading={cancelLoading} onClick={onCancel} style={{ marginLeft: '4em' }}>
-                    取消
+                    取消调度
                   </Button> :
                   <Button type="primary" loading={loading} onClick={submit} style={{ marginLeft: '4em' }}>
                     保存

src/pages/Welcome.jsx

@@ -123,7 +123,7 @@ const Welcome = () => {
                   <div style={{ height: '448px', width: '100%' }}>
                     {dispatchList.map(item =>
                       <div style={{ height: '60px' }} key={item.orderId} onClick={() => goDispatch(item)} >
-                        {item.personName || item.phone + ' 于 ' + item.createDate + ' 下了一单请您尽快处理！'}
+                        {(item.personName || item.phone) + ' 于 ' + item.createDate + ' 下了一单请您尽快处理！'}
                       </div>
                     )}
                   </div> :
@@ -141,7 +141,7 @@ const Welcome = () => {
                   >
                     {dispatchList.map((item) => (
                       <SwiperSlide key={item.orderId} onClick={() => goDispatch(item)}>
-                        {item.personName || item.phone + ' 于 ' + item.createDate + ' 下了一单请您尽快处理！'}
+                        {(item.personName || item.phone) + ' 于 ' + item.createDate + ' 下了一单请您尽快处理！'}
                       </SwiperSlide>
                     ))}
                   </Swiper>

src/pages/customer/index.jsx

@@ -0,0 +1,85 @@
+import React, { useState, useRef } from 'react';
+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'
+
+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: 'avatar',
+      key: 'avatar',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '身份',
+      dataIndex: 'type',
+      key: 'type',
+      dataIndex: 'position',
+      render: (_, record) => {
+        return record.position === 'index'
+          ? '农户'
+          : record.position === 'appIndex'
+            ? '农机手' : ''
+      },
+      valueType: 'select',
+      valueEnum: {
+        'index': { text: '农户' },
+        'appIndex': { text: '农机手' },
+      },
+    },
+
+    {
+      title: '注册时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (t, render) => formatterTime(render.createDate),
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelChange} />
+    },
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        actionRef={ref}
+        request={getUserList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        rowKey="userId"
+        params={{ start, end }}
+        onReset={Reset}
+        options={false}
+      />
+    </PageHeaderWrapper>
+  );
+};