Merge branch 'bug_mk' into feature

# Conflicts:
#	src/views/modules/shequzhili/eventOld/eventList.vue

src/views/modules/shequzhili/eventOld/cpts/event-info.vue

@@ -504,12 +504,7 @@ export default {
                     this.formData.agencyId = "";
                     this.formData.gridId = "";
                 }
-                if(this.formData.operationType == "7"){
-                    this.formData.openFlag =  1
-                    this.formData.operationType = ""
-                }else{
-                    this.formData.openFlag =  0
-                }
+                this.formData.openFlag =  null
                 const url = "/governance/icEventOld/add";
                 const { data, code, msg } = await requestPost(url, {
                     ...this.formData,
@@ -542,14 +537,7 @@ export default {
                     }
                     this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
                     this.replayInfo.icEventId = this.eventId;
-                    if(this.formData.operationType === '7'){
-                        this.replayInfo.openFlag = 1
-                        this.replayInfo.operationType = ''//不可以openFlag为true时去掉校验吗?
-                        this.replayInfo.content = '1111'//不可以openFlag为true时去掉校验吗?
-                    }else{
-                        this.replayInfo.openFlag = 0
-                    }
-
+                    this.replayInfo.openFlag = null
                     //回复属性赋值
                     let url = "/governance/icEventOld/reply";
                     await this.submitDispose(url, this.replayInfo);
@@ -582,10 +570,27 @@ export default {
                 } else {
                     this.$message.info("请选择一种处理方式");
                 }
+                if(this.formData.operationType){
+                    await this.sendProcessNotificationMsg()
+                }
             } else {
                 return false;
             }
         },
+        async sendProcessNotificationMsg(){
+            let parm = {
+                operationType:this.eventDetailData.operationType,
+                openId:this.eventDetailData.openId,
+                eventContent:this.eventDetailData.eventContent,
+                latestOperatedTime:this.eventDetailData.latestOperatedTime
+            }
+            let {data,code,msg} = await requestPost('/actual/base/communityPublicity/sendProcessNotificationMsg',parm)
+            if(code === 0){
+                console.log(data,'sssssssssssssssssssssssssssss');
+            }else{
+                console.log(msg);
+            }
+        },
         async submitDispose(url, params) {
             console.log(params);
             const { data, code, msg } = await requestPost(url, {

src/views/modules/shequzhili/eventOld/cpts/process-form.vue

@@ -52,7 +52,7 @@ export default {
         return {
             formData: {
                 operationType: '',
-                openFlag:0,
+                openFlag:null,
             },
  
             casOptions: [],

src/views/modules/shequzhili/eventOld/eventList.vue

@@ -220,8 +220,7 @@
                                 " @click="handleWatch(scope.row)" type="text" size="small" class="">去评价</el-button>
                             <el-button v-else @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
                             <el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
-                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">开启表决</el-button>
-                            
+                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">{{scope.row.openFlag === 0 ? '开启表决' : '关闭表决'}}</el-button>
                         </template>
                     </el-table-column>
                 </el-table>