From 072aabdd22b156abbae492d2bec631b59c323b29 Mon Sep 17 00:00:00 2001
From: ky_yusj <2655568377@qq.com>
Date: Fri, 2 Jul 2021 15:42:56 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=91=E6=9F=A5=E8=AF=A2table=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=80=89=E9=A1=B9,?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=9C=A8"=E5=8F=AA=E7=9C=8B=E6=9C=AC?=
 =?UTF-8?q?=E7=BA=A7"=E5=92=8C"=E6=9F=A5=E7=9C=8B=E6=9C=AC=E7=BA=A7?=
 =?UTF-8?q?=E5=8F=8A=E4=BB=A5=E4=B8=8B"=E4=B9=8B=E9=97=B4=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E6=A0=BC=E5=BC=8F=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HouseMember/HouseMemberService.cs         |  4 ++-
 Api/Ewide.Core/Ewide.Core.xml                 |  5 ++++
 Api/Ewide.Core/Extension/InputBase.cs         |  5 ++++
 .../src/pages/business/house/member/form.jsx  | 27 ++++++++++++++++---
 .../src/pages/business/house/member/index.jsx | 16 ++++++++++-
 web-react/src/pages/system/user/form.jsx      | 25 +++++++++++++++--
 6 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs
index 309d93b..5f68f22 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs
@@ -82,7 +82,9 @@ WHERE 1=1";
 
             if (!string.IsNullOrEmpty(input.SysEmpParam.OrgId))
             {
-                sql += " AND (SO.Id = @OrgId OR SO.Pids Like CONCAT('%[', @OrgId, ']%'))";
+                var filter = " AND (SO.Id = @OrgId {0}) ";
+                filter = String.Format(filter, input.TreeNodeDataScope.GetValueOrDefault(1) == 2 ? " OR SO.Pids Like CONCAT('%[', @OrgId, ']%') " : "");
+                sql += filter;
                 param.Add("OrgId", input.SysEmpParam.OrgId);
             }
 
diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml
index 5d038ce..712fedc 100644
--- a/Api/Ewide.Core/Ewide.Core.xml
+++ b/Api/Ewide.Core/Ewide.Core.xml
@@ -2674,6 +2674,11 @@
             查询条件 
             </summary>
         </member>
+        <member name="P:Ewide.Core.PageInputBase.TreeNodeDataScope">
+            <summary>
+            树节点数据范围 （1"只看本级" 2"查看本级及以下"）
+            </summary>
+        </member>
         <member name="T:Ewide.Core.PageDataResult`1">
             <summary>
             小诺分页列表结果
diff --git a/Api/Ewide.Core/Extension/InputBase.cs b/Api/Ewide.Core/Extension/InputBase.cs
index 0b86364..1911128 100644
--- a/Api/Ewide.Core/Extension/InputBase.cs
+++ b/Api/Ewide.Core/Extension/InputBase.cs
@@ -76,6 +76,11 @@ namespace Ewide.Core
         /// 查询条件 
         /// </summary>
         public virtual SearchInfo[] SearchInfo { get; set; }
+
+        /// <summary>
+        /// 树节点数据范围 （1"只看本级" 2"查看本级及以下"）
+        /// </summary>
+        public virtual int? TreeNodeDataScope { get; set; }
     }
 
 }
