打包

src/views/musicInspection/modals/lookDetail.vue

@@ -115,7 +115,7 @@
           prop="11"
           width="160px"
           align="center"
-          label="是否发现学员需要更换新乐器"
+          label="未发现私换乐器"
         >
           <template slot-scope="scope">
             <i :class="scope.row[11] == 1 ? 'el-icon-check' : 'el-icon-close'"></i>

src/views/resetTeaming/modals/extra-class-user.vue

@@ -6,6 +6,7 @@
     <el-table
       :data="form"
       style="width: 100%;text-alogn: center;"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
       <el-table-column
         label="学员姓名"

src/views/resetTeaming/modals/extra-class.vue

@@ -6,6 +6,7 @@
     <el-table
       :data="form"
       style="width: 100%;text-alogn: center;"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
       <el-table-column
         label="课程类型"

src/views/resetTeaming/modals/subject-preview.vue

@@ -19,9 +19,6 @@
 						</span>
 						<el-icon v-if="item.courseType == 'PROJECT'" class="el-icon-question" @click.native="onQuestions" />
 					</el-col>
-					<!-- <el-col :span="6"> -->
-						<!-- <del style="color: #AAA; font-size: 12px;">￥{{ item.courseOriginalPrice | moneyFormat }}</del> -->
-					<!-- </el-col> -->
 					<el-col :span="8">
 						<span style="color: #1A1A1A">￥{{ item.courseCurrentPrice | moneyFormat }}</span>
 					</el-col>
@@ -35,7 +32,7 @@
 			</el-row>
 			<!-- 可选课程信息集合 -->
 			<template v-for="(item, index) in courseInfo">
-				<el-row class="option-row" :key="index" @click.native="onCourseChange(item)" v-if="courseViewType == 0 && !item.isStudentOptional">
+				<el-row class="option-row" :key="index" @click.native="onCourseChange(item)" v-if="courseViewType == 0">
 					<el-col :span="12">
 						<i class="check_default" :class="[item.isStatus ? 'check_active' : '', !item.isStudentOptional ? 'disabled' : '']"></i><template v-if="item.courseType == 'PROJECT'">{{ item.name }}</template><template v-else>{{ item.courseType | coursesType }}</template>
 					</el-col>
@@ -47,7 +44,29 @@
 					</el-col>
 				</el-row>
 			</template>
+		</div>
 
+        <div class="section" v-if="courseInfo && courseInfo.length > 0 && isClickStatus && courseViewType == 1">
+			<h2 class="title">{{ '乐团课程' }}</h2>
+			<el-row class="title-row">
+				<el-col :span="12">课程类型</el-col>
+				<el-col :span="5" :offset="1" style="text-align: right;">原价</el-col>
+				<el-col :span="6" style="text-align: right;">现价</el-col>
+			</el-row>
+			<!-- 可选课程信息集合 -->
+			<template v-for="(item, index) in courseInfo">
+				<el-row class="option-row" :key="index"  @click.native="onCourseChange(item)" v-if="item.isStudentOptional">
+					<el-col :span="12">
+						<i class="check_default" :class="[item.isStatus ? 'check_active' : '', !item.isStudentOptional ? 'disabled' : '']"></i><template v-if="item.courseType == 'PROJECT'">{{ item.name }}</template><template v-else>{{ item.courseType | coursesType }}</template>
+					</el-col>
+					<el-col :span="6">
+						<del style="color: #AAA; font-size: .12rem;">￥{{ item.courseOriginalPrice | moneyFormat }}</del>
+					</el-col>
+					<el-col :span="6">
+						<span style="color: #1A1A1A">￥{{ item.courseCurrentPrice | moneyFormat }}</span>
+					</el-col>
+				</el-row>
+			</template>
 		</div>
 
 		<div class="section" v-if="instrumentResult.length > 0">
@@ -89,18 +108,6 @@
 					</el-col>
 				</el-row>
 			</div>
