Merge branch '0601Action' into test

src/views/2021memeberActionManager/index.vue

@@ -103,7 +103,7 @@
             align="center"
             prop="buyNum"
             sortable="custom"
-            width="150px"
+
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
@@ -130,7 +130,7 @@
             align="center"
             prop="avgBuyAmount"
             sortable="custom"
-            width="150px"
+
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
@@ -213,7 +213,7 @@
             align="center"
             prop="targetNum"
             sortable="custom"
-            width="140px"
+
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
@@ -240,7 +240,7 @@
             align="center"
             prop="targetFinishScale"
             sortable="custom"
-            width="140px"
+
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">

src/views/main/cloudDate/organDate.vue

@@ -3,20 +3,20 @@
     <el-card>
       <headers title="分部数据" @changeOrgan="changeOrgan" :special="true" />
       <div class="btnList">
-             <el-button
-        type="primary"
-        v-permission="'export/organStudentOverView'"
-        @click="organDateExport"
-        size="mini"
-        >导出</el-button
-      >
-      <el-button
-        type="text"
-        v-permission="'/organRankDetail'"
-        @click="gotoAll"
-        class="lookOrgan"
-        >全部分部 ></el-button
-      >
+        <el-button
+          type="primary"
+          v-permission="'export/organStudentOverView'"
+          @click="organDateExport"
+          size="mini"
+          >导出</el-button
+        >
+        <el-button
+          type="text"
+          v-permission="'/organRankDetail'"
+          @click="gotoAll"
+          class="lookOrgan"
+          >全部分部 ></el-button
+        >
       </div>
 
       <div class="tableWrap">
@@ -66,6 +66,27 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column align="center" prop="targetNum" label="目标人数">
+            <template slot="header" slot-scope="slot">
+              <div class="titleCell">
+                <span>目标人数</span>
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    进行中非会员乐团-已上乐团课小于等于4节学员-非本活动购买会员-弦乐声部学员
+                  </div>
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="
+                      font-size: 18px;
+                      color: #f56c6c;
+                      top: 2px;
+                      position: relative;
+                    "
+                  ></i>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="cloudStudyLivelyStudentNum"
@@ -121,9 +142,7 @@
               <div class="titleCell">
                 <span>新用户人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">
-                    乐团在读学员已上课程≤4节
-                  </div>
+                  <div slot="content">乐团在读学员已上课程≤4节</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -386,11 +405,11 @@ export default {
       );
     },
 
-    gotoAll(){
+    gotoAll() {
       this.$router.push({
         name: "organRankDetail",
       });
-    }
+    },
   },
 };
 </script>

src/views/main/cloudDate/organDateDetail.vue

@@ -82,6 +82,7 @@
               </div>
             </template>
           </el-table-column>
+
           <el-table-column
             align="center"
             prop="cloudStudyUseStudentNum"

src/views/main/cloudDate/organRankDetail.vue

@@ -78,6 +78,27 @@
               </div>
             </template>
           </el-table-column>
+                              <el-table-column align="center" prop="targetNum" label="目标人数">
+            <template slot="header" slot-scope="slot">
+              <div class="titleCell">
+                <span>目标人数</span>
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    进行中非会员乐团-已上乐团课小于等于4节学员-非本活动购买会员-弦乐声部学员
+                  </div>
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="
+                      font-size: 18px;
+                      color: #f56c6c;
+                      top: 2px;
+                      position: relative;
+                    "
+                  ></i>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="cloudStudyLivelyStudentNum"