From 794116acdb93235a4df8184f7873ebac36d627db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Fri, 30 Apr 2021 16:06:52 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/pages/system/role/dataForm.vue        | 11 ------
 .../system/user/{orgForm.vue => dataForm.vue} | 35 ++++++++++++++++---
 Web/src/pages/system/user/index.vue           |  8 ++---
 3 files changed, 34 insertions(+), 20 deletions(-)
 rename Web/src/pages/system/user/{orgForm.vue => dataForm.vue} (71%)

diff --git a/Web/src/pages/system/role/dataForm.vue b/Web/src/pages/system/role/dataForm.vue
index 4d26a6e..e24cca7 100644
--- a/Web/src/pages/system/role/dataForm.vue
+++ b/Web/src/pages/system/role/dataForm.vue
@@ -138,17 +138,6 @@ export default {
 
     onLoadAreaTreeData() {
       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);
         return data;
       });
     },
diff --git a/Web/src/pages/system/user/orgForm.vue b/Web/src/pages/system/user/dataForm.vue
similarity index 71%
rename from Web/src/pages/system/user/orgForm.vue
rename to Web/src/pages/system/user/dataForm.vue
index 9a037f2..8407c31 100644
--- a/Web/src/pages/system/user/orgForm.vue
+++ b/Web/src/pages/system/user/dataForm.vue
@@ -11,16 +11,27 @@
       <a-spin :spinning="loading">
         <a-icon slot="indicator" spin type="loading" />
         <div class="yo-form-group">
-          <a-form-model-item class="yo-form--fluid">
+          <a-form-model-item label="选择机构">
             <a-tree-select
               :show-checked-strategy="SHOW_PARENT"
-              :tree-data="orgList"
+              :tree-data="orgTreeData"
               placeholder="请选择机构"
               search-placeholder="请检索"
               tree-checkable
               v-model="orgs"
             />
           </a-form-model-item>
+          <a-form-model-item label="区域">
+            <a-tree-select
+              :replace-fields="{ title: 'name', value: 'code', children: 'children' }"
+              :show-checked-strategy="SHOW_PARENT"
+              :tree-data="arerTreeData"
+              placeholder="请区域"
+              search-placeholder="请检索"
+              tree-checkable
+              v-model="areas"
+            />
+          </a-form-model-item>
         </div>
       </a-spin>
     </a-form-model>
@@ -40,7 +51,11 @@ export default {
 
       id: '',
       orgs: [],
-      orgList: [],
+      orgTreeData: [],
+
+      areas: [],
+      arerTreeData: [],
+
       SHOW_PARENT,
     };
   },
@@ -69,6 +84,7 @@ export default {
         .sysUserGrantData({
           id: this.id,
           grantOrgIdList: this.orgs,
+          grantAreaCodeList: this.areas,
         })
         .then(({ success }) => {
           if (success) {
@@ -90,22 +106,31 @@ export default {
       this.visible = false;
       setTimeout(() => {
         this.orgs = [];
+        this.areas = [];
       }, 300);
     },
 
     async onInit() {
       this.loading = true;
-      this.orgList = await this.onLoadOrgList();
+      this.orgTreeData = await this.onLoadOrgTreeData();
       this.orgs = await this.onLoadOrg();
+
+      this.arerTreeData = await this.onLoadAreaTreeData();
       this.loading = false;
     },
 
-    onLoadOrgList() {
+    onLoadOrgTreeData() {
       return this.$api.getOrgTree().then(({ data }) => {
         return data;
       });
     },
 
+    onLoadAreaTreeData() {
+      return this.$api.getAreaTree().then(({ data }) => {
+        return data;
+      });
+    },
+
     onLoadOrg() {
       return this.$api.sysUserOwnData({ id: this.id }).then(({ data }) => {
         return data;
diff --git a/Web/src/pages/system/user/index.vue b/Web/src/pages/system/user/index.vue
index fa6519d..644d66f 100644
--- a/Web/src/pages/system/user/index.vue
+++ b/Web/src/pages/system/user/index.vue
@@ -66,7 +66,7 @@
                   </Auth>
                   <Auth auth="sysUser:grantData">
                     <a-menu-item>
-                      <a @click="onOpen('org-form', record)">授权额外数据</a>
+                      <a @click="onOpen('data-form', record)">授权额外数据</a>
                     </a-menu-item>
                   </Auth>
                 </a-menu>
@@ -112,7 +112,7 @@
     <add-form @ok="onReloadData" ref="add-form" />
     <edit-form @ok="onReloadData" ref="edit-form" />
     <role-form @ok="onReloadData" ref="role-form" />
-    <org-form @ok="onReloadData" ref="org-form" />
+    <data-form @ok="onReloadData" ref="data-form" />
   </yo-tree-layout>
 </template>
 <script>
@@ -122,7 +122,7 @@ import YoList from '@/components/yoList';
 import AddForm from './addForm';
 import EditForm from './editForm';
 import RoleForm from './roleForm';
-import OrgForm from './orgForm';
+import DataForm from './dataForm';
 
 export default {
   components: {
@@ -131,7 +131,7 @@ export default {
     AddForm,
     EditForm,
     RoleForm,
-    OrgForm,
+    DataForm,
   },
 
   data() {