11

src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue

@@ -311,6 +311,8 @@ export default {
     handleChangeJoinOrg (value) {
       console.log('value', value)
       console.log('joinIdArray', this.formData.joinIdArray)
+      this.formData.joinIdArray = []
+      this.formData.joinIdArray = value
       this.formData.joinOrgList = []
       let selArray = this.$refs["myCascader_join"].getCheckedNodes()
 
@@ -395,6 +397,14 @@ export default {
         this.formData.publichIdArray = []
         if (data.publishOrgPathShow) {
           this.formData.publichIdArray = data.publishOrgPathShow.split(':')
+        } else {
+          let array = data.publishOrgPath.split(':')
+          array.forEach(element => {
+            if (this.isInTree(element)) {
+              this.formData.publichIdArray.push(element)
+            }
+
+          });
         }
 
         this.formData.joinIdArray = []
@@ -402,12 +412,25 @@ export default {
         data.joinOrgList.forEach(element => {
           if (element.joinOrgPathShow) {
             this.formData.joinIdArray.push(element.joinOrgPathShow.split(':'))
+          } else {
+            let array = element.joinOrgPath.split(':')
+            let joinIdTemp = []
+            array.forEach(element => {
+              if (this.isInTree(element)) {
+                joinIdTemp.push(element)
+              }
+
+            });
+
+            this.formData.joinIdArray.push(joinIdTemp)
           }
 
           this.formData.joinNames = this.formData.joinNames + element.joinOrgName + ','
 
         });
 
+        console.log('info-joinIdArray', this.formData.joinIdArray)
+
         if (this.formData.joinNames) {
           this.formData.joinNames = this.formData.joinNames.substring(0, this.formData.joinNames.length - 1)
         }
@@ -420,6 +443,33 @@ export default {
       }
     },
 
+    //剔除树上没有的id
+    isInTree (id) {
+      let inTree = false
+      const fn = (obj) => {
+        if (Array.isArray(obj)) {
+
+
+          obj.forEach((item) => {
+            //  
+            if (item.id === id) {
+              inTree = true
+            } else {
+
+            }
+
+            fn(item.children);
+          });
+
+        }
+
+
+      };
+      fn(this.publishOptions);
+      return inTree
+
+    },
+
     // 活动类型
     async getCategrayList () {
       const url = "/resi/partymember/icPartyAct/acttypelist"

src/views/modules/communityParty/orgActivity/activivityList/addRule.vue

@@ -299,6 +299,21 @@ export default {
 
     handleChangeScope (index) {
 
+      let obj = this.$refs["myCascader" + index].getCheckedNodes()[0].data
+
+      // if (obj) {
+      //   this.tableData[index].publishPartyOrgId = obj.id//发布活动党组织id	
+      //   this.tableData[index].publishPartyOrgName = obj.partyOrgName//发布活动党组织名称	
+      //   this.tableData[index].publishOrgPid = obj.pid//发布活动党组织ID的上级节点	
+      //   this.tableData[index].publishOrgType = obj.partyOrgType//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组	
+      //   this.tableData[index].publishOrgPathShow = value.join(':')//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显	
+      // } else {
+      //   this.tableData[index].publishPartyOrgId = ''
+      //   this.tableData[index].publishPartyOrgName = ''
+      //   this.tableData[index].publishOrgPid = ''
+      //   this.tableData[index].publishOrgType = ''
+      //   this.tableData[index].publishOrgPathShow = ''
+      // }
     },
 
     handleChangeJoinOrg (value, index) {
@@ -426,6 +441,16 @@ export default {
 
     disposeParty () {
       this.tableData.forEach((tableItem, index) => {
+
+        let obj = this.$refs["myCascader" + index].getCheckedNodes()[0]
+
+        //发布活动党组织
+        tableItem.publishPartyOrgId = obj.data.id//发布活动党组织id	
+        tableItem.publishPartyOrgName = obj.data.partyOrgName//发布活动党组织名称	
+        tableItem.publishOrgPid = obj.data.pid//发布活动党组织ID的上级节点	
+        tableItem.publishOrgType = obj.data.partyOrgType//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组	
+        tableItem.publishOrgPathShow = obj.path.join(':')//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
+
         //参会党组织
         tableItem.joinOrgList = []
         let selJoinArray = this.$refs["myCascader_join" + index].getCheckedNodes()
@@ -538,13 +563,13 @@ export default {
         address: '',//	活动地址
         latitude: '',//活动地点纬度
         longitude: '',//	活动地点经度
-        autoPublicType: this.autoTimeArray[1].value ||'',//自动发布时间key; 来源于字典表接口 默认 3天
+        autoPublicType: this.autoTimeArray[1].value || '',//自动发布时间key; 来源于字典表接口 默认 3天
         publishPartyOrgId: this.defaultPublishParty.defaultPartyOrgId,//	发布活动党组织id
         publishPartyOrgName: this.defaultPublishParty.defaultPartyOrgName,//	发布活动党组织名称
         publishOrgPid: this.defaultPublishParty.defaultPartyOrgPid,//	参加活动党组织ID的上级节点
         publishOrgType: this.defaultPublishParty.orgType,//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
         publishOrgPathShow: this.defaultPublishParty.defaultPartyOrgPath,//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
-        joinUserType: this.joinArray[0].value ||'',//参加人员类型，0：全体党员；1：支部委员 默认 全体
+        joinUserType: this.joinArray[0].value || '',//参加人员类型，0：全体党员；1：支部委员 默认 全体
         isAutoInform: '',//	是否自动通知参加人员，0否；1是
         introduce: '',//	活动介绍
         attachmentList: [],