Merge branch '01/06_classMerge' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 01/06_classMerge

src/constant/index.js

@@ -82,6 +82,7 @@ export const userPaymentType = {
   ADD_COURSE: '临时加课',
   MUSIC_APPLY: '乐团报名',
   MUSIC_RENEW: '乐团续费',
+  SPAN_GROUP_CLASS_ADJUST: '跨团合班',
 }
 
 export const payStatus = {
@@ -111,7 +112,8 @@ export const auditPaymentType = {
   ADD_STUDENT: '新增学员',
   ADD_COURSE: '临时加课',
   MUSIC_APPLY: '乐团报名',
-  MUSIC_RENEW: '乐团续费'
+  MUSIC_RENEW: '乐团续费',
+  SPAN_GROUP_CLASS_ADJUST: '跨团合班',
 }
 
 export const orderServerType = {

src/views/resetTeaming/modals/review-detail.vue

@@ -37,6 +37,7 @@
     </descriptions>
     <el-table :data="musicGroupPaymentCalenderCourseSettings"
               stripe
+              v-if="musicGroupPaymentCalenderCourseSettings.length"
               style="width: 100%; margin-top: 10px">
       <el-table-column prop="courseType"
                        label="课程类型"
@@ -60,6 +61,38 @@
                        label="原价(元)">
       </el-table-column>
     </el-table>
+    <el-table :data="musicGroupPaymentCalenderStudentDetails"
+              stripe
+              v-if="musicGroupPaymentCalenderStudentDetails.length"
+              style="width: 100%; margin-top: 10px">
+      <el-table-column prop="username"
+                       label="学员姓名">
+      </el-table-column>
+      <el-table-column prop="phone"
+                       label="手机号">
+      </el-table-column>
+      <el-table-column prop="courseType"
+                       label="课程类型"
+                       width="120">
+        <template slot-scope="scope">
+          {{ scope.row.courseType | courseTypeFormat }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="isStudentOptional"
+                       label="是否可选"
+                       width="100px">
+                       <template slot-scope="scope">{{scope.row.isStudentOptional ? '是' : '否'}}</template>
+      </el-table-column>
+      <el-table-column prop="courseTime"
+                       label="课程总时长(分钟)">
+      </el-table-column>
+      <el-table-column prop="courseCurrentPrice"
+                       label="现价(元)">
+      </el-table-column>
+      <el-table-column prop="courseOriginalPrice"
+                       label="原价(元)">
+      </el-table-column>
+    </el-table>
     <el-alert title="缴费周期"
               :closable="false"
               class="alert"
@@ -114,6 +147,7 @@ Vue.use(descriptions);
 const initData = {
   auditDto: {},
   musicGroupPaymentCalenderCourseSettings: [],
+  musicGroupPaymentCalenderStudentDetails: [],
   simpleUserDto: [],
   musicGroupPaymentCalenders: [],
   studentNum: 0,