李志伟 3 年前
父节点
当前提交
d22a238031

+ 13
- 13
config/routes.js 查看文件

239
     access: 'system',
239
     access: 'system',
240
     component: '../layouts/BasicLayout',
240
     component: '../layouts/BasicLayout',
241
     routes: [
241
     routes: [
242
+      {
243
+        path: '/SystemManagement/MapExtent',
244
+        name: '区域设置',
245
+        access: 'region',
246
+        component: './SystemManagement/MapExtent',
247
+        // hideInMenu: true
248
+      },
242
       {
249
       {
243
         path: '/SystemManagement/Cooperative',
250
         path: '/SystemManagement/Cooperative',
244
         name: '机构列表',
251
         name: '机构列表',
251
         component: './SystemManagement/Cooperative/edit.jsx',
258
         component: './SystemManagement/Cooperative/edit.jsx',
252
         hideInMenu: true,
259
         hideInMenu: true,
253
       },
260
       },
261
+      {
262
+        path: '/SystemManagement/UserRights',
263
+        name: '角色管理',
264
+        access: 'role',
265
+        component: './SystemManagement/UserRights',
266
+      },
254
       {
267
       {
255
         path: '/SystemManagement/Administrator',
268
         path: '/SystemManagement/Administrator',
256
         name: '人员管理',
269
         name: '人员管理',
263
         component: './SystemManagement/Administrator/AdminEdit',
276
         component: './SystemManagement/Administrator/AdminEdit',
264
         hideInMenu: true,
277
         hideInMenu: true,
265
       },
278
       },
266
-      {
267
-        path: '/SystemManagement/UserRights',
268
-        name: '角色管理',
269
-        access: 'role',
270
-        component: './SystemManagement/UserRights',
271
-      },
272
       {
279
       {
273
         path: '/SystemManagement/BasicParameters',
280
         path: '/SystemManagement/BasicParameters',
274
         name: '基本参数',
281
         name: '基本参数',
275
         access: 'setting',
282
         access: 'setting',
276
         component: './SystemManagement/BasicParameters',
283
         component: './SystemManagement/BasicParameters',
277
       },
284
       },
278
-      {
279
-        path: '/SystemManagement/MapExtent',
280
-        name: '区域设置',
281
-        access: 'region',
282
-        component: './SystemManagement/MapExtent',
283
-        // hideInMenu: true
284
-      },
285
     ],
285
     ],
286
   },
286
   },
287
 
287
 

+ 1
- 1
src/components/PageTable/index.jsx 查看文件

46
       {...leftProps}
46
       {...leftProps}
47
       params={params}
47
       params={params}
48
       formRef={ref}
48
       formRef={ref}
49
-      // request={getList}
49
+      request={getList}
50
       toolBarRender={renderToolbar}
50
       toolBarRender={renderToolbar}
51
     />
51
     />
52
   );
52
   );

+ 11
- 6
src/pages/SystemManagement/Cooperative/edit.jsx 查看文件

97
         <ProCard.TabPane key={1} tab="合作社编辑">
97
         <ProCard.TabPane key={1} tab="合作社编辑">
98
           <Form {...formItemLayout} onFinish={Submit} form={form}>
98
           <Form {...formItemLayout} onFinish={Submit} form={form}>
99
             <FormItem
99
             <FormItem
100
-              label="合作社名称"
101
-              name="title"
102
-              rules={[{ required: true, message: '请输入合作社名称16个字符以内' }]}
100
+              label="机构名称"
101
+              name="name"
102
+              rules={[{ required: true, message: '请输入机构名称16个字符以内' }]}
103
             >
103
             >
104
               <Input
104
               <Input
105
-                placeholder="请输入合作社名称16个字符以内"
105
+                placeholder="请输入机构名称16个字符以内"
106
                 maxLength="16"
106
                 maxLength="16"
107
                 style={{ width: '350px' }}
107
                 style={{ width: '350px' }}
108
               />
108
               />
110
             <FormItem
110
             <FormItem
111
               label="信用代码"
111
               label="信用代码"
112
               name="creditCode"
112
               name="creditCode"
113
-              rules={[{ required: true, message: '请输入' }]}
113
+              rules={[{ required: true, message: '请输入信用代码' }]}
114
             >
114
             >
115
               <Input placeholder="请输入信用代码" style={{ width: '350px' }} />
115
               <Input placeholder="请输入信用代码" style={{ width: '350px' }} />
116
             </FormItem>
116
             </FormItem>
117
             <FormItem
117
             <FormItem
118
               label="联系人"
118
               label="联系人"
119
-              name="name"
119
+              name="contactPerson"
120
               rules={[{ required: true, message: '请输入联系人' }]}
120
               rules={[{ required: true, message: '请输入联系人' }]}
121
             >
121
             >
122
               <Input placeholder="请输入联系人" rows={4} style={{ width: '350px' }} />
122
               <Input placeholder="请输入联系人" rows={4} style={{ width: '350px' }} />
147
             >
147
             >
148
               <TextArea placeholder="请输入地址" style={{ width: '350px' }} />
148
               <TextArea placeholder="请输入地址" style={{ width: '350px' }} />
149
             </FormItem>
149
             </FormItem>
