Merge branch 'master' of http://git.2weisou.com/liumin/zkPCproject

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.merge==0">标记</div>
               </div>
             </div>
             <div style="width: 100%">

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%">