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 |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 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 82574fd..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';
@@ -149,8 +151,7 @@
                         />
                     </ProForm.Group>
                     <ProForm.Group>
-
-                        <ProFormSelect
+                        <ProFormRadio.Group
                             name="status"
                             label="鐘舵��"
                             colProps={{ md: 12, xl: 12 }}
@@ -160,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