From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/system/user/components/edit.jsx |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 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 906512d..c5d0cff 100644
--- a/zy-asrs-flow/src/pages/system/user/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
@@ -8,18 +8,21 @@
     ProFormTextArea,
     ProFormRadio
 } from '@ant-design/pro-components';
+import { FormattedMessage, useIntl } from '@umijs/max';
 import { Form, Modal } from 'antd';
 import moment from 'moment';
 import Http from '@/utils/http';
 
 const Edit = (props) => {
+    const intl = useIntl();
     const [form] = Form.useForm();
     const { } = props;
 
     useEffect(() => {
         form.resetFields();
         form.setFieldsValue({
-            ...props.values
+            ...props.values,
+            roleIds: props.values.userRoleIds
         })
     }, [form, props])
 
@@ -38,7 +41,11 @@
     return (
         <>
             <Modal
-                title="Edit"
+                title={
+                    Object.keys(props.values).length > 0
+                        ? intl.formatMessage({ id: 'page.edit', defaultMessage: '缂栬緫' })
+                        : intl.formatMessage({ id: 'page.add', defaultMessage: '娣诲姞' })
+                }
                 width={640}
                 forceRender
                 destroyOnClose
@@ -67,18 +74,16 @@
                                 return props.treeData;
                             }}
                             colProps={{ md: 12, xl: 12 }}
-                            placeholder="璇烽�夋嫨"
                             fieldProps={{
                                 treeDefaultExpandedKeys: [0]
                             }}
-                            rules={[{ required: true, message: "鎵�灞為儴闂ㄤ笉鑳戒负绌�" }]}
+                            rules={[{ required: true }]}
                         />
                         <ProFormText
                             name="username"
                             label="鐧诲綍璐﹀彿"
                             colProps={{ md: 12, xl: 12 }}
-                            placeholder="璇疯緭鍏�"
-                            rules={[{ required: true, message: "鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�" }]}
+                            rules={[{ required: true }]}
                         />
                     </ProForm.Group>
                     <ProForm.Group>
@@ -86,14 +91,12 @@
                             name="nickname"
                             label="鍚嶇О"
                             colProps={{ md: 12, xl: 12 }}
-                            placeholder="璇疯緭鍏�"
-                            rules={[{ required: true, message: "鍚嶇О涓嶈兘涓虹┖锛�" }]}
+                            rules={[{ required: true }]}
                         />
                         <ProFormSelect
                             name="sex"
                             label="鎬у埆"
                             colProps={{ md: 12, xl: 12 }}
-                            placeholder="璇烽�夋嫨"
                             options={[
                                 { label: '鏈煡', value: 0 },
                                 { label: '鐢�', value: 1 },
@@ -123,7 +126,6 @@
                             name="email"
                             label="閭"
                             colProps={{ md: 12, xl: 12 }}
-                            placeholder="璇疯緭鍏�"
                             rules={[
                                 {
                                     type: 'email',
@@ -131,7 +133,6 @@
                                 },
                                 {
                                     required: false,
-                                    message: '閭涓嶈兘涓虹┖!',
                                 },
                             ]}
                         />
@@ -141,13 +142,11 @@
                             name="realName"
                             label="鐪熷疄濮撳悕"
                             colProps={{ md: 12, xl: 12 }}
-                            placeholder="璇疯緭鍏�"
                         />
                         <ProFormText
                             name="idCard"
                             label="韬唤璇佸彿"
                             colProps={{ md: 12, xl: 12 }}
-                            placeholder="璇疯緭鍏�"
                         />
                     </ProForm.Group>
                     <ProForm.Group>
@@ -155,10 +154,14 @@
                             name="status"
                             label="鐘舵��"
                             colProps={{ md: 12, xl: 12 }}
-                            placeholder="璇烽�夋嫨"
                             options={[
                                 { label: '姝ｅ父', value: 1 },
                                 { label: '绂佺敤', value: 0 },
+                            ]}
+                            rules={[
+                                {
+                                    required: true,
+                                },
                             ]}
                         />
                         <ProFormSelect
@@ -166,7 +169,6 @@
                             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 });
@@ -178,7 +180,6 @@
                         name="memo"
                         label="澶囨敞"
                         colProps={{ md: 24, xl: 24 }}
-                        placeholder="璇疯緭鍏�"
                     />
                 </ProForm>
             </Modal>

--
Gitblit v1.9.1