提交测试

1

src/views/2021memeberActionManager/index.vue

@@ -52,31 +52,35 @@
         实收金额=应收总额（包含余额支付）
         预收金额=充值总额（发生消费，记负数）
         预收余额=充值总余额 -->
-
-        购买人数：{{ head.buyNum }}人<i
+        总金额：{{ head.buyAmount | moneyFormat }}元<i
           style="width: 10px; display: inline-block"
         ></i>
-        人均购买金额：{{ head.avgBuyAmount | moneyFormat }}元<i
+        目标总金额：{{ head.targetAmount | moneyFormat }}元<i
           style="width: 10px; display: inline-block"
         ></i>
-        目标总金额：{{ head.targetAmount | moneyFormat }}元<i
+        目标金额达成率：{{ head.targetAmountFinishScale }}%<i
+          style="width: 10px; display: inline-block"
+        ></i>
+
+        购买人数：{{ head.buyNum }}人<i
           style="width: 10px; display: inline-block"
         ></i>
-        购买总金额：{{ head.buyAmount | moneyFormat }}元<i
+        人均购买金额：{{ head.avgBuyAmount | moneyFormat }}元<i
           style="width: 10px; display: inline-block"
         ></i>
         目标人数：{{ head.targetNum }}人<i
           style="width: 10px; display: inline-block"
         ></i>
-        <!-- 购买率：{{ head.buyScale }}%
-        <i style="width: 10px; display: inline-block"></i> -->
-
         目标达成率：{{ head.targetFinishScale }}%<i
           style="width: 10px; display: inline-block"
         ></i>
-        目标金额达成率：{{ head.targetAmountFinishScale }}%<i
+
+        <!-- 购买总金额：{{ head.buyAmount | moneyFormat }}元<i
           style="width: 10px; display: inline-block"
-        ></i>
+        ></i> -->
+
+        <!-- 购买率：{{ head.buyScale }}%
+        <i style="width: 10px; display: inline-block"></i> -->
 
         <!-- 总人数：{{ head.totalNum }}元<i
           style="width: 10px; display: inline-block"
@@ -106,44 +110,33 @@
             label="分部"
             width="170px"
           ></el-table-column>
+          <el-table-column align="center" prop="buyAmount" label="总金额">
+            <template slot-scope="scope">
+              <div>{{ scope.row.buyAmount | moneyFormat }}元</div>
+            </template></el-table-column
+          >
           <el-table-column
             align="center"
-            prop="buyNum"
+            prop="targetAmount"
             sortable="custom"
+            label="目标金额"
             width="150px"
           >
-            <template slot="header" slot-scope="slot">
-              <div class="titleCell">
-                <span>购买人数</span>
-                <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">本次活动交易成功总人数（去重）</div>
-                  <i
-                    class="el-icon-question micon el-tooltip"
-                    style="
-                      font-size: 18px;
-                      color: #f56c6c;
-                      top: 2px;
-                      position: relative;
-                    "
-                  ></i>
-                </el-tooltip>
-              </div>
-            </template>
             <template slot-scope="scope">
-              <div>{{ scope.row.buyNum }}人</div>
+              <div>{{ scope.row.targetAmount | moneyFormat }}元</div>
             </template>
           </el-table-column>
           <el-table-column
             align="center"
-            prop="avgBuyAmount"
+            prop="targetAmountFinishScale"
             sortable="custom"
-            width="150px"
+            width="170px"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>人均购买金额</span>
+                <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="
@@ -157,22 +150,20 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <div>{{ scope.row.avgBuyAmount }}元</div>
+              <div>{{ scope.row.targetAmountFinishScale }}%</div>
             </template>
           </el-table-column>
-          <!-- <el-table-column
+          <el-table-column
             align="center"
-            prop="totalNum"
+            prop="buyNum"
             sortable="custom"
-            width="140px"
+            width="150px"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>总人数</span>
+                <span>购买人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">
-                    进行中乐团在读学员+VIP、网管有课学员总数（除弦乐声部、去重）
-                  </div>
+                  <div slot="content">本次活动交易成功总人数（去重）</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -186,20 +177,20 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <div>{{ scope.row.totalNum }}人</div>
+              <div>{{ scope.row.buyNum }}人</div>
             </template>
-          </el-table-column> -->
-          <!-- <el-table-column
+          </el-table-column>
+          <el-table-column
             align="center"
-            prop="buyScale"
+            prop="avgBuyAmount"
             sortable="custom"
             width="150px"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>购买率</span>
+                <span>人均购买金额</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">实际交易成功人数 / 目标购买人数*100%</div>
+                  <div slot="content">总金额 / 购买人数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -213,9 +204,9 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <div>{{ scope.row.buyScale }}%</div>
+              <div>{{ scope.row.avgBuyAmount }}元</div>
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column
             align="center"
             prop="targetNum"
@@ -274,44 +265,7 @@
               <div>{{ scope.row.targetFinishScale }}%</div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="targetAmount"
-            sortable="custom"
-            label="目标金额"
-            width="150px"
-          >
-            <template slot-scope="scope">
-              <div>{{ scope.row.targetAmount | moneyFormat }}元</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="targetAmountFinishScale"
-            sortable="custom"
-            width="170px"
-          >
-            <template slot="header" slot-scope="slot">
-              <div class="titleCell">
-                <span>目标达金额成率</span>
-                <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">总成交额/目标总额*100%</div>
-                  <i
-                    class="el-icon-question micon el-tooltip"
-                    style="
-                      font-size: 18px;
-                      color: #f56c6c;
-                      top: 2px;
-                      position: relative;
-                    "
-                  ></i>
-                </el-tooltip>
-              </div>
-            </template>
-            <template slot-scope="scope">
-              <div>{{ scope.row.targetAmountFinishScale }}%</div>
-            </template>
-          </el-table-column>
+
           <el-table-column label="详情" align="left">
             <template slot-scope="scope">
               <div>

src/views/teamDetail/components/modals/quite-team.vue

@@ -15,7 +15,11 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="乐团名称">
-            <span>{{quitForm.musicGroupName}}</span>
+                 <overflow-text
+                :text="quitForm.musicGroupName"
+                width="150px"
+              ></overflow-text>
+            <!-- <span>{{}}</span>   -->
           </el-form-item>
         </el-col>
       </el-row>