Merge remote-tracking branch 'origin/dev' into dev

project/xiushan/apps/AppGroupShareholders/components/Add.vue

@@ -26,9 +26,15 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-form-item label="所在地区" prop="areaId">
-                <ai-area-select clearable always-show :instance="instance"  @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
-              </el-form-item>
+
+              <el-row type="flex">
+                <el-col :span="12">
+                  <el-form-item label="所在地区" prop="areaId">
+                    <ai-area-get :instance="instance"  :fullname.sync="form.areaName" v-model="form.areaId" :root="user.info.areaId"></ai-area-get>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              
               <el-row type="flex">
                 <el-col :span="12">
                   <el-form-item label="股权证编号" prop="stockCertificateCode">
@@ -164,7 +170,6 @@ export default {
       radioFrom: '',
       page: {current: 1, size: 10, total: 0},
       tableData: [],
-      disabledLevel: 3,
       page: {current: 1, size: 10, total: 0},
       sysInfoDialog: false,
       data: {},
@@ -212,7 +217,6 @@ export default {
       this.id = this.params.id
       this.getDetail(this.params.id)
     }
-    this.form.areaId = this.user.info.areaId
   },
   methods: {
     cancel(isRefresh) {

project/xiushan/apps/AppHouseManagement/components/Add.vue

@@ -15,9 +15,15 @@
               <el-form-item label="使用证书" prop="useCertificate">
                 <el-input v-model="form.useCertificate" placeholder="请输入宅基地使用证书号"></el-input>
               </el-form-item>
-              <el-form-item label="所在地区" prop="areaId">
-                <ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
-              </el-form-item>
+
+              <el-row type="flex">
+                <el-col :span="12">
+                  <el-form-item label="所在地区" prop="areaId">
+                    <ai-area-get :instance="instance" :fullname.sync="form.areaName" v-model="form.areaId" :root="user.info.areaId"></ai-area-get>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
               <el-row type="flex">
                 <el-col :span="20">
                   <el-form-item label="使用人" prop="usePerson">
@@ -126,7 +132,6 @@ export default {
       },
       isEdit: false,
       radioFrom: '',
-      disabledLevel: 3,
       data: {},
     }
   }, 
@@ -156,7 +161,6 @@ export default {
       this.id = this.params.id
       this.getDetail(this.params.id)
     }
-    this.form.areaId = this.user.info.areaId
   },
   methods: {
     cancel(isRefresh) {