Merge branch 'iteration_0926' into test

src/views/teamBuild/components/teamBaseInfo.vue

@@ -337,15 +337,33 @@
             :active-value="1"
             :inactive-value="0" >
           </el-switch>
-          <!-- <el-select
-            v-model="topFrom.homeworkPushFlag"
-            filterable
+        </el-form-item>
+
+        <el-form-item
+          label="是否显示免费课程"
+          prop="memberCourseShowFlag"
+          label-width="200px"
+          :rules="[{ required: true, message: '是否显示免费课程不能为空' }]">
+          <template #label>
+            <p style="position: relative; display: inline-block">
+              是否显示免费课程
+              <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>
+          <el-switch
+            v-model="topFrom.memberCourseShowFlag"
             :disabled="basdisabled"
-            clearable
-          >
-            <el-option label="开启" :value="1"></el-option>
-            <el-option label="关闭" :value="0"></el-option>
-          </el-select> -->
+            :active-value="1"
+            :inactive-value="0" >
+          </el-switch>
         </el-form-item>
         <!-- <el-form-item label prop="isClass">
           <el-checkbox v-model.trim="topFrom.isClass" :disabled="basdisabled"
@@ -434,6 +452,7 @@ export default {
         salary: "", // 收费模式
         head: "",
         homeworkPushFlag: 1, // 是否同步群消息
+        memberCourseShowFlag: 0,
         isClass: false, //是否为课堂课
         startTime: "",
         feeType: null,
@@ -876,6 +895,7 @@ export default {
               feeType: this.topFrom.feeType,
               transactionTeacherId: this.topFrom.transactionTeacherId,
               homeworkPushFlag: this.topFrom.homeworkPushFlag,
+              memberCourseShowFlag: this.topForm.memberCourseShowFlag,
             };
             // obj.musicGroupPaymentEntities = [];
             // createTeam
@@ -993,6 +1013,7 @@ export default {
         ownershipType: "OWN", // 合作机构类型
         feeType: null,
         homeworkPushFlag: 1,
+        memberCourseShowFlag: 0
       };
       this.$refs["topinfo"].resetFields();
     },
@@ -1231,6 +1252,7 @@ export default {
       this.topFrom.transactionTeacherId =
         res.data.musicGroup.transactionTeacherId||'';
       this.topFrom.homeworkPushFlag = res.data.musicGroup.homeworkPushFlag
+      this.topFrom.memberCourseShowFlag = res.data.musicGroup.memberCourseShowFlag
       localStorage.setItem(`${this.teamid}base`, JSON.stringify(this.topFrom));
     },
     changeType(val) {

src/views/teamBuild/forecastName.vue

@@ -143,6 +143,40 @@
           </el-table-column>
           <el-table-column
             align="center"
+            prop="teacherRecommandSubjectId"
+            label="老师推荐声部"
+          >
+            <template slot-scope="scope">
+              {{
+                scope.row.teacherRecommandSubjectId ? scope.row.teacherRecommandSubjectName : null
+              }}
+              {{
+                !scope.row.teacherRecommandSubjectName && scope.row.teacherRecommandSubjectId == 999
+                  ? "听从老师安排"
+                  : null
+              }}
+              {{ !scope.row.teacherRecommandSubjectId && !scope.row.teacherRecommandSubjectName ? '无' : null }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="selectionSubjectId"
+            label="选报声部"
+          >
+            <template slot-scope="scope">
+              {{
+                scope.row.selectionSubjectId ? scope.row.selectionSubjectName : null
+              }}
+              {{
+                !scope.row.selectionSubjectName && scope.row.selectionSubjectId == 999
+                  ? "听从老师安排"
+                  : null
+              }}
+              {{ !scope.row.selectionSubjectId && !scope.row.selectionSubjectName ? '无' : null }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
             prop="subjectFirstName"
             label="选报声部1"
           >
@@ -155,6 +189,7 @@
                   ? "听从老师安排"
                   : null
               }}
+              {{ !scope.row.subjectFirstName && !scope.row.subjectFirst ? '无' : null }}
             </template>
           </el-table-column>
           <el-table-column
@@ -171,6 +206,7 @@
                   ? "听从老师安排"
                   : null
               }}
+              {{ !scope.row.subjectSecondName && !scope.row.subjectSecond ? '无' : null }}
             </template>
           </el-table-column>
           <el-table-column

src/views/teamBuild/modals/intention.vue

@@ -9,6 +9,16 @@
       >
         <el-table-column prop="subjectName" align="center" label="声部">
         </el-table-column>
+        <el-table-column prop="teacherRecommandSubjectNum" align="center" label="老师推荐声部">
+          <template slot-scope="scope">
+            {{ scope.row.teacherRecommandSubjectNum }}人
+          </template>
+        </el-table-column>
+        <el-table-column prop="selectionSubjectNum" align="center" label="选报声部">
+            <template slot-scope="scope">
+                {{ scope.row.selectionSubjectNum }}人
+            </template>
+        </el-table-column>
         <el-table-column prop="firstSubjectNum" align="center" label="首选人数">
           <template slot-scope="scope">
             {{ scope.row.firstSubjectNum }}人

vue.config.js

@@ -54,8 +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