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

update 组织机构新增区域选择

Browse Source
This commit is contained in:
自带大佬气场
2021-04-30 14:02:36 +08:00
parent fdb4b4897b
commit 7a57ba34ed
14 changed files with 106 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5588,7 +5588,7 @@
状态（字典 0正常 1停用 2删除）
</summary>
</member>
<member name="P:Ewide.Core.Service.OrgInput.AreaNumberCode">
<member name="P:Ewide.Core.Service.OrgInput.AreaCode">
<summary>
机构所在区域
</summary>
@@ -5603,7 +5603,7 @@
编码
</summary>
</member>
<member name="P:Ewide.Core.Service.AddOrgInput.AreaNumberCode">
<member name="P:Ewide.Core.Service.AddOrgInput.AreaCode">
<summary>
机构所在区域
</summary>

4
Api/Ewide.Core/Service/App/SysAppService.cs
View File

@@ -67,8 +67,8 @@ namespace Ewide.Core.Service
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet("/sysApp/page")]
public async Task<dynamic> QueryAppPageList([FromQuery] AppInput input)
[HttpPost("/sysApp/page")]
public async Task<dynamic> QueryAppPageList([FromBody] AppInput input)
{
var apps = await _sysAppRep.DetachedEntities
.Where(

3
Api/Ewide.Core/Service/Area/AreaCodeService.cs
View File

@@ -80,6 +80,7 @@ namespace Ewide.Core.Service.Area
return new TreeBuildUtil<AreaTreeNode>().DoTreeBuild(cachedAreaCodes.Select(u => new AreaTreeNode
{
Code = u.Code,
AdCode = u.AdCode,
ParentCode = u.ParentCode,
Name = u.Name,
LevelType = u.LevelType,
@@ -97,7 +98,7 @@ namespace Ewide.Core.Service.Area
var AreaCodes = await _areaCodeRep.DetachedEntities
.Where(input.LevelType.HasValue, a => a.LevelType == input.LevelType)
.Where(!string.IsNullOrEmpty(input.Code), a => a.Code.StartsWith(input.Code))
.Where(!string.IsNullOrEmpty(input.ShowCode), a => a.AdCode.StartsWith(input.ShowCode))
.Where(!string.IsNullOrEmpty(input.AdCode), a => a.AdCode.StartsWith(input.AdCode))
.Where(!string.IsNullOrEmpty(input.Name), a => a.Name.StartsWith(input.Name))
.ToPageData(input);
return XnPageResult<SysAreaCode>.PageResult(AreaCodes);

4
Api/Ewide.Core/Service/Area/Dto/AreaCodeInput.cs
View File

@@ -10,7 +10,7 @@ namespace Ewide.Core.Service.Area.Dto
public class AreaCodeInput : XnInputBase
{
public string Code { get; set; }
public string ShowCode { get; set; }
public string AdCode { get; set; }
public string Name { get; set; }
public int? LevelType { get; set; }
public string Note { get; set; }
@@ -18,7 +18,7 @@ namespace Ewide.Core.Service.Area.Dto
}
public class UpdateAreaCodeInput
{
public string ShowCode { get; set; }
public string AdCode { get; set; }
public string Name { get; set; }
public int? LevelType { get; set; }
public string Note { get; set; }

4
Api/Ewide.Core/Service/Org/Dto/OrgInput.cs
View File

@@ -49,7 +49,7 @@ namespace Ewide.Core.Service
/// <summary>
/// 机构所在区域
/// </summary>
public virtual string AreaNumberCode { get; set; }
public virtual string AreaCode { get; set; }
}
public class AddOrgInput : OrgInput
@@ -69,7 +69,7 @@ namespace Ewide.Core.Service
/// 机构所在区域
/// </summary>
[Required(ErrorMessage = "机构所在区域不能为空")]
public override string AreaNumberCode { get; set; }
public override string AreaCode { get; set; }
}
public class DeleteOrgInput

2
Api/Ewide.Core/Service/Org/SysOrgService.cs
View File

@@ -48,7 +48,7 @@ namespace Ewide.Core.Service
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("/sysOrg/page")]
public async Task<dynamic> QueryOrgPageList([FromForm] PageOrgInput input)
public async Task<dynamic> QueryOrgPageList([FromBody] PageOrgInput input)
{
var dataScopeList = GetDataScopeList(await GetUserDataScopeIdList());