From e3039012626228f4bc097494240d87fa7add2a4a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 3 Mar 2022 10:06:28 +0800
Subject: [PATCH] BUG 27988

---
 .../apps/AppAccountXiushan/AppAccountXiushan.vue   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
index eed6ae40..fb9d8c91 100644
--- a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
+++ b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
@@ -35,7 +35,7 @@
         </ai-table>
       </template>
     </ai-list>
-    <!--功能分配-->
+    <!--添加账号-->
     <ai-dialog title="添加账号" :close-on-click-modal="false" class="editStyle" :visible.sync="accountDialog"
                width="800px" @closed="account={}" @onConfirm="submitAddAcount">
       <el-form ref="addAccountForm" :model="account" :rules="rules" size="small"
@@ -47,10 +47,11 @@
           <el-input v-model.trim="account.phone" placeholder="请输入..." clearable :maxLength="11"/>
         </el-form-item>
         <el-form-item label="行政地区" prop="areaId">
-          <ai-area-get v-model="account.areaId" :instance="instance"/>
+          <ai-area-get v-model="account.areaId" :instance="instance" root="500241000000" showAll/>
         </el-form-item>
       </el-form>
     </ai-dialog>
+    <!--功能分配-->
     <ai-dialog title="功能分配" :visible.sync="dialog" width="800px" @open="initDialogData" @onConfirm="updateAccount">
       <el-form ref="updateAccountForm" :model="dialogForm" :rules="rules" size="small"
                label-width="120px">
@@ -61,10 +62,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="行政地区" prop="areaId">
-          <ai-area-select v-model="dialogForm.areaId" always-show :instance="instance"
-                          clearable @fullname="v=>dialogForm.areaFullName=v"
-                          @name="v=>dialogForm.areaName=v"
-                          :disabledLevel="disabledLevel"/>
+          <ai-area-get v-model="dialogForm.areaId" :instance="instance" :name.sync="dialogForm.areaName"
+                       root="500241000000" showAll/>
         </el-form-item>
         <el-form-item label="党组织" prop="organizationId" v-if="user.info.organizationId">
           <el-cascader :options="partyOrgOps" v-model="dialogForm.organizationId"
@@ -214,7 +213,8 @@ export default {
         if (v) {
           if (this.lock) return this.$message.error("请勿多次提交!")
           this.lock = true
-          this.instance.post("/user/empower", this.dialogForm).then(res => {
+          let areaFullName = this.dialogForm.areaName
+          this.instance.post("/user/empower", {...this.dialogForm, areaFullName}).then(res => {
             this.lock = false
             if (res?.code == 0) {
               this.dialog = false;