From 9146a961304c5b8c8f8d3e8eb1d65c281e0b6b92 Mon Sep 17 00:00:00 2001
From: Ky_Gyt <1971574843@qq.com>
Date: Thu, 6 May 2021 10:52:07 +0800
Subject: [PATCH] =?UTF-8?q?Update=E5=8C=BA=E5=9F=9F=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=92=8C=E6=96=B0=E5=A2=9E=E6=97=B6=E6=98=AF=E5=90=A6=E6=9C=89?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Service/Area/AreaCodeService.cs | 12 ++++++++++++
 Web/src/pages/system/area/addForm.vue          |  1 +
 Web/src/pages/system/area/editForm.vue         |  1 +
 Web/src/pages/system/area/form.vue             | 17 +++++++++--------
 Web/src/pages/system/area/index.vue            |  4 ++--
 5 files changed, 25 insertions(+), 10 deletions(-)

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<SysAreaCode>());
             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<SysAreaCode>();
             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 @@
             <a-select-option :key="i" :value="item.code" v-for="(item, i) in levelType">{{ item.value }}</a-select-option>
           </a-select>
         </a-form-model-item>
-        <a-form-model-item label="区域名称" prop="name">
+        <a-form-model-item label="名称" prop="name">
           <a-input placeholder="请输入区域名称" v-model="form.name" />
         </a-form-model-item>
-        <a-form-model-item label="参数编码" prop="code">
-          <a-input placeholder="请输入参数编码" v-model="form.code" />
+        <a-form-model-item label="编码" prop="code" >
+          <a-input placeholder="请输入参数编码" :disabled="exist" v-model="form.code" />
         </a-form-model-item>
-        <a-form-model-item label="显示编码" prop="showCode">
-          <a-input placeholder="请输入显示编码" v-model="form.showCode" />
+        <a-form-model-item label="区域编码" prop="adCode">
+          <a-input placeholder="请输入显示编码" v-model="form.adCode" />
         </a-form-model-item>
         <a-form-model-item label="排序" prop="sort">
           <a-input-number :max="1000" :min="0" class="w-100-p" placeholder="请输入排序" v-model="form.sort" />
@@ -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,
         },
         {