Merge branch '03/03GRADE' into test

src/views/teamBuild/signupList.vue

@@ -220,6 +220,75 @@
                     </div>
                   </template>
                 </el-table-column>
+                <el-table-column label="购买云教练人数" prop="buyCloudTeacherNum" align="center">
+                  <template slot="header">
+                    <p>
+                      购买云教练人数
+                      <el-tooltip placement="top" popper-class="mTooltip">
+                        <div slot="content">
+                          已缴费学员中购买了云教练系统的学员总数
+                        </div>
+                        <i
+                          class="el-icon-question"
+                          style="font-size: 18px; color: #f56c6c"
+                        ></i>
+                      </el-tooltip>
+                    </p>
+                  </template>
+                  <template slot-scope="scope">
+                    <div>
+                      <el-button type="text" @click="getCheckNum(scope.row, 'buyCloud')">{{
+                        scope.row.buyCloudTeacherNum
+                      }}</el-button>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="入团未购云教练" prop="noCloudTeacherStudentNumOfNormal" align="center">
+                  <template slot="header">
+                    <p>
+                      入团未购云教练
+                      <el-tooltip placement="top" popper-class="mTooltip">
+                        <div slot="content">
+                          【在读】学员中，未购买【云教练系统】学员数量
+                        </div>
+                        <i
+                          class="el-icon-question"
+                          style="font-size: 18px; color: #f56c6c"
+                        ></i>
+                      </el-tooltip>
+                    </p>
+                  </template>
+                  <template slot-scope="scope">
+                    <div>
+                      <el-button type="text" @click="getCheckNum(scope.row, 'noCloud')">{{
+                        scope.row.noCloudTeacherStudentNumOfNormal
+                      }}</el-button>
+                    </div>
+                  </template>
+                </el-table-column>
+                <!-- <el-table-column label="购买乐器未入团人数" prop="cloudTeacherStudentNumOfApply" align="center">
+                  <template slot="header">
+                    <p>
+                      购买乐器未入团人数
+                      <el-tooltip placement="top" popper-class="mTooltip">
+                        <div slot="content">
+                          只购买乐器未解除限制学员数量（不包括退团学员）
+                        </div>
+                        <i
+                          class="el-icon-question"
+                          style="font-size: 18px; color: #f56c6c"
+                        ></i>
+                      </el-tooltip>
+                    </p>
+                  </template>
+                  <template slot-scope="scope">
+                    <div>
+                      <el-button type="text" @click="getCheckNum(scope.row, 'cloudTeacher')">{{
+                        scope.row.cloudTeacherStudentNumOfApply
+                      }}</el-button>
+                    </div>
+                  </template>
+                </el-table-column> -->
               </el-table>
               <div
                 class="btnWrap"
@@ -391,6 +460,19 @@
             <el-option label="审核中" :value="2"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="studentStatus">
+          <el-select
+            v-model.trim="searchFrom.studentStatus"
+            clearable
+            filterable
+            placeholder="学员状态"
+          >
+            <el-option label="在读" value="NORMAL"></el-option>
+            <el-option label="请假" value="LEAVE"></el-option>
+            <el-option label="退团" value="QUIT"></el-option>
+            <el-option label="报名" value="APPLY"></el-option>
+          </el-select>
+      </el-form-item>
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
         <el-form-item>
           <el-button type="danger" native-type="search">搜索</el-button>
@@ -482,6 +564,13 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="学员状态" prop="studentStatus" align="center">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.studentStatus | musicGroupStudentType }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="订单状态" prop="payingStatus" align="center">
           <template slot-scope="scope">
             <div>
@@ -938,6 +1027,7 @@ export default {
         hasCloudTeacher: null, // 是否购买云教练
         payingStatus: null,
         noneNeedCloudTeacher: null,
+        studentStatus: null
       },
       quitForm: {
         // 退团信息确认
@@ -1144,6 +1234,7 @@ export default {
         visited: null,
         hasCloudTeacher: null,
         payingStatus: null,
+        studentStatus: null,
         noneNeedCloudTeacher: null,
       };
       this.getList();
@@ -1172,6 +1263,7 @@ export default {
         visited: this.searchFrom.visited || null,
         hasCloudTeacher: this.searchFrom.hasCloudTeacher,
         payingStatus: this.searchFrom.payingStatus,
+        studentStatus: this.searchFrom.studentStatus,
         noneNeedCloudTeacher: this.searchFrom.noneNeedCloudTeacher,
         page: this.rules.page,
         rows: this.rules.limit,
@@ -1784,7 +1876,7 @@ export default {
         }
       });
     },
-    getCheckNum(row) {
+    getCheckNum(row, type) {
       this.rules.page = 1;
       this.rules.limit = 10;
       this.searchFrom = {
@@ -1796,12 +1888,19 @@ export default {
         visited: null,
         hasCloudTeacher: null,
         payingStatus: null,
+        studentStatus: null,
         noneNeedCloudTeacher: null,
       };
       this.searchFrom.subject = row.subjectId;
-
-      this.searchFrom.payingStatus = 2;
-      this.searchFrom.hasCloudTeacher = 0;
+      if(type == 'buyCloud') {
+        this.searchFrom.hasCloudTeacher = 1
+      } else if(type == 'noCloud') {
+        this.searchFrom.hasCloudTeacher = 0
+        this.searchFrom.studentStatus = 'NORMAL'
+      } else {
+        this.searchFrom.payingStatus = 2;
+        this.searchFrom.hasCloudTeacher = 0;
+      }
       this.search();
     },
     getpayingNum(row) {
@@ -1816,6 +1915,7 @@ export default {
         visited: null,
         hasCloudTeacher: null,
         payingStatus: null,
+        studentStatus: null,
         noneNeedCloudTeacher: null,
       };
       this.searchFrom.subject = row.subjectId;
@@ -1834,6 +1934,7 @@ export default {
         visited: null,
         hasCloudTeacher: null,
         payingStatus: null,
+        studentStatus: null,
         noneNeedCloudTeacher: null,
       };
       this.searchFrom.subject = row.subjectId;

vue.config.js

@@ -18,8 +18,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
-// let target = 'http://192.168.3.112:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'http://192.168.3.112:8000' //勇哥
+// let target = 'http://dev.dayaedu.com' // 开发环境
 // let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
@@ -54,7 +54,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    https: false,
+    https: true,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy