Merge branch 'bug_mk' into feature

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

@@ -171,6 +171,7 @@
                                 v-if="scope.row.status =='unassigned'||scope.row.status =='processing'||scope.row.operationType =='13'">派件</el-button>
                             <el-button @click="handleDispose(scope.row,'check')" type="text" size="small"
                                 v-if="scope.row.operationType === '11'">审核</el-button>
+                                <el-button  @click="handleDel(scope.row)" type="text" size="small" >删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -360,7 +361,27 @@ export default {
         this.getCateOptions();
     },
     methods: {
-       
+        async handleDel(rowData) {
+            let message = "确认删除?";
+            this.$confirm(message, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.delEvent(rowData.icEventId);
+            }).catch((err) => { });
+        },
+        async delEvent(eventId) {
+            let parm = {
+                eventId:eventId
+            }
+            let url = '/governance/icEvent/deleteIcEventAndReply'
+            let {code} = await requestPost(url,parm)
+            if(code === 0){
+                this.$message.success('已删除')
+                this.getTableData();
+            }
+        },
         handleSelectionChange(val) {
             this.multipleSelection = [];
             val.forEach((element) => {

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

@@ -147,7 +147,7 @@
                             <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" 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>
@@ -624,27 +624,6 @@ export default {
             this.getTableData();
         },
 
-        async handleDel(rowData) {
-            let message = "确认删除?";
-            this.$confirm(message, "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.delEvent(rowData.icEventId);
-            }).catch((err) => { });
-        },
-        async delEvent(eventId) {
-            let parm = {
-                eventId:eventId
-            }
-            let url = '/governance/icEvent/deleteIcEventAndReply'
-            let {code} = await requestPost(url,parm)
-            if(code === 0){
-                this.$message.success('已删除')
-                this.getTableData();
-            }
-        },
         async getTableData() {
             const url = "/governance/icEvent/manageList";
             if (this.eventTypeCheck) {