111

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

@@ -195,7 +195,7 @@
                          type="text"
                          size="small"
                          class=".div-table-button--detail">查看</el-button>
-              <el-button v-if="scope.row.isPublish == '0'"
+              <el-button v-if="scope.row.isPublish == '0' && user.id===scope.row.publishStaffId"
                          @click="handlePublish(scope.row)"
                          type="text"
                          size="small"

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

@@ -77,7 +77,10 @@
                       prop="publichIdArray"
                       label-width="150px"
                       style="display: block">
-          <el-cascader class="item_width_1"
+          <div v-if="formType==='detail'"
+               class="item_width_1">{{formData.publishPartyOrgName}}</div>
+          <el-cascader v-else
+                       class="item_width_1"
                        ref="myCascader"
                        v-model="formData.publichIdArray"
                        :key="iscascaderShow"
@@ -90,7 +93,10 @@
                       prop="joinIdArray"
                       label-width="150px"
                       style="display: block">
-          <el-cascader class="item_width_1"
+          <div v-if="formType==='detail'"
+               class="item_width_1">{{formData.joinNames}}</div>
+          <el-cascader v-else
+                       class="item_width_1"
                        ref="myCascader_join"
                        v-model="formData.joinIdArray"
                        :key="joinIscascaderShow"
@@ -389,9 +395,16 @@ export default {
 
         this.formData.publichIdArray = data.publishOrgPath.split(':')
         this.formData.joinIdArray = []
+        this.formData.joinNames = ''
         data.joinOrgList.forEach(element => {
           this.formData.joinIdArray.push(element.joinOrgPath.split(':'))
+          this.formData.joinNames = this.formData.joinNames + element.joinOrgName + ','
+
         });
+
+        if (this.formData.joinNames) {
+          this.formData.joinNames = this.formData.joinNames.substring(0, this.formData.joinNames.length - 1)
+        }
         this.isAutoInform = this.formData.isAutoInform == '1'
 
         this.fileList = [... this.formData.attachmentList]

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

@@ -307,14 +307,14 @@ export default {
       this.selActType = { ...this.actTypeArray[index] }
 
       //首先获取当前年份对应活动类型是否有活动
-      await this.getTableData()
+      // await this.getTableData()
       //如果没有活动，根据字典数据，初始化
 
-      if (this.tableData.length === 0) {
-        for (let i = 0; i < this.selActType.yearCount; i++) {
-          this.handleAdd()
-        }
+      // if (this.tableData.length === 0) {
+      for (let i = 0; i < this.selActType.yearCount; i++) {
+        this.handleAdd()
       }
+      // }
 
 
     },
@@ -454,12 +454,12 @@ export default {
         type: "warning"
       })
         .then(() => {
-          if (row.icPartyActId) {
-            this.icPartyActId = row.icPartyActId
-            this.delPlan(tableIndex)
-          } else {
-            this.tableData.splice(tableIndex, 1);
-          }
+          // if (row.icPartyActId) {
+          //   this.icPartyActId = row.icPartyActId
+          //   this.delPlan(tableIndex)
+          // } else {
+          this.tableData.splice(tableIndex, 1);
+          // }
 
         })
         .catch(err => {
@@ -523,6 +523,7 @@ export default {
         joinUserType: '',//参加人员类型，0：全体党员；1：支部委员	
         isAutoInform: '',//	是否自动通知参加人员，0否；1是	
         introduce: '',//	活动介绍
+        attachmentList: [],
         joinOrgList: [],
 
         publichIdArray: this.defaultPublishParty.defaultPartyOrgPath.split(':'),

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

@@ -97,7 +97,7 @@
           </el-table-column>
           <el-table-column prop="publishStaffName"
                            align="center"
-                           min-width="180"
+                           width="120"
                            label="发布人"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -138,12 +138,19 @@
                            width="180">
             <template slot-scope="scope">
 
-              <el-button @click="handleEdit(scope.row)"
+              <el-button @click="handleDetail(scope.row)"
+                         type="text"
+                         size="small"
+                         class=".div-table-button--detail">查看</el-button>
+
+              <el-button v-if="user.id===scope.row.publishStaffId"
+                         @click="handleEdit(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--edit">修改</el-button>
 
-              <el-button @click="handleDel(scope.row)"
+              <el-button v-if="user.id===scope.row.publishStaffId"
+                         @click="handleDel(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--delete">删除</el-button>
@@ -186,6 +193,7 @@
                @closed="showEdit = false">
       <add-activity ref="ref_edit_form"
                     :formType="formType"
+                    :icPartyActId="icPartyActId"
                     @handleOk="handleOk"
                     @handleClose="handleClose"></add-activity>
     </el-dialog>
@@ -322,9 +330,17 @@ export default {
       this.formType = 'add'
       this.showAdd = true;
 
+    },
+    async handleDetail (row) {
+      this.icPartyActId = row.icPartyActId
+      this.addDiaTitle = '查看活动计划'
+      this.formType = 'detail'
+      this.showEdit = true
+
     },
 
     async handleEdit (row) {
+      this.icPartyActId = row.icPartyActId
       this.formType = 'edit'
       this.showEdit = true