From c19c12cbd71226d1fe4efd5d1a6e4c562b2e3c6d Mon Sep 17 00:00:00 2001
From: jyt <1592211625@qq.com>
Date: Tue, 21 Jun 2022 18:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=BE=85=E8=AF=A6=E6=83=85=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Receive/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/Receive/index.vue b/src/views/Receive/index.vue
index a0a138e..6582982 100644
--- a/src/views/Receive/index.vue
+++ b/src/views/Receive/index.vue
@@ -170,7 +170,7 @@
                 >
                   标记
                 </div> -->
-                <el-button v-if="userinformationlist.merge == 0"
+                <el-button v-if="mg == 0"
                   style="width: 80px;border:1px solid #E6625B;color:#E6625B" plain @click="biaoji()">标记</el-button>
               </div>
             </div>
@@ -631,6 +631,7 @@ import { saveAs } from "file-saver";
 export default {
   data() {
     return {
+      mg:0,
       recordsText: [],
       roleVisible: false,
       roleFlag: "0",
@@ -1610,6 +1611,7 @@ export default {
     Getsthetransliteratecontent() {
       this.$api.http.findByCusIdcusId({ cusId: this.fileId }).then((res) => {
         let audopbj = res.data;
+        this.mg = res.data[0].merge;
         this.recordPath = audopbj[this.AudioIdx].recordPath;
         audopbj[this.AudioIdx].audioContent != ""
           ? (this.transcriptionlist = JSON.parse(