-
-			<!-- <el-row class="option-row lines">
-				<el-col :span="12" class="fontBold">
-					仅需支付
-				</el-col>
-				<el-col :span="6">
-					<del style="color: #f85043; font-size: 12px;">￥{{ orderInfo.goodsMarketPrice | moneyFormat }}</del>
-				</el-col>
-				<el-col :span="6">
-					<span class="fontBold" style="color: #f85043;">￥{{ orderInfo.goodsPrice | moneyFormat }}</span>
-				</el-col>
-			</el-row> -->
 		</div>
 
 		<div class="section" v-if="accessOries.length > 0" key="accessOries">
@@ -229,6 +236,7 @@ export default {
             chargeTypeList: [],
             chargeTypeName: null,
             courseViewType: 0, // 收费模式，0 课程显示，1 AMR系统
+            isClickStatus: false
         };
     },
     mounted() {
@@ -293,14 +301,19 @@ export default {
                             courseType: 'MUSIC'
                         }]
                     }
+                    this.isClickStatus = false
                     this.courseInfo.forEach(item => {
                         if(item.isStudentOptional) {
                             item.isStatus = false
+
+                            this.isClickStatus = true
                         } else {
                             item.isStatus = true
                         }
                     })
 
+                    console.log(this.isClickStatus)
+
                     this.musicGroupSubject = tempResult.musicGroupSubjectPlan
                     let instrumentInfo = {}
                     let tempInstrument = []
@@ -481,40 +494,29 @@ export default {
             let csi = this.courseInfo
             // 加上判断是否有课程信息
             if (mgs) {
-                // let tempCourse = this.courseShowInfo
-                // if(tempCourse.length > 0) {
-                //     let tempPrice = 0
+                let tempCourse = this.courseShowInfo
+                // if (tempCourse.length > 0 && this.courseViewType == 1) {
                 //     tempCourse.forEach(item => {
-                //         // tempPrice += parseFloat(item.courseCurrentPrice)
-                //         marketPrice += parseFloat(item.courseOriginalPrice)
-                //         musicMarketClassFee += parseFloat(item.courseOriginalPrice)
-                //     });
-                // }
-                // csi.forEach(item => {
-                //     if (item.isStatus) {
-                //         musicClassFee += parseFloat(item.courseCurrentPrice)
-                //         // musicMarketClassFee += parseFloat(item.courseOriginalPrice)
-                //         // marketPrice += parseFloat(item.courseOriginalPrice)
                 //         if (item.id > 0) {
                 //             courseKeys.push(item.id)
                 //         }
+                //         musicClassFee += parseFloat(item.courseCurrentPrice)
+                //         marketPrice += parseFloat(item.courseOriginalPrice)
                 //         // 不可选的课程才会减免课程费用
-                //         if(!item.isStudentOptional) {
+                //         if (!item.isStudentOptional) {
                 //             tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
-                //         } else {
-                //             marketPrice += parseFloat(item.courseOriginalPrice)
-                //             musicMarketClassFee += parseFloat(item.courseOriginalPrice)
                 //         }
-                //     }
-                // })
-                let tempCourse = this.courseShowInfo
+                //     });
+                //     buyList.unshift({
+                //         name: this.chargeTypeName,
+                //         type: paymentPatternType[this.paymentPattern],
+                //         price: Number((musicClassFee).toFixed(2))
+                //     })
+                // } else {
                 if (tempCourse.length > 0 && this.courseViewType == 1) {
+                    let m = 0
                     tempCourse.forEach(item => {
-                        if (item.id > 0) {
-                            courseKeys.push(item.id)
-                        }
-                        musicClassFee += parseFloat(item.courseCurrentPrice)
-                        marketPrice += parseFloat(item.courseOriginalPrice)
+                        m += parseFloat(item.courseCurrentPrice)
                         // 不可选的课程才会减免课程费用
                         if (!item.isStudentOptional) {
                             tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
@@ -523,9 +525,10 @@ export default {
                     buyList.unshift({
                         name: this.chargeTypeName,
                         type: paymentPatternType[this.paymentPattern],
-                        price: Number((musicClassFee).toFixed(2))
+                        price: Number((m).toFixed(2))
                     })
-                } else {
+                }
+
                     csi.forEach(item => {
                         if (item.isStatus) {
                             musicClassFee += parseFloat(item.courseCurrentPrice)
@@ -539,7 +542,7 @@ export default {
                             }
                         }
                     })
-                }
+                // }
             }
 
             // 乐器