From b06dcb6888e1fa200d92321df83489b9a7d62206 Mon Sep 17 00:00:00 2001
From: jyt <1592211625@qq.com>
Date: Sat, 12 Mar 2022 18:51:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Receive/index.vue                | 2 +-
 src/views/Statistics/ReceptionOverview.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Receive/index.vue b/src/views/Receive/index.vue
index 659d1b1..6b88980 100644
--- a/src/views/Receive/index.vue
+++ b/src/views/Receive/index.vue
@@ -160,7 +160,7 @@
                 </div>
               </div>
               <div v-if="rec_index_flag" class="headpade">
-                <div class="biaoji" @click="biaoji()">标记</div>
+                <div class="biaoji" @click="biaoji()" v-if="userinformationlist.recording==2">标记</div>
               </div>
             </div>
             <div style="width: 100%">
diff --git a/src/views/Statistics/ReceptionOverview.vue b/src/views/Statistics/ReceptionOverview.vue
index 42248b4..e2197ad 100644
--- a/src/views/Statistics/ReceptionOverview.vue
+++ b/src/views/Statistics/ReceptionOverview.vue
@@ -252,7 +252,7 @@
               {{ activeName == "3" ? "平均执行率" : "合计" }}
             </div>
             <div class="text1-2">
-              {{ ceratelist.sum || 0 }}{{ activeName | company }}
+              {{ ceratelist.avg || 0 }}{{ activeName | company }}
             </div>
           </div>
           <div class="sanbox1" style="width: 40%">

From 5e9b08e8cd89fba0ea35fe89cb9231ba95a74ba9 Mon Sep 17 00:00:00 2001
From: jyt <1592211625@qq.com>
Date: Sat, 12 Mar 2022 19:37:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Receive/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Receive/index.vue b/src/views/Receive/index.vue
index 6b88980..7be91ba 100644
--- a/src/views/Receive/index.vue
+++ b/src/views/Receive/index.vue
@@ -160,7 +160,7 @@
                 </div>
               </div>
               <div v-if="rec_index_flag" class="headpade">
-                <div class="biaoji" @click="biaoji()" v-if="userinformationlist.recording==2">标记</div>
+                <div class="biaoji" @click="biaoji()" v-if="userinformationlist.merge==0">标记</div>
               </div>
             </div>
             <div style="width: 100%">