Merge branch 'bug_mk' into dev

src/components/JwTree/nodeWrap.vue

@@ -35,7 +35,7 @@
                     </div>
                   </div>
                   <div v-if="item.level === 'unit_chief'|| item.level === 'public_welfare_post'">
-                    <div @click="gotoPersonnel(item)" :class="[item.categoryWarn === 'red' ? 'dyzxhRed' : item.categoryWarn === 'yellow' ? 'dyzxhYellow' : item.categoryWarn === 'green' ? 'dyzxhGreen' : '', item.children && item.children.length > 0 ? 'dyzxhHover' : 'dyzxh']" :title="item.organizationName">
+                    <div @click="gotoPersonnel(item.resiId, '居委组织架构')" :class="[item.categoryWarn === 'red' ? 'dyzxhRed' : item.categoryWarn === 'yellow' ? 'dyzxhYellow' : item.categoryWarn === 'green' ? 'dyzxhGreen' : '', item.children && item.children.length > 0 ? 'dyzxhHover' : 'dyzxh']" :title="item.organizationName">
                       <!-- {{ spliceNameFun(item.organizationName, 3) }} -->
                       {{ item.organizationName }}
                     </div>

src/views/components/resiExpand/editExpand.vue

@@ -274,6 +274,10 @@ export default {
             this.handleFormChange('parymemberInfoDto','partyOrgId','cascader1')
         },
         async handleNextOrgTreeClick(node, resolve) {
+            if(node.children.length>0){
+                resolve(null)
+                return
+            }
             await this.getTreeChildenList(node, resolve)
         },
         async getTreeChildenList(node, resolve) {
@@ -298,7 +302,7 @@ export default {
         },
         async getOrgTree() {
             try {
-                const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot')
+                const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select',{depth: 8})
                 this.formList.forEach(c => {
                     if (c.formId == "parymemberInfoDto") {
                         for (let i of c.form[0].children) {

src/views/dataBoard/cpts/details/yxwxfw.vue

@@ -30,7 +30,8 @@
             </div>
             <div class="eventItem">
               <span>所属组织：</span>
-              <span>{{ formData.agencyName || '--'}}</span>
+              <span v-if="formData.gridIdList &&formData.gridIdList.length!=0 ">{{ formData.gridIdList[0].objectName }}</span>
+              <span v-else> -- </span>
             </div>
             <div class="eventItem">
               <span>服务类型：</span>

src/views/modules/communityParty/members/update.vue

@@ -328,12 +328,10 @@ export default {
      */
     async handleNextOrgTreeClick(node, resolve) {
 
-      // if (node.level === 1) {
-      //   // loadPartyOrgTreeRoot接口已经返回了1，2级，所以点击1级的时候不需要加载了
-      //   resolve(null)
-      //   return
-      // }
-
+      if(node.children.length>0){
+          resolve(null)
+          return
+      }
       let url = '/actual/base/party/org/listNextLevelPartyOrgTreeNodesByPid'
 
       let rst = await requestGet(url, {