diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml index 9d722bf..c9fbb76 100644 --- a/Api/Ewide.Core/Ewide.Core.xml +++ b/Api/Ewide.Core/Ewide.Core.xml @@ -5588,7 +5588,7 @@ 状态(字典 0正常 1停用 2删除) - + 机构所在区域 @@ -5603,7 +5603,7 @@ 编码 - + 机构所在区域 diff --git a/Api/Ewide.Core/Service/App/SysAppService.cs b/Api/Ewide.Core/Service/App/SysAppService.cs index da067b9..ad70d88 100644 --- a/Api/Ewide.Core/Service/App/SysAppService.cs +++ b/Api/Ewide.Core/Service/App/SysAppService.cs @@ -67,8 +67,8 @@ namespace Ewide.Core.Service /// /// /// - [HttpGet("/sysApp/page")] - public async Task QueryAppPageList([FromQuery] AppInput input) + [HttpPost("/sysApp/page")] + public async Task QueryAppPageList([FromBody] AppInput input) { var apps = await _sysAppRep.DetachedEntities .Where( diff --git a/Api/Ewide.Core/Service/Area/AreaCodeService.cs b/Api/Ewide.Core/Service/Area/AreaCodeService.cs index c717d65..7308b1a 100644 --- a/Api/Ewide.Core/Service/Area/AreaCodeService.cs +++ b/Api/Ewide.Core/Service/Area/AreaCodeService.cs @@ -80,6 +80,7 @@ namespace Ewide.Core.Service.Area return new TreeBuildUtil().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.PageResult(AreaCodes); diff --git a/Api/Ewide.Core/Service/Area/Dto/AreaCodeInput.cs b/Api/Ewide.Core/Service/Area/Dto/AreaCodeInput.cs index 2068d29..3870438 100644 --- a/Api/Ewide.Core/Service/Area/Dto/AreaCodeInput.cs +++ b/Api/Ewide.Core/Service/Area/Dto/AreaCodeInput.cs @@ -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; } diff --git a/Api/Ewide.Core/Service/Org/Dto/OrgInput.cs b/Api/Ewide.Core/Service/Org/Dto/OrgInput.cs index 4c48b7f..00d7b11 100644 --- a/Api/Ewide.Core/Service/Org/Dto/OrgInput.cs +++ b/Api/Ewide.Core/Service/Org/Dto/OrgInput.cs @@ -49,7 +49,7 @@ namespace Ewide.Core.Service /// /// 机构所在区域 /// - public virtual string AreaNumberCode { get; set; } + public virtual string AreaCode { get; set; } } public class AddOrgInput : OrgInput @@ -69,7 +69,7 @@ namespace Ewide.Core.Service /// 机构所在区域 /// [Required(ErrorMessage = "机构所在区域不能为空")] - public override string AreaNumberCode { get; set; } + public override string AreaCode { get; set; } } public class DeleteOrgInput diff --git a/Api/Ewide.Core/Service/Org/SysOrgService.cs b/Api/Ewide.Core/Service/Org/SysOrgService.cs index 52acd89..b9f2d2e 100644 --- a/Api/Ewide.Core/Service/Org/SysOrgService.cs +++ b/Api/Ewide.Core/Service/Org/SysOrgService.cs @@ -48,7 +48,7 @@ namespace Ewide.Core.Service /// /// [HttpPost("/sysOrg/page")] - public async Task QueryOrgPageList([FromForm] PageOrgInput input) + public async Task QueryOrgPageList([FromBody] PageOrgInput input) { var dataScopeList = GetDataScopeList(await GetUserDataScopeIdList()); diff --git a/Web/src/assets/style/app.less b/Web/src/assets/style/app.less index b66c29d..6ceea2a 100644 --- a/Web/src/assets/style/app.less +++ b/Web/src/assets/style/app.less @@ -21,6 +21,7 @@ @import './lib/form.less'; @import './lib/description.less'; @import './lib/select.less'; +@import './lib/cascader.less'; @import './lib/dropdown.less'; @import './lib/modal.less'; @import './lib/tree-layout.less'; diff --git a/Web/src/assets/style/lib/cascader.less b/Web/src/assets/style/lib/cascader.less new file mode 100644 index 0000000..17054de --- /dev/null +++ b/Web/src/assets/style/lib/cascader.less @@ -0,0 +1,4 @@ +@import (reference) '~@/assets/style/extend.less'; +.ant-cascader-picker-arrow { + transform: scaleY(.75); +} diff --git a/Web/src/assets/style/lib/form.less b/Web/src/assets/style/lib/form.less index 6766c00..50b5296 100644 --- a/Web/src/assets/style/lib/form.less +++ b/Web/src/assets/style/lib/form.less @@ -51,14 +51,16 @@ .ant-input-number, .ant-mentions, .ant-select-selection, - .ant-input-group-addon { + .ant-input-group-addon, + .ant-cascader-picker, + .ant-cascader-input.ant-input { z-index: 1; text-align: left; color: lighten(@black, 10%); border: 0; - background-color: lighten(@black, 95%); + background-color: lighten(@black, 95%) !important; } .ant-mentions { textarea { @@ -86,6 +88,11 @@ .focus(); } } + .ant-cascader-picker:focus { + .ant-cascader-input { + .focus(); + } + } .ant-input-group { .ant-row-flex { .ant-select { diff --git a/Web/src/common/api/requests/sys/appManage.js b/Web/src/common/api/requests/sys/appManage.js index be031ca..ae55130 100644 --- a/Web/src/common/api/requests/sys/appManage.js +++ b/Web/src/common/api/requests/sys/appManage.js @@ -2,7 +2,7 @@ export default { /** * 系统应用列表 */ - getAppPage: ['/sysApp/page', 'get'], + getAppPage: ['/sysApp/page', 'post'], /** * 系统应用列表 */ diff --git a/Web/src/common/api/requests/sys/smsManage.js b/Web/src/common/api/requests/sys/smsManage.js index c75e0f3..b8d9708 100644 --- a/Web/src/common/api/requests/sys/smsManage.js +++ b/Web/src/common/api/requests/sys/smsManage.js @@ -1,26 +1,17 @@ export default { -/** - * 发送记录查询 - * - * @author yubaoshan - * @date 2020/7/3 22:11 - */ -smsPage:['/sms/page','get'], + /** + * 发送记录查询 + */ + smsPage: ['/sms/page', 'get'], -/** - * 验证短信验证码 - * - * @author yubaoshan - * @date 2020/7/3 22:12 - */ -sysSendLoginMessage:['/sms/sendLoginMessage','post'], + /** + * 验证短信验证码 + */ + sysSendLoginMessage: ['/sms/sendLoginMessage', 'post'], -/** - * 验证短信验证码 - * - * @author yubaoshan - * @date 2020/7/3 22:12 - */ -sysValidateMessage:['/sms/validateMessage','post'], + /** + * 验证短信验证码 + */ + sysValidateMessage: ['/sms/validateMessage', 'post'], } \ No newline at end of file diff --git a/Web/src/pages/system/org/addForm.vue b/Web/src/pages/system/org/addForm.vue index 074d470..445f09e 100644 --- a/Web/src/pages/system/org/addForm.vue +++ b/Web/src/pages/system/org/addForm.vue @@ -55,7 +55,7 @@ export default { if (valid) { this.confirmLoading = true; this.$api - .sysOrgAdd(this.$refs['form-body'].form) + .sysOrgAdd(this.$refs['form-body'].onGetData()) .then(({ success }) => { if (success) { this.$message.success('新增成功'); diff --git a/Web/src/pages/system/org/editForm.vue b/Web/src/pages/system/org/editForm.vue index 0220671..b8fcf2a 100644 --- a/Web/src/pages/system/org/editForm.vue +++ b/Web/src/pages/system/org/editForm.vue @@ -47,7 +47,7 @@ export default { if (valid) { this.confirmLoading = true; this.$api - .sysOrgEdit(this.$refs['form-body'].form) + .sysOrgEdit(this.$refs['form-body'].onGetData()) .then(({ success }) => { if (success) { this.$message.success('编辑成功'); diff --git a/Web/src/pages/system/org/form.vue b/Web/src/pages/system/org/form.vue index dbd636e..f415c22 100644 --- a/Web/src/pages/system/org/form.vue +++ b/Web/src/pages/system/org/form.vue @@ -18,6 +18,15 @@ v-model="form.pid" /> + + + { + level = level || 0; + for (let i = 0; i < data.length; i++) { + const item = data[i]; + + areaCode[level] = item.code; + + if (item.code === record.areaCode) { + areaCode.length = level + 1; + return true; + } + + if (item.children && item.children.length) { + const found = findCode(item.children, level + 1); + if (found) { + return true; + } + } + } + }; + + if (record.areaCode) { + findCode(this.areaData); + } + + this.form = this.$_.cloneDeep({ + ...record, + areaCode, + }); } }, + onGetData() { + const submitForm = this.$_.cloneDeep(this.form); + submitForm.areaCode = submitForm.areaCode[submitForm.areaCode.length - 1]; + return submitForm; + }, + /** * 必要的方法 * 在外部窗口进行保存时调用表单验证 @@ -89,6 +136,7 @@ export default { async onInit() { this.loading = true; await this.onLoadOrgData(); + await this.onLoadAreaData(); this.loading = false; }, @@ -106,6 +154,23 @@ export default { ]; }); }, + + onLoadAreaData() { + return this.$api.getAreaTree().then(({ data }) => { + // 为了防止出现空的层级选择,删除所有空children节点 + const clearChiildren = (data) => { + data.forEach((item) => { + if (item.children && item.children.length) { + clearChiildren(item.children); + } else { + delete item.children; + } + }); + }; + clearChiildren(data); + this.areaData = data; + }); + }, }, }; \ No newline at end of file