Merge branch '0601Action' into test

src/views/2021memeberActionManager/index.vue

@@ -61,8 +61,8 @@
         购买人数：{{ head.buyNum | moneyFormat }}元<i
           style="width: 10px; display: inline-block"
         ></i>
-        购买率：{{ head.buyScale }}%
-        <i style="width: 10px; display: inline-block"></i>
+        <!-- 购买率：{{ head.buyScale }}%
+        <i style="width: 10px; display: inline-block"></i> -->
 
         目标总金额：{{ head.targetAmount | moneyFormat }}元<i
           style="width: 10px; display: inline-block"
@@ -73,9 +73,9 @@
         目标购买人数：{{ head.targetNum }}元<i
           style="width: 10px; display: inline-block"
         ></i>
-        总人数：{{ head.totalNum }}元<i
+        <!-- 总人数：{{ head.totalNum }}元<i
           style="width: 10px; display: inline-block"
-        ></i>
+        ></i> -->
       </div>
       <div class="tableWrap">
         <el-table
@@ -153,7 +153,7 @@
               <div>{{ scope.row.avgBuyAmount }}元</div>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             prop="totalNum"
             sortable="custom"
@@ -181,8 +181,8 @@
             <template slot-scope="scope">
               <div>{{ scope.row.totalNum }}人</div>
             </template>
-          </el-table-column>
-          <el-table-column
+          </el-table-column> -->
+          <!-- <el-table-column
             align="center"
             prop="buyScale"
             sortable="custom"
@@ -208,7 +208,7 @@
             <template slot-scope="scope">
               <div>{{ scope.row.buyScale }}%</div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             prop="targetNum"
@@ -219,7 +219,7 @@
               <div class="titleCell">
                 <span>目标人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">各分部目标人数之和</div>
+                  <div slot="content">进行中非会员乐团-已上乐团课小于等于4节学员-非本活动购买会员-弦乐声部学员</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -246,7 +246,7 @@
               <div class="titleCell">
                 <span>目标达成率</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">各分部目标人数之和</div>
+                  <div slot="content">该分部实际交易成功人数 / 目标人数*100%</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="