李志伟 3 лет назад
Родитель
Сommit
f39bebadca
1 измененных файлов: 21 добавлений и 3 удалений
  1. 21
    3
      src/pages/Machinery/Person/index.jsx

+ 21
- 3
src/pages/Machinery/Person/index.jsx Просмотреть файл

298
       key: 'createDate',
298
       key: 'createDate',
299
       render: formatterTime,
299
       render: formatterTime,
300
       search: false,
300
       search: false,
301
-      width: 160,
301
+      width: 80,
302
     },
302
     },
303
     {
303
     {
304
       title: '状态',
304
       title: '状态',
310
         return record.status === 1 ? '启用' : '未启用';
310
         return record.status === 1 ? '启用' : '未启用';
311
       },
311
       },
312
     },
312
     },
313
+    {
314
+      title: '管理员',
315
+      dataIndex: 'isOrgManager',
316
+      key: 'isOrgManager',
317
+      width: 80,
318
+      search: false,
319
+      render: (_, record) => {
320
+        return record.isOrgManager && record.isOrgManager == 1 ? '管理员' : '非管理员';
321
+      },
322
+    },
313
     {
323
     {
314
       title: '操作',
324
       title: '操作',
315
       valueType: 'option',
325
       valueType: 'option',
401
           <FormItem label="所属合作社" name="orgId" rules={[{ required: true, message: '请输入' }]}>
411
           <FormItem label="所属合作社" name="orgId" rules={[{ required: true, message: '请输入' }]}>
402
             <Search placeholder="请输入合作社" onChange={handelChange} />
412
             <Search placeholder="请输入合作社" onChange={handelChange} />
403
           </FormItem>
413
           </FormItem>
414
+          {
415
+            userId && <FormItem label="合作社管理员" name="isOrgManager" rules={[{ required: true, message: '请选择' }]}>
416
+              <Select placeholder="请选择是否启用">
417
+                <Option value={0}>否</Option>
418
+                <Option value={1}>是</Option>
419
+              </Select>
420
+            </FormItem>
421
+          }
404
           <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
422
           <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
405
             <Select placeholder="请选择是否启用">
423
             <Select placeholder="请选择是否启用">
406
-              <Option value={1}>启用</Option>
407
-              <Option value={0}>禁用</Option>
424
+              <Option value={true}>启用</Option>
425
+              <Option value={false}>禁用</Option>
408
             </Select>
426
             </Select>
409
           </FormItem>
427
           </FormItem>
410
           <FormItem label=" " colon={false}>
428
           <FormItem label=" " colon={false}>