From b016d1eb02dd09fd1ffcd24e4e6ddee72fd1b3d6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 10:27:25 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/system/user/components/edit.jsx |  105 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 70 insertions(+), 35 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 cf44e7d..3bca79a 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,
-    ProFormDateTimePicker
+    ProFormTreeSelect,
+    ProFormTextArea,
+    ProFormRadio
 } from '@ant-design/pro-components';
 import { Form, Modal } from 'antd';
 import moment from 'moment';
@@ -17,7 +19,8 @@
     useEffect(() => {
         form.resetFields();
         form.setFieldsValue({
-            ...props.values
+            ...props.values,
+            roleIds: props.values.userRoleIds
         })
     }, [form, props])
 
@@ -57,29 +60,20 @@
                         hidden={true}
                     />
                     <ProForm.Group>
-                        <ProFormSelect
+                        <ProFormTreeSelect
                             name="deptId"
                             label="鎵�灞為儴闂�"
-                            colProps={{ md: 12, xl: 12 }}
-                            fieldProps={{ precision: 0 }}
-                            placeholder="璇烽�夋嫨"
-                            showSearch
-                            debounceTime={300}
-                            request={async ({ keyWords }) => {
-                                const resp = await Http.doPostForm('api/dept/query', { condition: keyWords });
-                                return resp.data;
+                            params={props.treeData}
+                            request={async () => {
+                                return props.treeData;
                             }}
-                        />
-                        <ProFormText
-                            name="nickname"
-                            label="鍚嶇О"
                             colProps={{ md: 12, xl: 12 }}
-                            placeholder="璇疯緭鍏�"
-                            rules={[{ required: true, message: "鍚嶇О涓嶈兘涓虹┖锛�" }]}
+                            placeholder="璇烽�夋嫨"
+                            fieldProps={{
+                                treeDefaultExpandedKeys: [0]
+                            }}
+                            rules={[{ required: true, message: "鎵�灞為儴闂ㄤ笉鑳戒负绌�" }]}
                         />
-
-                    </ProForm.Group>
-                    <ProForm.Group>
                         <ProFormText
                             name="username"
                             label="鐧诲綍璐﹀彿"
@@ -87,11 +81,25 @@
                             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>
@@ -100,12 +108,33 @@
                             label="鎵嬫満鍙�"
                             colProps={{ md: 12, xl: 12 }}
                             placeholder="璇疯緭鍏�"
+                            rules={[
+                                {
+                                    pattern: /^1[3456789]\d{9}$/,
+                                    message: '璇疯緭鍏ユ纭殑鎵嬫満鍙风爜!',
+                                },
+                                {
+                                    required: false,
+                                    message: '鎵嬫満鍙风爜涓嶈兘涓虹┖!',
+                                },
+                            ]}
+
                         />
                         <ProFormText
                             name="email"
                             label="閭"
                             colProps={{ md: 12, xl: 12 }}
                             placeholder="璇疯緭鍏�"
+                            rules={[
+                                {
+                                    type: 'email',
+                                    message: '璇疯緭鍏ユ纭殑閭鍦板潃!',
+                                },
+                                {
+                                    required: false,
+                                    message: '閭涓嶈兘涓虹┖!',
+                                },
+                            ]}
                         />
                     </ProForm.Group>
                     <ProForm.Group>
@@ -123,18 +152,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 }}
@@ -144,8 +162,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