diff --git a/web-react/src/pages/business/house/member/form.jsx b/web-react/src/pages/business/house/member/form.jsx
index db24377..262d9fd 100644
--- a/web-react/src/pages/business/house/member/form.jsx
+++ b/web-react/src/pages/business/house/member/form.jsx
@@ -256,11 +256,32 @@ export default class form extends Component {
                                 </Radio.Button>
                             </Radio.Group>
                         </Form.Item>
-                        <Form.Item label="邮箱" name="email">
+                        <Form.Item
+                            label="邮箱"
+                            name="email"
+                            rules={[
+                                {
+                                    pattern: /^\w{3,}(\.\w+)*@[A-z0-9]+(\.[A-z]{2,5}){1,2}$/,
+                                    message: '邮箱格式不正确',
+                                    trigger: 'blur',
+                                },
+                            ]}
+                        >
                             <Input autoComplete="off" placeholder="请输入邮箱" />
                         </Form.Item>
-                        <Form.Item label="手机号" name="phone">
-                            <Input autoComplete="off" placeholder="请输入手机号" />
+                        <Form.Item
+                            label="手机号"
+                            name="phone"
+                            rules={[
+                                {
+                                    pattern:
+                                        /^((13[0-9])|(14[5,7])|(15[^4,\\D])|(17[0,1,3,6-8])|(18[0-9])|(19[8,9])|(166))[0-9]{8}$/,
+                                    message: '手机号格式不正确',
+                                    trigger: 'blur',
+                                },
+                            ]}
+                        >
+                            <Input autoComplete="off" placeholder="请输入手机号" maxLength={11} />
                         </Form.Item>
                         <Form.Item label="电话" name="tel">
                             <Input autoComplete="off" placeholder="请输入电话" />
diff --git a/web-react/src/pages/business/house/member/index.jsx b/web-react/src/pages/business/house/member/index.jsx
index e5b64d0..02dd057 100644
--- a/web-react/src/pages/business/house/member/index.jsx
+++ b/web-react/src/pages/business/house/member/index.jsx
@@ -339,13 +339,27 @@ export default class index extends Component {
                                         >
                                             {this.state.codes.commonStatus.map(item => {
                                                 return (
-                                                    <Select.Option key={item.code} item={item.code}>
+                                                    <Select.Option
+                                                        key={item.code}
+                                                        value={item.code}
+                                                    >
                                                         {item.value}
                                                     </Select.Option>
                                                 )
                                             })}
                                         </Select>
                                     </Form.Item>
+                                    <Form.Item label="区域范围" name="treeNodeDataScope">
+                                        <Select
+                                            allowClear
+                                            placeholder="请选择状态"
+                                            className="w-200"
+                                            defaultValue={1}
+                                        >
+                                            <Select.Option value={1}>只看本级</Select.Option>
+                                            <Select.Option value={2}>查看本级及以下</Select.Option>
+                                        </Select>
+                                    </Form.Item>
                                 </Auth>
                             }
                             operator={
diff --git a/web-react/src/pages/system/user/form.jsx b/web-react/src/pages/system/user/form.jsx
index 8504d3a..a33b5ed 100644
--- a/web-react/src/pages/system/user/form.jsx
+++ b/web-react/src/pages/system/user/form.jsx
@@ -350,10 +350,31 @@ export default class form extends Component {
                                 </Radio.Button>
                             </Radio.Group>
                         </Form.Item>
-                        <Form.Item label="邮箱" name="email">
+                        <Form.Item
+                            label="邮箱"
+                            name="email"
+                            rules={[
+                                {
+                                    pattern: /^\w{3,}(\.\w+)*@[A-z0-9]+(\.[A-z]{2,5}){1,2}$/,
+                                    message: '邮箱格式不正确',
+                                    trigger: 'blur',
+                                },
+                            ]}
+                        >
                             <Input autoComplete="off" placeholder="请输入邮箱" />
                         </Form.Item>
-                        <Form.Item label="手机号" name="phone">
+                        <Form.Item
+                            label="手机号"
+                            name="phone"
+                            rules={[
+                                {
+                                    pattern:
+                                        /^((13[0-9])|(14[5,7])|(15[^4,\\D])|(17[0,1,3,6-8])|(18[0-9])|(19[8,9])|(166))[0-9]{8}$/,
+                                    message: '手机号格式不正确',
+                                    trigger: 'blur',
+                                },
+                            ]}
+                        >
                             <Input autoComplete="off" placeholder="请输入手机号" />
                         </Form.Item>
                         <Form.Item label="电话" name="tel">