.

config/routes.js

@@ -239,6 +239,13 @@ export default [
     access: 'system',
     component: '../layouts/BasicLayout',
     routes: [
+      {
+        path: '/SystemManagement/MapExtent',
+        name: '区域设置',
+        access: 'region',
+        component: './SystemManagement/MapExtent',
+        // hideInMenu: true
+      },
       {
         path: '/SystemManagement/Cooperative',
         name: '机构列表',
@@ -251,6 +258,12 @@ export default [
         component: './SystemManagement/Cooperative/edit.jsx',
         hideInMenu: true,
       },
+      {
+        path: '/SystemManagement/UserRights',
+        name: '角色管理',
+        access: 'role',
+        component: './SystemManagement/UserRights',
+      },
       {
         path: '/SystemManagement/Administrator',
         name: '人员管理',
@@ -263,25 +276,12 @@ export default [
         component: './SystemManagement/Administrator/AdminEdit',
         hideInMenu: true,
       },
-      {
-        path: '/SystemManagement/UserRights',
-        name: '角色管理',
-        access: 'role',
-        component: './SystemManagement/UserRights',
-      },
       {
         path: '/SystemManagement/BasicParameters',
         name: '基本参数',
         access: 'setting',
         component: './SystemManagement/BasicParameters',
       },
-      {
-        path: '/SystemManagement/MapExtent',
-        name: '区域设置',
-        access: 'region',
-        component: './SystemManagement/MapExtent',
-        // hideInMenu: true
-      },
     ],
   },
 

src/components/PageTable/index.jsx

@@ -46,7 +46,7 @@ export default (props) => {
       {...leftProps}
       params={params}
       formRef={ref}
-      // request={getList}
+      request={getList}
       toolBarRender={renderToolbar}
     />
   );

src/pages/SystemManagement/Cooperative/edit.jsx

@@ -97,12 +97,12 @@ export default (props) => {
         <ProCard.TabPane key={1} tab="合作社编辑">
           <Form {...formItemLayout} onFinish={Submit} form={form}>
             <FormItem
-              label="合作社名称"
-              name="title"
-              rules={[{ required: true, message: '请输入合作社名称16个字符以内' }]}
+              label="机构名称"
+              name="name"
+              rules={[{ required: true, message: '请输入机构名称16个字符以内' }]}
             >
               <Input
-                placeholder="请输入合作社名称16个字符以内"
+                placeholder="请输入机构名称16个字符以内"
                 maxLength="16"
                 style={{ width: '350px' }}
               />
@@ -110,13 +110,13 @@ export default (props) => {
             <FormItem
               label="信用代码"
               name="creditCode"
-              rules={[{ required: true, message: '请输入' }]}
+              rules={[{ required: true, message: '请输入信用代码' }]}
             >
               <Input placeholder="请输入信用代码" style={{ width: '350px' }} />
             </FormItem>
             <FormItem
               label="联系人"
-              name="name"
+              name="contactPerson"
               rules={[{ required: true, message: '请输入联系人' }]}
             >
               <Input placeholder="请输入联系人" rows={4} style={{ width: '350px' }} />
@@ -147,6 +147,11 @@ export default (props) => {
             >
               <TextArea placeholder="请输入地址" style={{ width: '350px' }} />
             </FormItem>
+            <FormItem
+              label="区域"
+              name="regionId"
+              rules={[{ required: true, message: '请输入区域' }]}
+            />
             <FormItem label=" " colon={false}>
               <Button type="default" onClick={() => goBack()}>
                 返回

src/pages/SystemManagement/Cooperative/index.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { history, Link } from 'umi';
 import { Button, Popconfirm, message, Tooltip } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-// import { getPersonList, exportPersonList } from '@/services/person';
+import { getList } from '@/services/cooperative';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
@@ -14,7 +14,7 @@ const formatterTime = (val) => {
 export default (props) => {
   const actions = () => [
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
-      新增合作社
+      新增机构
     </Button>,
   ];
   const gotoEdit = (id) => {
@@ -23,34 +23,43 @@ export default (props) => {
   };
   const columns = [
     {
-      title: '合作社名',
-      dataIndex: 'title',
-      key: 'title',
-    },
-    {
-      title: '地址',
-      dataIndex: 'address',
-      key: 'address',
+      title: '机构名',
+      dataIndex: 'name',
+      key: 'name',
     },
     {
       title: '联系人',
-      dataIndex: 'name',
-      key: 'name',
+      dataIndex: 'contactPerson',
+      key: 'contactPerson',
     },
     {
-      title: '手机号',
+      title: '联系方式',
       dataIndex: 'phone',
       key: 'phone',
     },
+    {
+      title: '区域',
+      dataIndex: 'regionId',
+      key: 'regionId',
+    },
+    {
+      title: '地址',
+      dataIndex: 'address',
+      key: 'address',
+      search: false,
+    },
+
     {
       title: '农机数',
       dataIndex: 'machineryNum',
       key: 'machineryNum',
+      search: false,
     },
     {
       title: '员工数',
       dataIndex: 'employeesNum',
       key: 'employeesNum',
+      search: false,
     },
     {
       title: '完成订单数',
@@ -62,6 +71,7 @@ export default (props) => {
       title: '评分',
       dataIndex: 'score',
       key: 'score',
+      search: false,
     },
     {
       title: '操作',
@@ -86,7 +96,7 @@ export default (props) => {
   return (
     <PageHeaderWrapper>
       <PageTable
-        // request={getPersonList}
+        request={getList}
         // expfunc={exportPersonList}
         columns={columns}
         rowKey="cooperativeId"

src/services/cooperative.js

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