diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index bda5a07..ea0a22c 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -69,14 +69,14 @@
                         prop="actQuota">
             <template>
               <el-radio v-model="dataForm.actQuotaCategory"
-                        label="1">固定名额</el-radio>&emsp;&emsp;
+                        :label="1">固定名额</el-radio>&emsp;&emsp;
               <el-input-number type="number"
                                :min="1"
                                v-model="dataForm.actQuota"
                                placeholder="固定名额"
                                style="width:150px"></el-input-number>&emsp; 人&emsp;&emsp;
               <el-radio v-model="dataForm.actQuotaCategory"
-                        label="0">不限名额</el-radio>
+                        :label="0">不限名额</el-radio>
             </template>
             <div>
               <font color="gray">报名未审核人员：</font>
@@ -290,7 +290,7 @@ export default {
         headPic: '',
         signupStartTime: '',
         signupEndTime: '',
-        actQuotaCategory: '1',
+        actQuotaCategory: 1,
         actStartTime: '',
         actEndTime: '',
         actAddress: '',
@@ -369,6 +369,10 @@ export default {
       }
     }
   },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
   created () {
     this.$http
       .get(`/sys/user/deptOptions/getByLoginUser`)
@@ -592,6 +596,7 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        this.quillEditor.root.innerHTML = this.dataForm.actContent
       }).catch(() => { })
     },
     // 表单提交
diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue
index 6831a62..31e76d4 100644
--- a/src/views/modules/heart/actinfo-list.vue
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -59,7 +59,8 @@
               <el-button v-if="$hasPermission('heart:actinfo:clock')" type="text" :disabled="scope.row.actStatus ==='0'? true :false" size="small" @click="clockManage(scope.row.id)">打卡积分</el-button>
             </div>
             <div>
-              <el-button v-if="$hasPermission('heart:actinfo:pull')" type="text" size="small" @click="pullHandle(scope.row)">新闻发稿 </el-button>
+              <el-button v-if="$hasPermission('heart:actinfo:pull')" type="text" size="small" @click="pullHandle(scope.row)">新闻发稿</el-button>
+              <el-button v-if="$hasPermission('heart:actinfo:update')" type="text" size="small" @click="updateHandle(scope.row)">新闻编辑</el-button>
             </div>
           </template>
         </el-table-column>
@@ -184,6 +185,10 @@ export default {
         this.$refs.actinfoPull.dataForm.id = row.id
         this.$refs.actinfoPull.init()
       })
+    },
+    updateHandle (row) {
+      this.$parent.selectComponent = 'ActInfoAdd'
+      this.$router.push({ path: '/heart-actinfo', query: { id: row.id } })
     }
   }
 }
diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue
index ff333d5..616e917 100644
--- a/src/views/modules/heart/actuserclock-detail.vue
+++ b/src/views/modules/heart/actuserclock-detail.vue
@@ -104,6 +104,12 @@
             ></el-image>
           </template>
         </el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <template slot-scope="scope">
+          <el-button v-show="scope.row.shieldFlag != 1" type="text" size="small"  @click="upShieldFlag(scope.row.id)">未屏蔽</el-button>
+          <el-button type="text" size="small" v-show="scope.row.shieldFlag == 1" :disabled="true">已屏蔽</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
@@ -145,7 +151,8 @@ export default {
         latitude: '',
         longitude: '',
         radius: 200,
-        clockPic: []
+        clockPic: [],
+        shieldFlag: ''
       },
       previewImgList: [],
       isAble: false
@@ -357,7 +364,37 @@ export default {
       },
       1000,
       { leading: true, trailing: false }
-    )
+    ),
+    // 屏蔽打卡记录
+    upShieldFlag (id) {
+      this.$confirm('此操作将永久屏蔽该文件, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.dataForm.shieldFlag = 1
+        this.dataForm.id = id
+        this.$http['post']('/heart/actuserclocklog/updateShieldFlag', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.$emit('refreshDataList')
+              this.$parent.selectComponent = 'ActUserClockLog'
+              this.$router.push({
+                path: '/heart-actinfo',
+                query: { id: this.dataForm.actId }
+              })
+            }
+          })
+        }).catch(() => {})
+      }).catch(() => {
+      })
+    }
   }
 }
 </script>