Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev

src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue

@@ -231,7 +231,8 @@ export default {
       checkHandle: function (type) {
         const params = {
           id: this.dataForm.id,
-          state: type
+          state: type,
+          homeId: this.dataForm.homeId
         }
         this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => {
           if (res.code !== 0) {

src/views/modules/visual/plugin/power/organization.vue

@@ -18,8 +18,7 @@
                         v-model="agencyId"
                         :show-all-levels="false"
                         @change="handleChangeAgencytree"
-                        :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"
-                        clearable/>
+                        :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"/>
         </div>
         <!-- <div class="second-select ">
 
@@ -406,14 +405,14 @@ export default {
     // 取最后一级组织的第一条数据的 orgId
     setListAgencyId_one(subOrgList) {
       if (subOrgList[0].subOrgList && subOrgList[0].subOrgList.length > 0) {
-        this.setAgencyId_two(subOrgList[0].subOrgList)
+        return this.setAgencyId_two(subOrgList[0].subOrgList)
       } else {
         return subOrgList[0].orgId
       }
     },
     setAgencyId_two(subOrgList) {
       if (subOrgList[0].subOrgList && subOrgList[0].subOrgList.length > 0) {
-        this.setListAgencyId_one(subOrgList[0].subOrgList)
+        return this.setListAgencyId_one(subOrgList[0].subOrgList)
       } else {
         return subOrgList[0].orgId
       }