Merge branch 'dev-fangwu' into test

src/views/modules/base/community/community.vue

@@ -48,7 +48,7 @@
 
               </el-input>
             </el-form-item>
-            <el-form-item label="房主手机"
+            <el-form-item label="联系方式"
                           prop="ownerPhone">
               <el-input v-model="ownerPhone"
                         class="item_width_2"
@@ -269,7 +269,7 @@ export default {
 
     await this.loadOrgData()
     await this.loadTree()
-    await this.loadOpenNode()
+    // await this.loadOpenNode()
 
     await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
     if (this.treeData.length > 0) {
@@ -347,6 +347,8 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
+        this.openNodes = []
+        this.openNodes.push(data[0].id)
 
         this.treeData = data
         if (!isRefresh && data.length > 0) {

src/views/modules/base/community/roomForm.vue

@@ -40,19 +40,22 @@
           </el-input>
         </el-form-item>
         <div v-if="formType === 'detail'">
-            <el-form-item label="房屋编码"
+          <el-form-item label="房屋编码"
                         prop="houseCode"
                         label-width="150px"
                         style="display: block">
             <el-input class="item_width_1"
-                        maxlength="30"
-                        v-model="dataForm.houseCode">
+                      maxlength="30"
+                      v-model="dataForm.houseCode">
             </el-input>
-            </el-form-item>
-            <div style="display: flex;flex-direction: column;">
-                <img style="margin-left: 70px;width: 200px;" :src="dataForm.houseQrcodeUrl">
-                <a style="margin-left: 80px" :href="dataForm.houseQrcodeUrl" target="_blank">下载</a>
-            </div>
+          </el-form-item>
+          <div style="display: flex;flex-direction: column;">
+            <img style="margin-left: 70px;width: 200px;"
+                 :src="dataForm.houseQrcodeUrl">
+            <a style="margin-left: 80px"
+               :href="dataForm.houseQrcodeUrl"
+               target="_blank">下载</a>
+          </div>
         </div>
         <el-form-item label="房屋类型"
                       prop="houseType"
@@ -105,13 +108,13 @@
                     v-model="dataForm.ownerName">
           </el-input>
         </el-form-item>
-        <el-form-item label="房主电话"
+        <el-form-item label="联系方式"
                       prop="ownerPhone"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     type='number'
-                    placeholder="请输入房主电话"
+                    placeholder="请输入联系方式"
                     v-model="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
@@ -175,21 +178,21 @@ export default {
         houseType: '',//房屋类型【楼房，平房，别墅】
         purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
         rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
-        ownerPhone: '', //房主电话
+        ownerPhone: '', //联系方式
         ownerName: '', //房主名字
         ownerIdCard: '', //房主身份证
-        remark: '' // 备注
+        remark: ''
       },
 
-                keyWords: '',
-                agencyObj: {},
+      keyWords: '',
+      agencyObj: {},
 
-            }
-        },
-        components: {},
-        mounted () {
+    }
+  },
+  components: {},
+  mounted () {
 
-        },
+  },
 
   methods: {
     async initForm (type, row, agencyObj) {
@@ -344,7 +347,7 @@ export default {
         houseType: '1',//房屋类型【楼房，平房，别墅】
         purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
         rentFlag: 0,//是否出租【是：1，否：0】
-        ownerPhone: '', //房主电话
+        ownerPhone: '', //联系方式
         ownerName: '', //房主名字
         ownerIdCard: '', //房主身份证
         remark: '' // 备注
@@ -396,7 +399,7 @@ export default {
         ],
         remark: [
           { required: false }
-        ]
+        ],
       }
     },
 

src/views/modules/base/community/roomTable.vue

@@ -102,7 +102,7 @@
                          width="90">
         </el-table-column>
         <el-table-column prop="ownerPhone"
-                         label="房主电话"
+                         label="联系方式"
                          width="110">
         </el-table-column>
         <el-table-column prop="ownerIdCard"

src/views/modules/base/organization/organization.vue

@@ -463,12 +463,12 @@
 
                 <!-- 组织区划 -->
                 <el-form-item label="组织区划">
-                    <el-select v-model="zonings.areaCode" placeholder="请选择组织区划" @change="handelZoing">
+                    <el-select v-model="agencyForm.areaCode" placeholder="请选择组织区划" @change="handelZoing">
                         <el-option 
                         v-for="item in zonings"
                         :key="item.areaCode"
                         :label="item.areaName"
-                        :value="item">
+                        :value="item.areaCode">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -537,12 +537,12 @@
 
                  <!-- 组织区划 -->
                 <el-form-item label="组织区划">
-                    <el-select v-model="OrgDetailsForm.areaName" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
+                    <el-select v-model="OrgDetailsForm.areaCode" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
                         <el-option 
                         v-for="item in zonings"
                         :key="item.areaCode"
                         :label="item.areaName"
-                        :value="item">
+                        :value="item.areaCode">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -1932,19 +1932,27 @@ export default {
         },
 
         handelZoing(val){
-            this.agencyForm.level = val.level
-            this.agencyForm.areaName = val.areaName
-            this.agencyForm.areaCode = val.areaCode
-            
+            this.zonings.forEach(item => {
+                if (item.areaCode == val) {
+                    this.agencyForm.level = item.level
+                    this.agencyForm.areaName = item.areaName
+                    this.agencyForm.areaCode = item.areaCode
+                }
+            })
         },
         handelStreeOrCommunityZoing(val){
-            this.OrgDetailsForm.level = val.level
-            this.OrgDetailsForm.areaName = val.areaName
-            this.OrgDetailsForm.areaCode = val.areaCode
+            this.zonings.forEach(item => {
+                if (item.areaCode == val) {
+                    this.OrgDetailsForm.level = item.level
+                    this.OrgDetailsForm.areaName = item.areaName
+                    this.OrgDetailsForm.areaCode = item.areaCode
+                }
+            })
         },
 
         addAgency(row){
             this.createAgencyDialogFlag = true
+            this.addNewAgencyRest()
             this.getUser()
         },
         // 新增组织确定按钮

src/views/modules/plugins/stats/factagencyuserhousedaily.vue

@@ -218,6 +218,7 @@ export default {
                   this.optionsA.push(res.data)
                   this.dataForm.agencyId = res.data.agencyId
                   this.dataForm.level = res.data.level
+                  this.getDataList()
                 }
               })
               .catch(() => {