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

config/routes.js

@@ -240,10 +240,10 @@ export default [
     component: '../layouts/BasicLayout',
     routes: [
       {
-        path: '/SystemManagement/MapExtent',
+        path: '/SystemManagement/Region',
         name: '区域设置',
         access: 'region',
-        component: './SystemManagement/MapExtent',
+        component: './SystemManagement/Region',
         // hideInMenu: true
       },
       {

src/pages/SystemManagement/Cooperative/edit.jsx

@@ -1,11 +1,11 @@
-import { Form, Input, Card, InputNumber, Select, message, Button } from 'antd';
+import { Form, Input, Card, Select, message, Button } from 'antd';
 import { history } from 'umi';
 import ProCard from '@ant-design/pro-card';
 import { useState, useEffect } from 'react';
 import POI from '@/components/POI/POI';
 
-// import { getTagList } from '@/services/tag';
-// import { addAttaList, gettaTouristForm, EditaddAttaList } from '@/services/AttaList'
+import { getRegionList } from '@/services/region';
+import { addCooperative, getCooperativeDetail, updateCooperative } from '@/services/cooperative';
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -21,74 +21,65 @@ export default (props) => {
   const [form] = Form.useForm();
   const [listForm, setListForm] = useState({});
   const [loading, setLoading] = useState(false);
-  const [imageList, setImageList] = useState([]);
-  //地址--占位
   const [newLocName, setLocName] = useState('');
   const [newAddress, setAddress] = useState('');
+  const [regionList, setRegionList] = useState([]);
+
   const Submit = (data) => {
-    const typeList = (data.typeList || []).map((x) => {
-      return { ...x, targetId: id, targetType: 'tourist' };
-    });
-    // setLoading(true);
     console.log(data);
-    console.log(newLocName);
-    console.log(newAddress);
-    // if (id) {
-    //   EditaddAttaList(id, { ...listForm, ...data, imageList, typeList }).then(() => {
-    //     setLoading(false);
-    //     message.success('数据更新成功');
-    //     goBack();
-    //   })
-    //     .catch(err => {
-    //       setLoading(false);
-    //       message.error(err.message || err);
-    //     });
-    // } else {
-    //   addAttaList({ ...data, imageList, typeList }).then((res) => {
-    //     setLoading(false);
-    //     message.success('数据保存成功');
-    //     history.replace(`/Attractions/Edit?id=${res.touristId}`)
-    //   })
-    //     .catch(err => {
-    //       setLoading(false);
-    //       message.error(err.message || err);
-    //     });
-    // }
-  };
-
-  const selectTagList = (params) => {
-    // return getTagList({
-    // }).then((res) => {
-    // }).catch((err) => {
-    //   return {
-    //     success: false,
-    //   }
-    // })
-  };
-
-  const imageInput = (image) => {
-    return {
-      uid: image.imageId,
-      url: image.url,
-    };
+    setLoading(true);
+    if (id) {
+      updateCooperative(id, {
+        ...listForm,
+        ...data,
+        lng: data.location.split(',')[0],
+        lat: data.location.split(',')[1],
+      })
+        .then(() => {
+          setLoading(false);
+          message.success('数据更新成功');
+          goBack();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    } else {
+      addCooperative({
+        ...data,
+        lng: data.location.split(',')[0],
+        lat: data.location.split(',')[1],
+      })
+        .then((res) => {
+          setLoading(false);
+          message.success('数据保存成功');
+          history.goBack();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    }
   };
 
-  const imageOutput = (image) => {
-    return {
-      imageId: image?.raw?.imageId,
-      shopId: id,
-      url: image.url,
-    };
-  };
   useEffect(() => {
-    selectTagList();
-    // if (id) {
-    //   gettaTouristForm(id).then((res) => {
-    //     setListForm(res)
-    //     form.setFieldsValue(res)
-    //     setImageList(res?.imageList || [])
-    //   })
-    // }
+    getRegionList()
+      .then((res) => {
+        setRegionList(res.records || []);
+      })
+      .catch((err) => {});
+  }, []);
+  useEffect(() => {
+    if (id) {
+      getCooperativeDetail(id)
+        .then((res) => {
+          setListForm(res || []);
+          form.setFieldsValue({ ...res, location: res.lng + ',' + res.lat });
+        })
+        .catch((err) => {
+          message.error(err.message || err);
+        });
+    }
   }, [id]);
 
   return (
@@ -97,7 +88,7 @@ export default (props) => {
         <ProCard.TabPane key={1} tab="合作社编辑">
           <Form {...formItemLayout} onFinish={Submit} form={form}>
             <FormItem
-              label="机构名称"
+              label="机构名"
               name="name"
               rules={[{ required: true, message: '请输入机构名称16个字符以内' }]}
             >
@@ -126,11 +117,11 @@ export default (props) => {
               name="phone"
               rules={[{ required: true, message: '请输入联系方式' }]}
             >
-              <Input placeholder="请输入联系方式" rows={4} style={{ width: '350px' }} />
+              <Input placeholder="请输入联系方式" style={{ width: '350px' }} />
             </FormItem>
             <FormItem
               label="定位经纬"
-              name="locaton"
+              name="location"
               rules={[{ required: true, message: '请定位' }]}
             >
               <POI
@@ -151,7 +142,25 @@ export default (props) => {
               label="区域"
               name="regionId"
               rules={[{ required: true, message: '请输入区域' }]}
-            />
+            >
+              <Select placeholder="请选择区域" style={{ width: '350px' }}>
+                {regionList.map((item) => (
+                  <Option value={item.regionId} key={item.regionId}>
+                    {item.name}
+                  </Option>
+                ))}
+              </Select>
+            </FormItem>
+            <FormItem label="身份" name="role" rules={[{ required: true, message: '请选择身份' }]}>
+              <Select placeholder="请选择身份" style={{ width: '350px' }}>
+                <Option value="合作社" key="合作社" />
+                <Option value="个体户" key="个体户" />
+              </Select>
+            </FormItem>
+            <FormItem label="员工数">{listForm?.workerNum || 0}</FormItem>
+            <FormItem label="农机数">{listForm?.machineryNum || 0}</FormItem>
+            <FormItem label="订单完成数">{listForm?.orderNum || 0}</FormItem>
+            <FormItem label="评分">{listForm?.score || 0}</FormItem>
             <FormItem label=" " colon={false}>
               <Button type="default" onClick={() => goBack()}>
                 返回

src/pages/SystemManagement/Cooperative/index.jsx

@@ -1,109 +1,253 @@
-import React from 'react';
-import { history, Link } from 'umi';
-import { Button, Popconfirm, message, Tooltip } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-import { getList } from '@/services/cooperative';
+import React, { useState, useEffect } from 'react';
+import { Tree, Row, Col, Popconfirm, Card, Form, Input, Select, Button, message } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import moment from 'moment';
-import PageTable from '@/components/PageTable';
+import { getRegionList } from '@/services/region';
+import {
+  getCooperativeList,
+  deleteCooperative,
+  addCooperative,
+  getCooperativeDetail,
+  updateCooperative,
+} from '@/services/cooperative';
 
-const formatterTime = (val) => {
-  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
-};
+import POI from '@/components/POI/POI';
+import { CloseOutlined } from '@ant-design/icons';
+import './index.less';
+
+const FormItem = Form.Item;
+const { TextArea } = Input;
+const { Option } = Select;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
 
 export default (props) => {
-  const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
-      新增机构
-    </Button>,
-  ];
-  const gotoEdit = (id) => {
-    const queryStr = id ? `?id=${id}` : '';
-    history.push(`./Cooperative/edit.jsx${queryStr}`);
+  //列表数据
+  const [data, setData] = useState([]);
+
+  //机构Id
+  const [orgId, setOrgId] = useState('');
+  const [form] = Form.useForm();
+  //机构表单数据
+  const [listForm, setListForm] = useState({});
+  //确定按钮loading框防连点
+  const [loading, setLoading] = useState(false);
+  //记录定位信息
+  const [newLocName, setLocName] = useState('');
+  const [newAddress, setAddress] = useState('');
+  //机构所属区域列表
+  const [regionList, setRegionList] = useState([]);
+
+  //选中左侧列表右侧显示详情
+  const handleslect = (val) => {
+    console.log(666);
+    setOrgId(val);
+  };
+  const handleDelete = (val) => {
+    deleteCooperative(val).then(() => {
+      message.success('删除成功');
+      setOrgId();
+      handelReset();
+    });
   };
-  const columns = [
-    {
-      title: '机构名',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '联系人',
-      dataIndex: 'contactPerson',
-      key: 'contactPerson',
-    },
-    {
-      title: '联系方式',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '区域',
-      dataIndex: 'regionId',
-      key: 'regionId',
-    },
-    {
-      title: '地址',
-      dataIndex: 'address',
-      key: 'address',
-      search: false,
-    },
+  // 刷新左侧列表
+  const handelReset = () => {
+    setData([]);
+    getCooperativeList()
+      .then((res) => {
+        const list = res.records?.map((item) => {
+          return { title: item.name, key: item.orgId };
+        });
+        setData(list);
+      })
+      .catch((err) => {
+        message.error(err.message || err);
+      });
+  };
+  // 动态生成树
 
-    {
-      title: '农机数',
-      dataIndex: 'machineryNum',
-      key: 'machineryNum',
-      search: false,
-    },
-    {
-      title: '员工数',
-      dataIndex: 'employeesNum',
-      key: 'employeesNum',
-      search: false,
-    },
-    {
-      title: '完成订单数',
-      dataIndex: 'orderNum',
-      key: 'orderNum',
-      search: false,
-    },
-    {
-      title: '评分',
-      dataIndex: 'score',
-      key: 'score',
-      search: false,
-    },
-    {
-      title: '操作',
-      valueType: 'option',
-      render: (_, record) => [
-        <Link key={1} to={`./edit.jsx`}>
-          编辑
-        </Link>,
+  const handelNode = (item) => {
+    let node = (
+      <div
+        key={item.orgId}
+        style={{ justifyContent: 'space-between', display: 'flex', width: '100%' }}
+        onClick={() => handleslect(item.key)}
+      >
+        <span>{item.title}</span>
         <Popconfirm
-          key={2}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.cooperativeId)}
+          onConfirm={() => handleDelete(item.key)}
           okText="确定"
           cancelText="取消"
         >
-          <a href="#">删除</a>
-        </Popconfirm>,
-      ],
-    },
-  ];
-  const handleDelete = () => {};
+          <CloseOutlined style={{ color: 'red', marginTop: '6px' }} />
+        </Popconfirm>
+      </div>
+    );
+    return node;
+  };
+
+  //提交表单
+  const Submit = (data) => {
+    setLoading(true);
+    if (orgId) {
+      updateCooperative(orgId, {
+        ...listForm,
+        ...data,
+        lng: data.location.split(',')[0],
+        lat: data.location.split(',')[1],
+      })
+        .then(() => {
+          setLoading(false);
+          message.success('数据更新成功');
+          handelReset();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    } else {
+      addCooperative({
+        ...data,
+        lng: data.location.split(',')[0],
+        lat: data.location.split(',')[1],
+      })
+        .then((res) => {
+          setLoading(false);
+          message.success('数据保存成功');
+          handelReset();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    }
+  };
+
+  useEffect(() => {
+    handelReset();
+    getRegionList()
+      .then((res) => {
+        setRegionList(res.records || []);
+      })
+      .catch((err) => {
+        message.error(err.message || err);
+      });
+  }, []);
+  useEffect(() => {
+    if (orgId) {
+      getCooperativeDetail(orgId)
+        .then((res) => {
+          setListForm(res || []);
+          form.setFieldsValue({ ...res, location: res.lng + ',' + res.lat });
+        })
+        .catch((err) => {
+          message.error(err.message || err);
+        });
+    } else {
+      setListForm();
+      form.resetFields();
+    }
+  }, [orgId]);
   return (
     <PageHeaderWrapper>
-      <PageTable
-        request={getList}
-        // expfunc={exportPersonList}
-        columns={columns}
-        rowKey="cooperativeId"
-        options={false}
-        toolBarRender={actions}
-        scroll={{ x: 1000 }}
-      />
+      <Row gutter={16}>
+        <Col span={8}>
+          <Card
+            title="列表"
+            extra={
+              <a href="#" onClick={() => setOrgId()}>
+                添加
+              </a>
+            }
+          >
+            <Tree className="treeClass" titleRender={(data) => handelNode(data)} treeData={data} />
+          </Card>
+        </Col>
+        <Col span={16}>
+          <Card title="详情">
+            <Form {...formItemLayout} onFinish={Submit} form={form}>
+              <FormItem
+                label="机构名"
+                name="name"
+                rules={[{ required: true, message: '请输入机构名称16个字符以内' }]}
+              >
+                <Input
+                  placeholder="请输入机构名称16个字符以内"
+                  maxLength="16"
+                  style={{ width: '350px' }}
+                />
+              </FormItem>
+              <FormItem label="信用代码" name="creditCode">
+                <Input placeholder="请输入信用代码" style={{ width: '350px' }} />
+              </FormItem>
+              <FormItem
+                label="联系人"
+                name="contactPerson"
+                rules={[{ required: true, message: '请输入联系人' }]}
+              >
+                <Input placeholder="请输入联系人" rows={4} style={{ width: '350px' }} />
+              </FormItem>
+              <FormItem
+                label="联系方式"
+                name="phone"
+                rules={[{ required: true, message: '请输入联系方式' }]}
+              >
+                <Input placeholder="请输入联系方式" style={{ width: '350px' }} />
+              </FormItem>
+              <FormItem
+                label="定位经纬"
+                name="location"
+                rules={[{ required: true, message: '请定位' }]}
+              >
+                <POI
+                  placeholder="定位"
+                  setLocName={setLocName}
+                  setAddress={setAddress}
+                  roomBoole={true}
+                />
+              </FormItem>
+              <FormItem
+                label="地址"
+                name="address"
+                rules={[{ required: true, message: '请输入地址' }]}
+              >
+                <TextArea placeholder="请输入地址" style={{ width: '350px' }} />
+              </FormItem>
+              <FormItem
+                label="区域"
+                name="regionId"
+                rules={[{ required: true, message: '请输入区域' }]}
+              >
+                <Select placeholder="请选择区域" style={{ width: '350px' }}>
+                  {regionList.map((item) => (
+                    <Option value={item.regionId} key={item.regionId}>
+                      {item.name}
+                    </Option>
+                  ))}
+                </Select>
+              </FormItem>
+              <FormItem
+                label="身份"
+                name="role"
+                rules={[{ required: true, message: '请选择身份' }]}
+              >
+                <Select placeholder="请选择身份" style={{ width: '350px' }}>
+                  <Option value="合作社" key="合作社" />
+                  <Option value="个体户" key="个体户" />
+                </Select>
+              </FormItem>
+              <FormItem label="员工数">{listForm?.workerNum || 0}</FormItem>
+              <FormItem label="农机数">{listForm?.machineryNum || 0}</FormItem>
+              <FormItem label="订单完成数">{listForm?.orderNum || 0}</FormItem>
+              <FormItem label="评分">{listForm?.score || 0}</FormItem>
+              <FormItem label=" " colon={false}>
+                <Button type="primary" loading={loading} htmlType="submit">
+                  保存
+                </Button>
+              </FormItem>
+            </Form>
+          </Card>
+        </Col>
+      </Row>
     </PageHeaderWrapper>
   );
 };

src/pages/SystemManagement/Cooperative/index.less

@@ -0,0 +1,15 @@
+@import (reference) '~antd/es/style/themes/index';
+
+.treeClass {
+  .ant-tree-list {
+    & div {
+      width: 100% !important;
+      .ant-tree-switcher-noop {
+        display: none !important;
+      }
+      span:nth-child(3) {
+        width: 100%;
+      }
+    }
+  }
+}

src/pages/SystemManagement/MapExtent/index.jsx

@@ -1,111 +0,0 @@
-import React, { useState } from 'react';
-import { Tag, Space, Button, Popconfirm, Form, Modal, Input, message } from 'antd';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
-
-import ProList from '@ant-design/pro-list';
-import './index.less'
-const FormItem = Form.Item
-const defaultData = [
-  {
-    id: '1',
-    name: '赵村',
-    desc: '赵村较大，多人协作',
-  },
-
-];
-export default () => {
-  const [form2] = Form.useForm()
-  const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 }, };
-  const [dataSource, setDataSource] = useState(defaultData);
-  const [editModal, setEditModal] = useState(false)
-  const [editdetail, setEditDetail] = useState()
-
-  const changeWeight = (record) => {
-    setEditDetail(record)
-    setEditModal(true)
-  }
-  const Submit = (values) => {
-    console.log('editdetail', editdetail, values);
-    message.success(`修改成功`);
-    setDataSource([...dataSource, values])
-    // setLoading2(false)
-    onCancel()
-
-  }
-
-  const onCancel = () => {
-    form2.resetFields()
-    setEditModal(false)
-  }
-  const actions = () => [
-    <Button key='add' type="primary" icon={<PlusOutlined />} onClick={() => setEditModal(true)}>新增</Button>,
-  ]
-  return (
-    <PageHeaderWrapper>
-      <ProList
-
-        toolBarRender={actions}
-        rowKey="id"
-        headerTitle="区域范围"
-        dataSource={dataSource}
-        showActions="hover"
-        editable={{
-          onSave: async (key, record, originRow) => {
-            console.log('修改后的', key, record, originRow);
-            return true;
-          },
-        }}
-        onDataSourceChange={setDataSource}
-        metas={{
-          title: {//标题
-            dataIndex: 'name',
-          },
-
-          description: {//简介
-            dataIndex: 'desc',
-          },
-          subTitle: {
-            editable: false,
-            render: () => {
-              return (<Space size={0}>
-                {/* <Tag color="blue"></Tag> */}
-                <Tag color="#5BD8A6">区域名称</Tag>
-              </Space>);
-            },
-          },
-          actions: {
-            render: (text, row, index, action) => [
-              <a onClick={() => {
-                action === null || action === void 0 ? void 0 : action.startEditable(row.id);
-              }} key="link">
-                编辑
-              </a>,
-              <Popconfirm
-                key={3}
-                title="您是否确认删除 ?"
-                onConfirm={() => handleDelete(record)}
-                okText="确定"
-                cancelText="取消"
-              >
-                <a href="#"  >删除</a>
-              </Popconfirm>,
-            ],
-          },
-        }} />
-      <Modal title="套餐权重修改" visible={editModal} onCancel={onCancel} keyboard={false} maskClosable={false} destroyOnClose={true} footer={null}>
-        < Form {...formItemLayout} onFinish={Submit} form={form2} >
-          <FormItem label="范围名称" name="name" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" style={{ width: '350px' }} />
-          </FormItem>
-          <FormItem label="备注" name="desc" >
-            <Input placeholder="请输入" style={{ width: '350px' }} />
-          </FormItem>
-          <FormItem label=" " colon={false} >
-            <Button type='default' onClick={onCancel} >取消</Button>
-            <Button type='primary' htmlType="Submit" style={{ marginLeft: '4em' }}>修改</Button>
-          </FormItem>
-        </Form>
-      </Modal>
-    </PageHeaderWrapper>);
-};

src/pages/SystemManagement/MapExtent/index.less

@@ -1,3 +0,0 @@
-// .ant-form-item-control {
-//   display: none;
-// }

src/pages/SystemManagement/Region/index.jsx

@@ -0,0 +1,152 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { history, Link } from 'umi';
+import { Button, Popconfirm, Modal, Form, Input, message, Tooltip } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import { getRegionList, addRegion, deleteRegion, updateRegion } from '@/services/region';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+
+const formatterTime = (val) => {
+  return val && val !== '-' ? moment(val).format('YYYY-MM-DD') : '-';
+};
+const FormItem = Form.Item;
+
+export default (props) => {
+  const actions = () => [
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => setEditModal(true)}>
+      新增
+    </Button>,
+  ];
+  const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+  const [form] = Form.useForm();
+  const [editModal, setEditModal] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [regionId, setRegionId] = useState();
+  const actionRef = useRef();
+
+  const Submit = (values) => {
+    setLoading(true);
+    if (regionId) {
+      updateRegion(regionId, values).then(() => {
+        setLoading(false);
+        message.success(`修改成功`);
+        onCancel();
+        actionRef.current.reload();
+      });
+    } else {
+      addRegion(values)
+        .then(() => {
+          setLoading(false);
+          message.success(`保存成功`);
+          onCancel();
+          actionRef.current.reload();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    }
+  };
+  const handelEdit = (val) => {
+    setRegionId(val.regionId);
+    form.setFieldsValue(val);
+    setEditModal(true);
+  };
+  const onCancel = () => {
+    setRegionId();
+    form.resetFields();
+    setEditModal(false);
+  };
+  const handleDelete = (id) => {
+    deleteRegion(id)
+      .then(() => {
+        message.success('删除成功');
+        actionRef.current.reload();
+      })
+      .catch((err) => {
+        message.error(err);
+      });
+  };
+  useEffect(() => {
+    if (regionId) {
+    } else {
+      form.resetFields();
+    }
+  }, [regionId]);
+  const columns = [
+    {
+      title: '区域名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: formatterTime,
+      search: false,
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      render: (_, record) => [
+        <a key={1} onClick={() => handelEdit(record)}>
+          编辑
+        </a>,
+        <Popconfirm
+          key={2}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.regionId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <a href="#">删除</a>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        request={getRegionList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        actionRef={actionRef}
+        rowKey="regionId"
+        options={false}
+        toolBarRender={actions}
+        scroll={{ x: 1000 }}
+      />
+      <Modal
+        title="区域新增"
+        visible={editModal}
+        onCancel={onCancel}
+        keyboard={false}
+        maskClosable={false}
+        destroyOnClose={true}
+        footer={null}
+      >
+        <Form {...formItemLayout} onFinish={Submit} form={form}>
+          <FormItem label="区域名" name="name" rules={[{ required: true, message: '请输入' }]}>
+            <Input placeholder="请输入" />
+          </FormItem>
+          <FormItem label=" " colon={false}>
+            <Button type="default" onClick={onCancel}>
+              取消
+            </Button>
+            <Button
+              type="primary"
+              loading={loading}
+              htmlType="Submit"
+              style={{ marginLeft: '4em' }}
+            >
+              确认
+            </Button>
+          </FormItem>
+        </Form>
+      </Modal>
+    </PageHeaderWrapper>
+  );
+};

src/pages/Welcome.jsx

@@ -7,6 +7,7 @@ import styles from './Welcome.less';
 const CodePreview = ({ children }) => (
   <pre className={styles.pre}>
     <code>
+      66666
       <Typography.Text copyable>{children}</Typography.Text>
     </code>
   </pre>

src/services/cooperative.js

@@ -1,36 +1,36 @@
 import request from '@/utils/request';
 
 /**
- * 保存扩展内容
+ * 保存组织机构
  * @param {*} data
  * @returns
  */
-export const save = (data) => request('/org', { method: 'post', data });
+export const addCooperative = (data) => request('/org', { method: 'post', data });
 
 /**
- * 修改扩展内容
+ * 修改组织机构
  * @param {*} data
  * @returns
  */
-export const update = (id, data) => request(`/org/${id}`, { method: 'put', data });
+export const updateCooperative = (id, data) => request(`/org/${id}`, { method: 'put', data });
 
 /**
- * 查询扩展内容列表
+ * 查询组织机构列表
  * @param {*} params
  * @returns
  */
-export const getList = (params) => request('/org', { params });
+export const getCooperativeList = (params) => request('/org', { params });
 
 /**
- * 删除扩展内容
+ * 删除组织机构
  * @param {*} data
  * @returns
  */
-export const remove = (id) => request(`/org/${id}`, { method: 'delete' });
+export const deleteCooperative = (id) => request(`/org/${id}`, { method: 'delete' });
 
 /**
- * 查询扩展内容详情
+ * 查询组织机构详情
  * @param {*} params
  * @returns
  */
-export const getDetail = (id) => request(`/org/${id}`);
+export const getCooperativeDetail = (id) => request(`/org/${id}`);

src/services/region.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request';
+
+/**
+ * 保存区域
+ * @param {*} data
+ * @returns
+ */
+export const addRegion = (data) => request('/region', { method: 'post', data });
+
+/**
+ * 修改区域
+ * @param {*} data
+ * @returns
+ */
+export const updateRegion = (id, data) => request(`/region/${id}`, { method: 'put', data });
+
+/**
+ * 查询区域列表
+ * @param {*} params
+ * @returns
+ */
+export const getRegionList = (params) => request('/region', { params });
+
+/**
+ * 删除区域
+ * @param {*} data
+ * @returns
+ */
+export const deleteRegion = (id) => request(`/region/${id}`, { method: 'delete' });
+
+/**
+ * 查询区域详情
+ * @param {*} params
+ * @returns
+ */
+export const getRegionDetail = (id) => request(`/region/${id}`);