From 5abc6b98bb1dd5a19dc27936284c43e5f496e399 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 22 Aug 2022 16:14:21 +0800
Subject: [PATCH] 111

---
 .../activivityList/addActivity.vue            |  9 +++--
 .../orgActivity/activivityList/addRule.vue    |  5 ++-
 .../activivityList/yearplanList.vue           | 39 +++++++++++++++----
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index 05eb490e8..3c49d9e67 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -73,7 +73,7 @@
 
         </el-form-item>
 
-        <el-form-item label="参加活动党组织"
+        <el-form-item label="发布活动党组织"
                       prop="publichIdArray"
                       label-width="150px"
                       style="display: block">
@@ -86,7 +86,7 @@
                        :show-all-levels="false"
                        @change="handleChangeScope"></el-cascader>
         </el-form-item>
-        <el-form-item label="发布活动党组织"
+        <el-form-item label="参加活动党组织"
                       prop="joinIdArray"
                       label-width="150px"
                       style="display: block">
@@ -316,6 +316,7 @@ export default {
           orgType: element.data.partyOrgType,
           pid: element.data.pid,
           joinOrgPath: element.path.join(':'),
+          joinOrgName: element.datapartyOrgName,
         }
         this.formData.joinOrgList.push(obj)
       });
@@ -634,10 +635,10 @@ export default {
           { required: true, message: '参加人员不能为空', trigger: 'change' }
         ],
         joinIdArray: [
-          { required: true, message: '发布活动党组织不能为空', trigger: 'change' }
+          { required: true, message: '参加活动党组织不能为空', trigger: 'change' }
         ],
         publichIdArray: [
-          { required: true, message: '参加活动党组织不能为空', trigger: 'change' }
+          { required: true, message: '发布活动党组织不能为空', trigger: 'change' }
         ],
 
       }
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
index e7c7d7736..f5199bf58 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
@@ -294,7 +294,8 @@ export default {
 
     handleChangeScope (index) {
       let onePublish = this.publishOptions[index]
-      let obj = this.$refs["myCascader" + index].getCheckedNodes()[0].data
+      debugger
+      let obj = this.$refs["myCascader" + index][0].getCheckedNodes()[0].data
       if (obj) {
         onePublish.publishPartyOrgId = obj.id//发布活动党组织id	
         onePublish.publishPartyOrgName = obj.partyOrgName//发布活动党组织名称	
@@ -314,7 +315,7 @@ export default {
       let oneJoin = this.joinOptions[index]
 
       oneJoin.joinOrgList = []
-      let selArray = this.$refs["myCascader_join" + index].getCheckedNodes()
+      let selArray = this.$refs["myCascader_join" + index][0].getCheckedNodes()
 
       console.log('selArray', selArray)
 
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
index a22b0f414..ec7034675 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
@@ -71,7 +71,7 @@
 
           <el-table-column prop="holdTime"
                            align="center"
-                           width="150"
+                           width="160"
                            label="活动时间"
                            :show-overflow-tooltip="true">
 
@@ -89,29 +89,41 @@
                            label="活动主题"
                            :show-overflow-tooltip="true">
           </el-table-column>
+          <el-table-column prop="publishPartyOrgName"
+                           align="center"
+                           min-width="200"
+                           label="发布活动党支部"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
           <el-table-column prop="joinOrgsShow"
                            align="center"
                            min-width="200"
                            label="参加活动党支部"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="joinTypeValue"
+          <el-table-column prop="joinUserTypeName"
                            align="center"
                            width="80"
                            label="参加人员"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="autoPublicTime"
+          <el-table-column prop="autoPublicTypeDesc"
                            align="center"
                            width="120"
                            label="自动发布时间"
                            :show-overflow-tooltip="true">
+
           </el-table-column>
           <el-table-column prop="isAutoInformValue"
                            align="center"
                            width="80"
                            label="自动通知"
                            :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span v-if="scope.row.isAutoInform == '1'">是</span>
+              <span v-if="scope.row.isAutoInform == '0'">否</span>
+
+            </template>
           </el-table-column>
 
           <el-table-column fixed="right"
@@ -355,8 +367,8 @@ export default {
 
     async cancelActivity () {
 
-      // const url = '/resi/partymember/icPartyAct/del';
-      const url = 'http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del';
+      const url = '/resi/partymember/icPartyAct/del';
+      // const url = 'http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del';
       let params = [this.activityId]
 
       const { data, code, msg } = await requestPost(url, params);
@@ -371,8 +383,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";
+      // const url = "http://yapi.elinkservice.cn/mock/245/icPartyAct/yearSearch";
 
       const { data, code, msg } = await requestPost(url, this.formData);
 
@@ -387,7 +399,18 @@ export default {
           item.activityList.forEach(actItem => {
             actItem.actType = item.type
             actItem.frequency = item.frequency
-            actItem.joinOrgsShow = actItem.joinOrgs.join(',')
+
+            if (actItem.joinOrgList && actItem.joinOrgList.length > 0) {
+
+              let arr = []
+              actItem.joinOrgList.forEach(element => {
+                arr.push(element.joinOrgName)
+              });
+              actItem.joinOrgsShow = arr.join(',')
+            } else {
+              actItem.joinOrgsShow = ''
+            }
+
 
             tempArray.push(actItem)
           });