李志伟 3 years ago
parent
commit
2f6db36654
3 changed files with 8 additions and 7 deletions
  1. 1
    1
      config/routes.js
  2. 2
    2
      src/pages/Machinery/Person/index.jsx
  3. 5
    4
      src/pages/customer/index.jsx

+ 1
- 1
config/routes.js View File

81
       {
81
       {
82
         path: '/customer/index.jsx',
82
         path: '/customer/index.jsx',
83
         name: '客户列表',
83
         name: '客户列表',
84
-        access: 'sys-customer',
84
+        access: 'customerList',
85
         icon: 'smile',
85
         icon: 'smile',
86
         component: './customer',
86
         component: './customer',
87
       },
87
       },

+ 2
- 2
src/pages/Machinery/Person/index.jsx View File

93
       setLoading(false);
93
       setLoading(false);
94
       return false;
94
       return false;
95
     }
95
     }
96
-    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)) {
96
+    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)) {
97
       message.warning('请输入正确的身份证号');
97
       message.warning('请输入正确的身份证号');
98
       setLoading(false);
98
       setLoading(false);
99
       return false;
99
       return false;
401
           <FormItem label="手机号" name="phone" rules={[{ required: true, message: '请输入' }]}>
401
           <FormItem label="手机号" name="phone" rules={[{ required: true, message: '请输入' }]}>
402
             <Input maxLength="11" placeholder="请输入" />
402
             <Input maxLength="11" placeholder="请输入" />
403
           </FormItem>
403
           </FormItem>
404
-          <FormItem label="身份证" name="ID" rules={[{ required: true, message: '请输入' }]}>
404
+          <FormItem label="身份证" name="idCard" rules={[{ required: true, message: '请输入' }]}>
405
             <Input placeholder="请输入" />
405
             <Input placeholder="请输入" />
406
           </FormItem>
406
           </FormItem>
407
           <FormItem label="登录账号" name="loginName" rules={[{ required: true, message: '请输入登录账号' }]}>
407
           <FormItem label="登录账号" name="loginName" rules={[{ required: true, message: '请输入登录账号' }]}>

+ 5
- 4
src/pages/customer/index.jsx View File

35
       title: '头像',
35
       title: '头像',
36
       dataIndex: 'avatar',
36
       dataIndex: 'avatar',
37
       key: 'avatar',
37
       key: 'avatar',
38
+      search: false
38
     },
39
     },
39
     {
40
     {
40
       title: '手机号',
41
       title: '手机号',
47
       key: 'type',
48
       key: 'type',
48
       dataIndex: 'position',
49
       dataIndex: 'position',
49
       render: (_, record) => {
50
       render: (_, record) => {
50
-        return record.position === 'index'
51
+        return record.position === 'farmer'
51
           ? '农户'
52
           ? '农户'
52
-          : record.position === 'appIndex'
53
+          : record.position === 'worker'
53
             ? '农机手' : ''
54
             ? '农机手' : ''
54
       },
55
       },
55
       valueType: 'select',
56
       valueType: 'select',
56
       valueEnum: {
57
       valueEnum: {
57
-        'index': { text: '农户' },
58
-        'appIndex': { text: '农机手' },
58
+        'farmer': { text: '农户' },
59
+        'worker': { text: '农机手' },
59
       },
60
       },
60
     },
61
     },
61
 
62