From c562fa2e66f4972ae23fa57ef7412da6e18991ed Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 12 七月 2022 14:31:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master

---
 src/views/accidentHidden/fillProgress.vue |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/views/accidentHidden/fillProgress.vue b/src/views/accidentHidden/fillProgress.vue
index c665310..bd70048 100644
--- a/src/views/accidentHidden/fillProgress.vue
+++ b/src/views/accidentHidden/fillProgress.vue
@@ -43,11 +43,12 @@
                         align="center">
                     </el-table-column>
                     <el-table-column
-                        prop="Remark "
+                        prop="Remark"
                         label="备注"
                         align="center">
                     </el-table-column>
                     <el-table-column
+                        v-if="type!=1"
                         label="操作"
                         align="center"
                         width="200">
@@ -74,6 +75,7 @@
             </div>
         </div>
 
+        <el-button @click="returnIndex">返回</el-button>
         <el-dialog
             :title="title"
             :visible.sync="dialogVisible"
@@ -347,6 +349,11 @@
                 })
                 this.clickCellMap[id] = []
             },
+            returnIndex(){
+                this.$router.push({
+                    path:"/accidentHidden/accidentHidden/majorHidden"
+                })
+            },
         }
     }
 </script>

--
Gitblit v1.9.2