ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Browse Source
This commit is contained in:
自带大佬气场
2021-07-02 16:13:58 +08:00
parent f8e2952727 a30ee519e3
commit fda3e8e8f2
6 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs
View File

@@ -82,7 +82,9 @@ WHERE 1=1";
if (!string.IsNullOrEmpty(input.SysEmpParam.OrgId)) 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); param.Add("OrgId", input.SysEmpParam.OrgId);
} }

5
Api/Ewide.Core/Ewide.Core.xml
View File

@@ -2674,6 +2674,11 @@
查询条件 查询条件
</summary> </summary>
</member> </member>
<member name="P:Ewide.Core.PageInputBase.TreeNodeDataScope">
<summary>
树节点数据范围 （1"只看本级" 2"查看本级及以下"）
</summary>
</member>
<member name="T:Ewide.Core.PageDataResult`1"> <member name="T:Ewide.Core.PageDataResult`1">
<summary> <summary>
小诺分页列表结果 小诺分页列表结果

5
Api/Ewide.Core/Extension/InputBase.cs
View File

@@ -76,6 +76,11 @@ namespace Ewide.Core
/// 查询条件 /// 查询条件
/// </summary> /// </summary>
public virtual SearchInfo[] SearchInfo { get; set; } public virtual SearchInfo[] SearchInfo { get; set; }
/// <summary>
/// 树节点数据范围 （1"只看本级" 2"查看本级及以下"）
/// </summary>
public virtual int? TreeNodeDataScope { get; set; }
} }
} }

27
web-react/src/pages/business/house/member/form.jsx
View File

@@ -256,11 +256,32 @@ export default class form extends Component {
</Radio.Button> </Radio.Button>
</Radio.Group> </Radio.Group>
</Form.Item> </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="请输入邮箱" /> <Input autoComplete="off" placeholder="请输入邮箱" />
</Form.Item> </Form.Item>
<Form.Item label="手机号" name="phone"> <Form.Item
<Input autoComplete="off" placeholder="请输入手机号" /> 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>
<Form.Item label="电话" name="tel"> <Form.Item label="电话" name="tel">
<Input autoComplete="off" placeholder="请输入电话" /> <Input autoComplete="off" placeholder="请输入电话" />

16
web-react/src/pages/business/house/member/index.jsx
View File

@@ -339,13 +339,27 @@ export default class index extends Component {
> >
{this.state.codes.commonStatus.map(item => { {this.state.codes.commonStatus.map(item => {
return ( return (
<Select.Option key={item.code} item={item.code}> <Select.Option
key={item.code}
value={item.code}
>
{item.value} {item.value}
</Select.Option> </Select.Option>
) )
})} })}
</Select> </Select>
</Form.Item> </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> </Auth>
} }
operator={ operator={

25
web-react/src/pages/system/user/form.jsx
View File

@@ -350,10 +350,31 @@ export default class form extends Component {
</Radio.Button> </Radio.Button>
</Radio.Group> </Radio.Group>
</Form.Item> </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="请输入邮箱" /> <Input autoComplete="off" placeholder="请输入邮箱" />
</Form.Item> </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="请输入手机号" /> <Input autoComplete="off" placeholder="请输入手机号" />
</Form.Item> </Form.Item>
<Form.Item label="电话" name="tel"> <Form.Item label="电话" name="tel">