Merge branch '7.31' into dev

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

@@ -462,7 +462,7 @@ export default {
 
         async handleDispose(row,type) {
             console.log(row);
-            this.eventId = '1817808353882152962';
+            this.eventId = row.icEventId;
             const url = "/governance/icEvent/detail";
             const { data, code, msg } = await requestPost(url, {
                 icEventId: this.eventId,

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

@@ -457,8 +457,18 @@ export default {
             }
         },
 
-        async handleDispose(row) {
-            console.log("row",row);
+        async handleDispose(row,type) {
+            this.eventId = row.icEventId;
+            const url = "/governance/icEvent/detail";
+            const { data, code, msg } = await requestPost(url, {
+                icEventId: this.eventId,
+            });
+            if (code === 0) {
+                this.eventDetailData = { ...data };
+                this.pageType = type;
+            } else {
+                this.$message.error(msg);
+            }
         },
         //下载模版
         async handleExportModule() {