150
+            <FormItem
151
+              label="区域"
152
+              name="regionId"
153
+              rules={[{ required: true, message: '请输入区域' }]}
154
+            />
150
             <FormItem label=" " colon={false}>
155
             <FormItem label=" " colon={false}>
151
               <Button type="default" onClick={() => goBack()}>
156
               <Button type="default" onClick={() => goBack()}>
152
                 返回
157
                 返回

+ 24
- 14
src/pages/SystemManagement/Cooperative/index.jsx 查看文件

2
 import { history, Link } from 'umi';
2
 import { history, Link } from 'umi';
3
 import { Button, Popconfirm, message, Tooltip } from 'antd';
3
 import { Button, Popconfirm, message, Tooltip } from 'antd';
4
 import { PlusOutlined } from '@ant-design/icons';
4
 import { PlusOutlined } from '@ant-design/icons';
5
-// import { getPersonList, exportPersonList } from '@/services/person';
5
+import { getList } from '@/services/cooperative';
6
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
6
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
7
 import moment from 'moment';
7
 import moment from 'moment';
8
 import PageTable from '@/components/PageTable';
8
 import PageTable from '@/components/PageTable';
14
 export default (props) => {
14
 export default (props) => {
15
   const actions = () => [
15
   const actions = () => [
16
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
16
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
17
-      新增合作社
17
+      新增机构
18
     </Button>,
18
     </Button>,
19
   ];
19
   ];
20
   const gotoEdit = (id) => {
20
   const gotoEdit = (id) => {
23
   };
23
   };
24
   const columns = [
24
   const columns = [
25
     {
25
     {
26
-      title: '合作社名',
27
-      dataIndex: 'title',
28
-      key: 'title',
29
-    },
30
-    {
31
-      title: '地址',
32
-      dataIndex: 'address',
33
-      key: 'address',
26
+      title: '机构名',
27
+      dataIndex: 'name',
28
+      key: 'name',
34
     },
29
     },
35
     {
30
     {
36
       title: '联系人',
31
       title: '联系人',
37
-      dataIndex: 'name',
38
-      key: 'name',
32
+      dataIndex: 'contactPerson',
33
+      key: 'contactPerson',
39
     },
34
     },
40
     {
35
     {
41
-      title: '手机号',
36
+      title: '联系方式',
42
       dataIndex: 'phone',
37
       dataIndex: 'phone',
43
       key: 'phone',
38
       key: 'phone',
44
     },
39
     },
40
+    {
41
+      title: '区域',
42
+      dataIndex: 'regionId',
43
+      key: 'regionId',
44
+    },
45
+    {
46
+      title: '地址',
47
+      dataIndex: 'address',
48
+      key: 'address',
49
+      search: false,
50
+    },
51
+
45
     {
52
     {
46
       title: '农机数',
53
       title: '农机数',
47
       dataIndex: 'machineryNum',
54
       dataIndex: 'machineryNum',
48
       key: 'machineryNum',
55
       key: 'machineryNum',
56
+      search: false,
49
     },
57
     },
50
     {
58
     {
51
       title: '员工数',
59
       title: '员工数',
52
       dataIndex: 'employeesNum',
60
       dataIndex: 'employeesNum',
53
       key: 'employeesNum',
61
       key: 'employeesNum',
62
+      search: false,
54
     },
63
     },
55
     {
64
     {
56
       title: '完成订单数',
65
       title: '完成订单数',
62
       title: '评分',
71
       title: '评分',
63
       dataIndex: 'score',
72
       dataIndex: 'score',
64
       key: 'score',
73
       key: 'score',
74
+      search: false,
65
     },
75
     },
66
     {
76
     {
67
       title: '操作',
77
       title: '操作',
86
   return (
96
   return (
87
     <PageHeaderWrapper>
97
     <PageHeaderWrapper>
88
       <PageTable
98
       <PageTable
89
-        // request={getPersonList}
99
+        request={getList}
90
         // expfunc={exportPersonList}
100
         // expfunc={exportPersonList}
91
         columns={columns}
101
         columns={columns}
92
         rowKey="cooperativeId"
102
         rowKey="cooperativeId"

+ 36
- 0
src/services/cooperative.js 查看文件

1
+import request from '@/utils/request';
2
+
3
+/**
4
+ * 保存扩展内容
5
+ * @param {*} data
6
+ * @returns
7
+ */
8
+export const save = (data) => request('/org', { method: 'post', data });
9
+
10
+/**
11
+ * 修改扩展内容
12
+ * @param {*} data
13
+ * @returns
14
+ */
15
+export const update = (id, data) => request(`/org/${id}`, { method: 'put', data });
16
+
17
+/**
18
+ * 查询扩展内容列表
19
+ * @param {*} params
20
+ * @returns
21
+ */
22
+export const getList = (params) => request('/org', { params });
23
+
24
+/**
25
+ * 删除扩展内容
26
+ * @param {*} data
27
+ * @returns
28
+ */
29
+export const remove = (id) => request(`/org/${id}`, { method: 'delete' });
30
+
31
+/**
32
+ * 查询扩展内容详情
33
+ * @param {*} params
34
+ * @returns
35
+ */
36
+export const getDetail = (id) => request(`/org/${id}`);