From 31836bf5058bc8b733ad88a0b490638b795ff6a9 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 22 Aug 2022 17:27:47 +0800
Subject: [PATCH] 111

---
 .../activivityList/addActivity.vue            |  2 +-
 .../orgActivity/activivityList/addRule.vue    | 33 ++++++++++---------
 .../activivityList/scheduleForm.vue           |  4 +--
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index f7ac5cc19..9ad0a7d81 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -316,7 +316,7 @@ export default {
           orgType: element.data.partyOrgType,
           pid: element.data.pid,
           joinOrgPath: element.path.join(':'),
-          joinOrgName: element.data.datapartyOrgName,
+          joinOrgName: element.data.partyOrgName,
         }
         this.formData.joinOrgList.push(obj)
       });
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
index f5199bf58..8b5694873 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
@@ -109,7 +109,7 @@
             <template slot-scope="scope">
 
               <el-cascader class="item_width_1"
-                           ref="myCascader"
+                           :ref="'myCascader'+scope.$index"
                            v-model="scope.row.publichIdArray"
                            :key="iscascaderShow"
                            :options="publishOptions"
@@ -244,11 +244,11 @@ export default {
       actType: "",
       joinArray: [//参加人员
         {
-          valule: '0',
+          value: '0',
           label: '全体党员'
         },
         {
-          valule: '1',
+          value: '1',
           label: '支部委员'
         },
       ],
@@ -295,7 +295,7 @@ export default {
     handleChangeScope (index) {
       let onePublish = this.publishOptions[index]
       debugger
-      let obj = this.$refs["myCascader" + index][0].getCheckedNodes()[0].data
+      let obj = this.$refs["myCascader" + index].getCheckedNodes()[0].data
       if (obj) {
         onePublish.publishPartyOrgId = obj.id//发布活动党组织id	
         onePublish.publishPartyOrgName = obj.partyOrgName//发布活动党组织名称	
@@ -312,11 +312,11 @@ export default {
     },
 
     handleChangeJoinOrg (index) {
-      let oneJoin = this.joinOptions[index]
 
-      oneJoin.joinOrgList = []
-      let selArray = this.$refs["myCascader_join" + index][0].getCheckedNodes()
+      this.tableData[index].joinOrgList = []
+      let selArray = this.$refs["myCascader_join" + index].getCheckedNodes()
 
+      console.log('index', index)
       console.log('selArray', selArray)
 
       selArray.forEach((element, index) => {
@@ -325,9 +325,10 @@ export default {
           joinOrgId: element.data.id,
           orgType: element.data.partyOrgType,
           pid: element.data.pid,
+          joinOrgName: element.data.partyOrgName,
           joinOrgPath: element.path.join(':'),
         }
-        oneJoin.joinOrgList.push(obj)
+        this.tableData[index].joinOrgList.push(obj)
       });
 
     },
@@ -348,8 +349,8 @@ export default {
     },
     async getTableData () {
       this.tableLoading = true
-      // const url = "/icPartyAct/yearSearch";
-      const url = "http://yapi.elinkservice.cn/mock/245/icPartyAct/yearSearch";
+      const url = "/resi/partymember/icPartyAct/yearSearch";
+
       let params = {
         yearId: this.yearId
       }
@@ -361,7 +362,7 @@ export default {
         let tempArray = []
 
         data.forEach(item => {
-          if (item.type === actType) {
+          if (item.type === this.actType) {
             tempArray = []
 
             item.activityList.forEach(actItem => {
@@ -498,11 +499,13 @@ export default {
         introduce: '',//	活动介绍
         joinOrgList: [],
 
-        publichIdArray: this.defaultPublishParty.defaultPartyOrgPath.split(':'),
-        joinIdArray: [],
+        // publichIdArray: this.defaultPublishParty.defaultPartyOrgPath.split(':'),
+        publichIdArray: ['1536584227130798081'],
+        joinIdArray: ['1536584227130798081'],
         isAutoInformShow: true
 
       }
+
       this.tableData.push(obj)
     },
 
@@ -561,8 +564,8 @@ export default {
 
     // 字典
     async getCategrayList () {
-      // const url = "/resi/partymember/icPartyAct/acttypelist"
-      const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist"
+      const url = "/resi/partymember/icPartyAct/acttypelist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist"
 
       let params = {}
 
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
index 035c516eb..8b366d438 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
@@ -99,11 +99,11 @@ export default {
 
       gongkaiArray: [
         {
-          valule: '0',
+          value: '0',
           label: '仅自己可见'
         },
         {
-          valule: '1',
+          value: '1',
           label: '组织内其他人可见'
         },