From dbc5fc7f7c8ef73b6b175f6b421b0c64efe89e33 Mon Sep 17 00:00:00 2001
From: xjj <xjj@123>
Date: 星期二, 27 二月 2024 13:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zy-asrs-flow/src/pages/system/user/components/edit.jsx | 86 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/components/edit.jsx b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
index a38e153..906512d 100644
--- a/zy-asrs-flow/src/pages/system/user/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
@@ -4,7 +4,9 @@
ProFormDigit,
ProFormText,
ProFormSelect,
- ProFormTreeSelect
+ ProFormTreeSelect,
+ ProFormTextArea,
+ ProFormRadio
} from '@ant-design/pro-components';
import { Form, Modal } from 'antd';
import moment from 'moment';
@@ -72,27 +74,31 @@
rules={[{ required: true, message: "鎵�灞為儴闂ㄤ笉鑳戒负绌�" }]}
/>
<ProFormText
- name="nickname"
- label="鍚嶇О"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- rules={[{ required: true, message: "鍚嶇О涓嶈兘涓虹┖锛�" }]}
- />
-
- </ProForm.Group>
- <ProForm.Group>
- <ProFormText
name="username"
label="鐧诲綍璐﹀彿"
colProps={{ md: 12, xl: 12 }}
placeholder="璇疯緭鍏�"
rules={[{ required: true, message: "鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�" }]}
/>
+ </ProForm.Group>
+ <ProForm.Group>
<ProFormText
- name="password"
- label="鐧诲綍瀵嗙爜"
+ name="nickname"
+ label="鍚嶇О"
colProps={{ md: 12, xl: 12 }}
placeholder="璇疯緭鍏�"
+ rules={[{ required: true, message: "鍚嶇О涓嶈兘涓虹┖锛�" }]}
+ />
+ <ProFormSelect
+ name="sex"
+ label="鎬у埆"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ options={[
+ { label: '鏈煡', value: 0 },
+ { label: '鐢�', value: 1 },
+ { label: '濂�', value: 2 },
+ ]}
/>
</ProForm.Group>
<ProForm.Group>
@@ -103,15 +109,15 @@
placeholder="璇疯緭鍏�"
rules={[
{
- pattern: /^1[3456789]\d{9}$/,
- message: '璇疯緭鍏ユ纭殑鎵嬫満鍙风爜!',
+ pattern: /^1[3456789]\d{9}$/,
+ message: '璇疯緭鍏ユ纭殑鎵嬫満鍙风爜!',
},
{
- required: false,
- message: '鎵嬫満鍙风爜涓嶈兘涓虹┖!',
+ required: false,
+ message: '鎵嬫満鍙风爜涓嶈兘涓虹┖!',
},
- ]}
-
+ ]}
+
/>
<ProFormText
name="email"
@@ -120,14 +126,14 @@
placeholder="璇疯緭鍏�"
rules={[
{
- type: 'email',
- message: '璇疯緭鍏ユ纭殑閭鍦板潃!',
+ type: 'email',
+ message: '璇疯緭鍏ユ纭殑閭鍦板潃!',
},
{
- required: false,
- message: '閭涓嶈兘涓虹┖!',
+ required: false,
+ message: '閭涓嶈兘涓虹┖!',
},
- ]}
+ ]}
/>
</ProForm.Group>
<ProForm.Group>
@@ -145,18 +151,7 @@
/>
</ProForm.Group>
<ProForm.Group>
- <ProFormSelect
- name="sex"
- label="鎬у埆"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
- options={[
- { label: '鏈煡', value: 0 },
- { label: '鐢�', value: 1 },
- { label: '濂�', value: 2 },
- ]}
- />
- <ProFormSelect
+ <ProFormRadio.Group
name="status"
label="鐘舵��"
colProps={{ md: 12, xl: 12 }}
@@ -166,8 +161,25 @@
{ label: '绂佺敤', value: 0 },
]}
/>
+ <ProFormSelect
+ name="roleIds"
+ mode="multiple"
+ label="瑙掕壊"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ rules={[{ required: true, type: 'array', message: '瑙掕壊涓嶈兘涓虹┖!' }]}
+ request={async ({ keyWords }) => {
+ const resp = await Http.doPostForm('api/role/query', { condition: keyWords });
+ return resp.data;
+ }}
+ />
</ProForm.Group>
-
+ <ProFormTextArea
+ name="memo"
+ label="澶囨敞"
+ colProps={{ md: 24, xl: 24 }}
+ placeholder="璇疯緭鍏�"
+ />
</ProForm>
</Modal>
</>
--
Gitblit v1.9.1