Merge branch 'bug_mk' into feature

src/views/modules/shequzhili/eventHandling/index.vue

@@ -146,7 +146,8 @@
                             <!-- <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if="scope.row.canOperate && scope.row.operationType != '11'&&scope.row.operationType!= '12' ">办理</el-button>
                             <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if="scope.row.canOperate && scope.row.deptId && scope.row.latestOperatedTime && isWithinTwoHours(scope.row.latestOperatedTime) && scope.row.operationType!='11' &&scope.row.operationType!= '12'">退件</el-button> -->
                             <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if=" scope.row.operationType != '11'&&scope.row.operationType!= '12' ">办理</el-button>
-                            <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" >退件</el-button>
+                            <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if="scope.row.status !=='closed_case'">退件</el-button>
+                            <el-button  @click="handleDel(scope.row)" type="text" size="small" >删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -419,7 +420,6 @@ export default {
                 return item;
             });
         },
-
         async handleExport() {
             const url = "/governance/icEvent/export";
             const { pageSize, pageNo, formData } = this;
@@ -635,14 +635,14 @@ export default {
             }).catch((err) => { });
         },
         async delEvent(eventId) {
-            const url = "/governance/icEvent/delete";
-            let idsArr = [eventId];
-            const { data, code, msg } = await requestPost(url, idsArr);
-            if (code === 0) {
-                this.$message.success("删除成功！");
+            let parm = {
+                eventId:eventId
+            }
+            let url = '/governance/icEvent/deleteIcEventAndReply'
+            let {code} = await requestPost(url,parm)
+            if(code === 0){
+                this.$message.success('已删除')
                 this.getTableData();
-            } else {
-                this.$message.error("操作失败！");
             }
         },
         async getTableData() {