Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

config/defaultSettings.js

@@ -7,7 +7,7 @@ const Settings = {
   fixedHeader: false,
   fixSiderbar: true,
   colorWeak: false,
-  title: 'Ant Design Pro',
+  title: '南阳智慧农机系统',
   pwa: false,
   menu: {
     locale: false,

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: 'customerList',
+        icon: 'smile',
+        component: './customer',
+      },
+    ],
+  },
   {
     path: '/Machinery',
     name: '农机管理',
@@ -103,9 +119,9 @@ export default [
         component: './Machinery/Machinery',
       },
       {
-        path: '/Machinery/Machinery/edit.jsx',
+        path: '/Machinery/Machinery/Edit',
         name: '农机编辑',
-        component: './Machinery/Machinery/edit.jsx',
+        component: './Machinery/Machinery/Edit',
         hideInMenu: true,
       },
       {

src/pages/ContentManagementSystem/InformationClassification/index.jsx

@@ -29,6 +29,7 @@ export default (props) => {
         actionRef.current.reload();
       }).catch((err) => {
         console.log(err.message)
+        setLoading(false);
       });
     } else {
       addNewsType(values)

src/pages/Finance/Withdrawal/audit.jsx

@@ -28,6 +28,7 @@ export default (props) => {
       updateWithdrawal(withdrawal.withdrawalId, { ...withdrawal, auditStatus: val, auditRemark: remarks }).then(() => {
         message.success('操作成功');
         goBack()
+        setLoading(false)
       }).catch(err => {
         console.log(err.message)
         setLoading(false)

src/pages/Machinery/Machinery/Edit/index.jsx

@@ -0,0 +1,388 @@
+import { useState, useEffect } from 'react';
+import { history } from 'umi';
+import { Form, Input, Drawer, DatePicker, Select, InputNumber, message, Button, List, Card, Descriptions } from 'antd';
+import ProCard from '@ant-design/pro-card';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import ExtendContent from '@/components/ExtendContent';
+import { UploadImage, UploadImageList } from '@/components/Upload';
+import Money from '@/components/Money';
+import { addMachinery, updateMachinery, getMachineryDetail } from '@/services/machinery';
+import { getMachineryTypeList } from '@/services/machineryType';
+import { getRegionList } from '@/services/region';
+import { getDeviceList, getdeviceDetail, getTerminalDeviceList, addDevice } from '@/services/device';
+import { getCooperativeList } from '@/services/cooperative';
+import selectedImg from '@/assets/selectedImg.png'
+import './style.less'
+
+const { Option } = Select;
+const { Search } = Input;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+
+const goBack = () => {
+  history.goBack();
+};
+const FormItem = Form.Item;
+export default (props) => {
+  const { location } = props;
+  const { id } = location.query;
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
+  const [imageList, setImageList] = useState([]);
+  //农机类型列表
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
+  //区域列表
+  const [regionList, setRegionList] = useState([]);
+  //合作社列表
+  const [cooperativeList, setCooperativeList] = useState([]);
+
+  const Submit = (data) => {
+    var newData = { ...data }
+    if (data.buyDate) {
+      newData = { ...data, buyDate: data.buyDate.format('YYYY-MM-DD HH:mm:ss') };
+    }
+    setLoading(true);
+    if (id) {
+      updateMachinery(id, newData)
+        .then(() => {
+          setLoading(false);
+          message.success('数据更新成功');
+          goBack();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    } else {
+      addMachinery(newData)
+        .then((res) => {
+          setLoading(false);
+          message.success('数据保存成功');
+          history.replace(`./Edit?id=${res.machineryId}`)
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    }
+  };
+
+  const imageInput = (image) => {
+    return {
+      uid: image.imageId,
+      url: image.url,
+    };
+  };
+
+  const imageOutput = (image) => {
+    return {
+      imageId: image?.raw?.imageId,
+      targetId: id,
+      url: image.url,
+    };
+  };
+
+
+  //设备信息
+  const [deviceForm] = Form.useForm();
+  const [visible, setVisible] = useState(false);
+  const [terminalId, setTerminalId] = useState();
+  //设备列表
+  const [deviceList, setDeviceList] = useState([]);
+  const [device, setDevice] = useState();
+  const [bind, setBind] = useState(false);
+  const [deviceLoading, setDeviceLoading] = useState(false);
+  const [deviceDetail, setDeviceDetail] = useState();
+
+  //弹出设备列表抽屉
+  const changeCamera = () => {
+    if (device != null) {
+      getTerminalDeviceList(device.deviceId).then((res) => {
+        setDeviceList([res]);
+        setVisible(true);
+      })
+    } else {
+      setVisible(true);
+    }
+
+  }
+  const handleClose = () => {
+    setVisible(false);
+  }
+  const onSearch = (val) => {
+    if (val == '') {
+      getDeviceList({ pageSize: 500 }).then((res) => {
+        setDeviceList(res.records);
+      })
+    } else {
+      setTerminalId(val)
+    }
+  }
+  //选中设备
+  const handleSelect = (item) => {
+    setDevice(item);
+  }
+  const handleOk = () => {
+    if (device != null) {
+      setBind(true)
+    }
+    handleClose();
+  }
+  const submitDevice = (data) => {
+    if (!bind) {
+      message.info('请绑定摄像头');
+      return;
+    }
+    let obj = {
+      deviceId: device.deviceId,
+      channel: data.channel,
+      netType: data.netType
+    }
+    let config = JSON.stringify(obj);
+    setDeviceLoading(true);
+    addDevice({ ...deviceDetail, machineryId: id, apiConfig: config }).then((res) => {
+      message.success('保存成功！');
+      setDeviceLoading(false);
+      goBack();
+    }).catch((err) => {
+      setDeviceLoading(false);
+      console.log(err.message);
+    })
+  }
+  useEffect(() => {
+    getDeviceList({ terminalId: terminalId, pageSize: 500 }).then((res) => {
+      setDeviceList(res.records);
+    })
+  }, [terminalId])
+
+  useEffect(() => {
+    getMachineryTypeList({ pageSize: 500 }).then((res) => {
+      setMachineryTypeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
+    });
+    getRegionList({ pageSize: 500 }).then((res) => {
+      setRegionList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
+    });
+    getCooperativeList({ pageSize: 500 }).then((res) => {
+      setCooperativeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
+    });
+  }, [])
+
+
+  useEffect(() => {
+    if (id) {
+      //编辑时获取基本信息内容
+      getMachineryDetail(id).then((res) => {
+        form.setFieldsValue({ ...res, buyDate: res.buyDate ? moment(res.buyDate, 'YYYY-MM-DD') : null });
+      }).catch((err) => {
+        console.log(err.message)
+      });
+      //获取设备信息内容
+      getdeviceDetail(id).then((res) => {
+        setDeviceDetail(res);
+        if (res) {
+          //json字符串转普通对象
+          let confit = JSON.parse(res.apiConfig)
+          deviceForm.setFieldsValue(confit);
+          if (res && res.deviceId != null) {
+            //获取绑定设备详情
+            getTerminalDeviceList(confit.deviceId).then((res) => {
+              setDevice(res);
+              setBind(true)
+            })
+          }
+        }
+      })
+    }
+  }, [id]);
+
+  return (
+    <PageHeaderWrapper>
+      <ProCard tabs={{ type: 'card' }} style={{ minHeight: '700px' }}>
+        <ProCard.TabPane key={1} tab="基本信息">
+          <Form {...formItemLayout} onFinish={Submit} form={form}>
+            <FormItem
+              label="农机名"
+              name="name"
+              rules={[{ required: true, message: '请输入农机名' }]}
+            >
+              <Input placeholder="请输入农机名" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem
+              label="农机类型"
+              name="typeId"
+              rules={[{ required: true, message: '请选择农机类型' }]}
+            >
+              <Select style={{ width: '350px' }}>
+                {machineryTypeList.map((item) => (
+                  <Option value={item.typeId} key={item.typeId}>
+                    {item.name}
+                  </Option>
+                ))}
+              </Select>
+            </FormItem>
+            <FormItem label="主图" name="thumb" rules={[{ required: true, message: '请选择主图' }]}>
+              <UploadImage />
+            </FormItem>
+            <FormItem label="农机banner图集" name="images">
+              <UploadImageList
+                value={imageList}
+                onChange={setImageList}
+                input={imageInput}
+                output={imageOutput}
+              />
+            </FormItem>
+            <FormItem
+              label="区域"
+              name="regionId"
+              rules={[{ required: true, message: '请选择区域' }]}
+            >
+              <Select style={{ width: '350px' }}>
+                {regionList.map((item) => (
+                  <Option value={item.regionId} key={item.regionId}>
+                    {item.name}
+                  </Option>
+                ))}
+              </Select>
+            </FormItem>
+            <FormItem
+              label="归属合作社"
+              name="orgId"
+              rules={[{ required: true, message: '请选择归属合作社' }]}
+            >
+              <Select style={{ width: '350px' }}>
+                {cooperativeList.map((item) => (
+                  <Option value={item.orgId} key={item.orgId}>
+                    {item.name}
+                  </Option>
+                ))}
+              </Select>
+            </FormItem>
+            <FormItem label="单价" name="price" rules={[{ required: true, message: '请输入价格' }]}>
+              <Money style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="购买时间" name="buyDate">
+              <DatePicker format="YYYY-MM-DD" 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>
+            </FormItem>
+            {id && (
+              <FormItem label="详细信息" colon={false}>
+                <ExtendContent targetType="machinery" targetId={id} onCancel={goBack} />
+              </FormItem>
+            )}
+            <FormItem label=" " colon={false}>
+              <Button type="default" onClick={goBack}>
+                返回
+              </Button>
+              <Button
+                type="primary"
+                loading={loading}
+                htmlType="submit"
+                style={{ marginLeft: '4em' }}
+              >
+                保存
+              </Button>
+            </FormItem>
+          </Form>
+        </ProCard.TabPane>
+        <ProCard.TabPane key={2} disabled={!id} tab="设备信息">
+          <Form {...formItemLayout} onFinish={submitDevice} form={deviceForm}>
+            <FormItem label='摄像头'  >
+              <Button type='link' onClick={changeCamera}>{bind ? '已绑定' : '未绑定'}</Button>
+            </FormItem>
+            <FormItem
+              label="通道号"
+              name='channel'
+              rules={[{ required: true, message: '请输入通道号' }]}
+            >
+              <InputNumber min={1} placeholder="请输入通道号" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem
+              label="网络类型"
+              name='netType'
+              rules={[{ required: true, message: '请选择网络类型' }]}
+            >
+              <Select placeholder="请选择网络类型" style={{ width: '350px' }}>
+                <Option value={0}>内网</Option>
+                <Option value={1}>电信</Option>
+                <Option value={2}>移动</Option>
+                <Option value={3}>联通</Option>
+              </Select>
+            </FormItem>
+            <FormItem label=" " colon={false}>
+              <Button type="default" onClick={goBack}>
+                返回
+              </Button>
+              <Button
+                type="primary"
+                loading={deviceLoading}
+                htmlType="submit"
+                style={{ marginLeft: '4em' }}
+              >
+                保存
+              </Button>
+            </FormItem>
+          </Form>
+          <Drawer
+            title="摄像头列表"
+            width={500}
+            closable={false}
+            onClose={handleClose}
+            visible={visible}
+          >
+            <div style={{ display: 'flex', height: '100%', flexDirection: 'column' }}>
+              <Search
+                placeholder="请输入终端ID"
+                allowClear
+                enterButton="搜索"
+                size="middle"
+                onSearch={onSearch}
+                style={{ padding: '24px' }}
+              />
+              <List split={false} style={{ padding: '12px 0', flex: 1, overflowY: 'auto', background: 'rgb(240,242,245)' }}>
+                {
+                  deviceList.map(item =>
+                    <List.Item key={item.deviceId} onClick={() => handleSelect(item)}>
+                      <Card className='listCard' hoverable>
+                        <Descriptions labelStyle={{ width: '72px', display: 'inline-block', textAlign: 'end' }} >
+                          <Descriptions.Item span={3} label='型号名称'>{item.modelName}</Descriptions.Item>
+                          <Descriptions.Item span={3} label='协议'>{item.protocol}</Descriptions.Item>
+                          <Descriptions.Item span={3} label='终端ID'>{item.terminalId}</Descriptions.Item>
+                          <Descriptions.Item span={3} label='通道列表'>{item.deviceChannelList}</Descriptions.Item>
+                        </Descriptions>
+                        {
+                          device && item.deviceId == device.deviceId && <img src={selectedImg} />
+                        }
+                      </Card>
+                    </List.Item>
+                  )
+                }
+
+              </List>
+              <div style={{ padding: '24px' }}>
+                <Button
+                  type="primary"
+                  style={{ float: 'right' }}
+                  loading={loading}
+                  onClick={handleOk}
+                >
+                  确定
+                </Button>
+              </div>
+            </div>
+          </Drawer>
+        </ProCard.TabPane>
+      </ProCard>
+    </PageHeaderWrapper>
+  );
+};

src/pages/Machinery/Machinery/Edit/style.less

@@ -0,0 +1,11 @@
+.listCard{
+  margin:0 24px;
+  img{
+    position: absolute;
+    right: -11px;
+    top: 16px;
+  }
+}
+.ant-drawer-body{
+  padding: 0;
+}

src/pages/Machinery/Machinery/edit.jsx

@@ -1,203 +0,0 @@
-import { useState, useEffect } from 'react';
-import { Form, Input, Card, DatePicker, Select, InputNumber, message, Button } from 'antd';
-import { history } from 'umi';
-import ProCard from '@ant-design/pro-card';
-import ExtendContent from '@/components/ExtendContent';
-import { UploadImage, UploadImageList } from '@/components/Upload';
-import Money from '@/components/Money';
-import { addMachinery, updateMachinery, getMachineryDetail } from '@/services/machinery';
-import { getMachineryTypeList } from '@/services/machineryType';
-import { getRegionList } from '@/services/region';
-import { getCooperativeList } from '@/services/cooperative';
-import moment from 'moment';
-
-const { Option } = Select;
-const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
-
-const goBack = () => {
-  history.goBack();
-};
-const FormItem = Form.Item;
-export default (props) => {
-  const { location } = props;
-  const { id } = location.query;
-  const [form] = Form.useForm();
-  const [loading, setLoading] = useState(false);
-  const [imageList, setImageList] = useState([]);
-  //农机类型列表
-  const [machineryTypeList, setMachineryTypeList] = useState([]);
-  //区域列表
-  const [regionList, setRegionList] = useState([]);
-  //合作社列表
-  const [cooperativeList, setCooperativeList] = useState([]);
-
-  const Submit = (data) => {
-    var newData = { ...data }
-    if (data.buyDate) {
-      newData = { ...data, buyDate: data.buyDate.format('YYYY-MM-DD HH:mm:ss') };
-    }
-    setLoading(true);
-
-    if (id) {
-      updateMachinery(id, newData)
-        .then(() => {
-          setLoading(false);
-          message.success('数据更新成功');
-          goBack();
-        })
-        .catch((err) => {
-          setLoading(false);
-          message.error(err.message || err);
-        });
-    } else {
-      addMachinery(newData)
-        .then((res) => {
-          setLoading(false);
-          message.success('数据保存成功');
-          goBack();
-        })
-        .catch((err) => {
-          setLoading(false);
-          message.error(err.message || err);
-        });
-    }
-  };
-
-  const onDateChange = () => { };
-  const imageInput = (image) => {
-    return {
-      uid: image.imageId,
-      url: image.url,
-    };
-  };
-
-  const imageOutput = (image) => {
-    return {
-      imageId: image?.raw?.imageId,
-      targetId: id,
-      url: image.url,
-    };
-  };
-  useEffect(() => {
-    getMachineryTypeList({ pageSize: 999 }).then((res) => {
-      setMachineryTypeList(res.records);
-    }).catch((err) => {
-      console.log(err.message)
-    });
-    getRegionList({ pageSize: 999 }).then((res) => {
-      setRegionList(res.records);
-    }).catch((err) => {
-      console.log(err.message)
-    });
-    getCooperativeList({ pageSize: 999 }).then((res) => {
-      setCooperativeList(res.records);
-    }).catch((err) => {
-      console.log(err.message)
-    });
-    if (id) {
-      getMachineryDetail(id).then((res) => {
-        form.setFieldsValue({ ...res, buyDate: res.buyDate ? moment(res.buyDate, 'YYYY-MM-DD') : null });
-      }).catch((err) => {
-        console.log(err.message)
-      });
-    }
-  }, [id]);
-
-  return (
-    <Card>
-      <ProCard tabs={{ type: 'card' }}>
-        <ProCard.TabPane key={1} tab="农机编辑">
-          <Form {...formItemLayout} onFinish={Submit} form={form}>
-            <FormItem
-              label="农机名"
-              name="name"
-              rules={[{ required: true, message: '请输入农机名' }]}
-            >
-              <Input placeholder="请输入农机名" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem
-              label="农机类型"
-              name="typeId"
-              rules={[{ required: true, message: '请选择农机类型' }]}
-            >
-              <Select style={{ width: '350px' }}>
-                {machineryTypeList.map((item) => (
-                  <Option value={item.typeId} key={item.typeId}>
-                    {item.name}
-                  </Option>
-                ))}
-              </Select>
-            </FormItem>
-            <FormItem label="主图" name="thumb" rules={[{ required: true, message: '请选择主图' }]}>
-              <UploadImage />
-            </FormItem>
-            <FormItem label="农机banner图集" name="images">
-              <UploadImageList
-                value={imageList}
-                onChange={setImageList}
-                input={imageInput}
-                output={imageOutput}
-              />
-            </FormItem>
-            <FormItem
-              label="区域"
-              name="regionId"
-              rules={[{ required: true, message: '请选择区域' }]}
-            >
-              <Select style={{ width: '350px' }}>
-                {regionList.map((item) => (
-                  <Option value={item.regionId} key={item.regionId}>
-                    {item.name}
-                  </Option>
-                ))}
-              </Select>
-            </FormItem>
-            <FormItem
-              label="归属合作社"
-              name="orgId"
-              rules={[{ required: true, message: '请选择归属合作社' }]}
-            >
-              <Select style={{ width: '350px' }}>
-                {cooperativeList.map((item) => (
-                  <Option value={item.orgId} key={item.orgId}>
-                    {item.name}
-                  </Option>
-                ))}
-              </Select>
-            </FormItem>
-            <FormItem label="单价" name="price" rules={[{ required: true, message: '请输入价格' }]}>
-              <Money style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem label="购买时间" name="buyDate">
-              <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>
-            </FormItem>
-            {id && (
-              <FormItem label="详细信息" colon={false}>
-                <ExtendContent targetType="machinery" targetId={id} onCancel={goBack} />
-              </FormItem>
-            )}
-            <FormItem label=" " colon={false}>
-              <Button type="default" onClick={goBack}>
-                返回
-              </Button>
-              <Button
-                type="primary"
-                loading={loading}
-                htmlType="submit"
-                style={{ marginLeft: '4em' }}
-              >
-                保存
-              </Button>
-            </FormItem>
-          </Form>
-        </ProCard.TabPane>
-      </ProCard>
-    </Card>
-  );
-};

src/pages/Machinery/Machinery/index.jsx

@@ -17,7 +17,7 @@ export default (props) => {
 
   const gotoEdit = (id) => {
     const queryStr = id ? `?id=${id}` : '';
-    history.push(`./machinery/edit.jsx${queryStr}`);
+    history.push(`./machinery/Edit${queryStr}`);
   };
   const handleDelete = (id) => {
     deleteMachinery(id).then(() => {

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.idCard)) {
+      message.warning('请输入正确的身份证号');
+      setLoading(false);
+      return false;
+    }
+
     if (userId) {
       updateUser(userId, newData).then(() => {
         setLoading(false);
@@ -100,6 +106,7 @@ export default (props) => {
         onCancel();
         actionRef.current.reload();
       }).catch((err) => {
+        setLoading(false);
         console.log(err.message)
       });
     } else {
@@ -115,6 +122,7 @@ export default (props) => {
           message.error(err.message || err);
         });
     }
+
   };
   //表单点击取消按钮
   const onCancel = () => {
@@ -286,12 +294,6 @@ export default (props) => {
       key: 'phone',
       width: 120,
     },
-    {
-      title: '邮箱',
-      dataIndex: 'email',
-      key: 'email',
-      search: false,
-    },
     {
       title: '注册时间',
       dataIndex: 'createDate',
@@ -399,7 +401,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="idCard" 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';
@@ -46,7 +46,7 @@ export default (props) => {
   const changeMachinery = (e) => {
     getduty(e, { date: dispatch.appointmentDate.substr(0, 10) }).then((res => {
       if (res.length != 0) {
-        message.info('该农机今天已有' + res.length + '条调度信息');
+        message.info('该农机当天已有' + res.length + '条调度信息');
       }
       setDispatch({ ...dispatch, machineryId: e })
     })).catch((err) => {
@@ -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/SystemManagement/Region/index.jsx

@@ -28,6 +28,7 @@ export default (props) => {
         onCancel();
         actionRef.current.reload();
       }).catch((err) => {
+        setLoading(false);
         console.log(err.message)
       });
     } else {

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.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.createDate + ' 下了一单请您尽快处理！'}
+                        {(item.personName || item.phone) + ' 于 ' + item.createDate + ' 下了一单请您尽快处理！'}
                       </SwiperSlide>
                     ))}
                   </Swiper>

src/pages/customer/index.jsx

@@ -0,0 +1,86 @@
+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',
+      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} />
+    },
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        actionRef={ref}
+        request={getUserList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        rowKey="userId"
+        params={{ start, end }}
+        onReset={Reset}
+        options={false}
+      />
+    </PageHeaderWrapper>
+  );
+};

src/services/device.js

@@ -0,0 +1,32 @@
+import request from '@/utils/request';
+
+/**
+ * 设备列表
+ * @param {*} params
+ * @returns
+ */
+export const getDeviceList = (params) => request('/hatc-device', { params });
+
+/**
+ * 通过设备号查询相关设备列表  选好了点击绑定时根据当前选择的设备id查询
+ * 同终端列表
+ * @param {*} params
+ * @returns
+ */
+export const getTerminalDeviceList = (id) => request(`/hatc-device/${id}`);
+
+/**
+ * 设备相关信息
+ * 查询农机Id详情
+ * @param {*} params
+ * @returns
+ */
+export const getdeviceDetail = (id) => request(`/machinery/${id}/device`);
+
+//  新增修改设备信息
+/**
+ * 新增设备信息
+ * @param {*} data
+ * @returns
+ */
+export const addDevice = (data) => request('/device', { method: 'post', data });