diff --git a/Api/Ewide.Core/Service/Area/AreaCodeService.cs b/Api/Ewide.Core/Service/Area/AreaCodeService.cs index 7308b1a..22df093 100644 --- a/Api/Ewide.Core/Service/Area/AreaCodeService.cs +++ b/Api/Ewide.Core/Service/Area/AreaCodeService.cs @@ -32,6 +32,7 @@ namespace Ewide.Core.Service.Area public async Task AddAreaCode(AreaCodeInput input) { CheckInput(input); + CheckArea(input); await _areaCodeRep.InsertNowAsync(input.Adapt()); await _sysCacheService.SetAreaCode(await _areaCodeRep.DetachedEntities.ToListAsync()); } @@ -112,6 +113,7 @@ namespace Ewide.Core.Service.Area public async Task UpdateAreaCode(AreaCodeInput input) { CheckInput(input); + CheckArea(input); var area = input.Adapt(); await area.UpdateNowAsync(); await _sysCacheService.SetAreaCode(await _areaCodeRep.DetachedEntities.ToListAsync()); @@ -126,5 +128,15 @@ namespace Ewide.Core.Service.Area //检查是否有子节点 return true; } + + private bool CheckArea(AreaCodeInput input) + { + var any = _areaCodeRep.DetachedEntities.Any(p => p.AdCode == input.AdCode && p.Code != input.Code); + if (any) + { + throw Oops.Oh("区域编码重复"); + } + return true; + } } } diff --git a/Web/src/pages/system/area/addForm.vue b/Web/src/pages/system/area/addForm.vue index d039d74..c3c5167 100644 --- a/Web/src/pages/system/area/addForm.vue +++ b/Web/src/pages/system/area/addForm.vue @@ -32,6 +32,7 @@ export default { this.visible = true; this.$nextTick(() => { this.formBody.onInit(); + }); }, diff --git a/Web/src/pages/system/area/editForm.vue b/Web/src/pages/system/area/editForm.vue index 68f877b..16be829 100644 --- a/Web/src/pages/system/area/editForm.vue +++ b/Web/src/pages/system/area/editForm.vue @@ -14,6 +14,7 @@ export default { return { visible: false, confirmLoading: false, + }; }, diff --git a/Web/src/pages/system/area/form.vue b/Web/src/pages/system/area/form.vue index f9bd546..e66d2ea 100644 --- a/Web/src/pages/system/area/form.vue +++ b/Web/src/pages/system/area/form.vue @@ -9,14 +9,14 @@ {{ item.value }} - + - - + + - - + + @@ -34,14 +34,14 @@ export default { return { /** 表单数据 */ form: {}, + exist:false, /** 验证格式 */ rules: { levelType: [{ required: true, message: '请选择参数类型' }], name: [{ required: true, message: '请输入参数名称' }], - code: [{ required: true, message: '请输入参数编码' }], - showCode: [{ required: true, message: '请输入显示编码' }], + adCode: [{ required: true, message: '请输入参数编码' }], + code: [{ required: true, message: '请输入显示编码' }], }, - /** 加载异步数据状态 */ loading: false, /** 其他成员属性 */ @@ -57,6 +57,7 @@ export default { * 在打开编辑页时允许填充数据 */ onFillData(record) { + this.exist = true; /** 将默认数据覆盖到form */ this.form = this.$_.cloneDeep({ ...record, diff --git a/Web/src/pages/system/area/index.vue b/Web/src/pages/system/area/index.vue index 835035a..b7e7033 100644 --- a/Web/src/pages/system/area/index.vue +++ b/Web/src/pages/system/area/index.vue @@ -79,8 +79,8 @@ export default { sorter: true, }, { - title: '显示编号', - dataIndex: 'showCode', + title: '区域编号', + dataIndex: 'adCode', sorter: true, }, {