Revert "修改"

This reverts commit 8efb12960c79276327416f96e2b8805b3e5a9d34.

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

@@ -40,38 +40,23 @@
       <descriptions-item label="订单类型：">{{
         calender.payUserType | payUserTypeFormat
       }}</descriptions-item>
-      <descriptions-item
-        label="学生人数："
-        v-if="
-          calenderFeeJson &&
-            calenderFeeJson.sutdentNumber &&
-            calender.calenderFeeType == 'STUDENT'
-        "
-        >{{ calenderFeeJson.sutdentNumber }}</descriptions-item
-      >
-      <descriptions-item
-        label="缴费总金额："
-        v-if="calenderFeeJson && calenderFeeJson.allTotal"
-        >{{
-          numeral(calenderFeeJson.allTotal).format("0,0")
-        }}</descriptions-item
-      >
-      <descriptions-item
-        label="优惠金额："
-        v-if="calenderFeeJson && calenderFeeJson.discountTotal"
-        >{{
-          numeral(calenderFeeJson.discountTotal).format("0,0")
-        }}</descriptions-item
-      >
+      <descriptions-item label="学生人数：" v-if="calenderFeeJson&&calenderFeeJson.sutdentNumber&&calender.calenderFeeType=='STUDENT'">{{
+        calenderFeeJson.sutdentNumber
+      }}</descriptions-item>
+      <descriptions-item label="缴费总金额：" v-if="calenderFeeJson&&calenderFeeJson.allTotal">{{
+        numeral(calenderFeeJson.allTotal).format("0,0")
+      }}</descriptions-item>
+      <descriptions-item label="优惠金额：" v-if="calenderFeeJson&&calenderFeeJson.discountTotal">{{
+        numeral(calenderFeeJson.discountTotal).format("0,0")
+      }}</descriptions-item>
       <descriptions-item label="实缴金额">{{
         numeral(calender.currentTotalAmount).format("0,0")
       }}</descriptions-item>
 
-      <descriptions-item
-        label="缴费单号："
-        v-if="calender.payUserType == 'SCHOOL'"
-        >{{ calender.id }}</descriptions-item
-      >
+
+      <descriptions-item label="缴费单号：" v-if="calender.payUserType == 'SCHOOL'">{{
+        calender.id
+      }}</descriptions-item>
       <descriptions-item
         :span="3"
         v-if="calender.payUserType !== 'SCHOOL'"
@@ -110,7 +95,7 @@
     <el-table
       :data="course"
       stripe
-      v-if="course && course.length"
+      v-if="course&&course.length"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
@@ -119,9 +104,9 @@
           {{ scope.row.courseType | courseTypeFormat }}
         </template>
       </el-table-column>
-      <el-table-column prop="studentOptional" label="是否必选" width="100px">
+      <el-table-column prop="isStudentOptional" label="是否必选" width="100px">
         <template slot-scope="scope">{{
-          scope.row.studentOptional ? "是" : "否"
+          scope.row.isStudentOptional ? "是" : "否"
         }}</template>
       </el-table-column>
       <el-table-column
@@ -221,7 +206,7 @@
           scope.row.optionalFlag ? "是" : "否"
         }}</template>
       </el-table-column>
-      <el-table-column prop="autoActivationFlag" label="自动激活" width="100px">
+          <el-table-column prop="autoActivationFlag" label="自动激活" width="100px">
         <template slot-scope="scope">{{
           scope.row.autoActivationFlag ? "是" : "否"
         }}</template>
@@ -297,7 +282,7 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="activity && activity.length > 0"
+      v-if="activity&&activity.length > 0"
     >
     </el-alert>
     <el-table
@@ -340,31 +325,26 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="
-        calenderFeeJson &&
-          calenderFeeJson.teacherFeeList &&
-          calender.calenderFeeType == 'TEACHER'
-      "
+      v-if="calenderFeeJson&&calenderFeeJson.teacherFeeList&&calender.calenderFeeType=='TEACHER'"
     >
     </el-alert>
     <el-table
       :data="calenderFeeJson.teacherFeeList"
       stripe
-      v-if="
-        calenderFeeJson &&
-          calenderFeeJson.teacherFeeList &&
-          calender.calenderFeeType == 'TEACHER'
-      "
+      v-if="calenderFeeJson&&calenderFeeJson.teacherFeeList&&calender.calenderFeeType=='TEACHER'"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
-      <el-table-column prop="courseType" label="课程类型">
+    <el-table-column prop="courseType" label="课程类型">
         <template slot-scope="scope">
           {{ scope.row.courseType | courseTypeFormat }}
         </template>
       </el-table-column>
-      <el-table-column prop="teacherNumber" label="老师人数"> </el-table-column>
-      <el-table-column prop="courseNumber" label="课程数"> </el-table-column>
+      <el-table-column prop="teacherNumber" label="老师人数" >
+
+      </el-table-column>
+      <el-table-column prop="courseNumber" label="课程数">
+      </el-table-column>
       <el-table-column prop="courseCurrentPrice" label="单课时售价(元)">
       </el-table-column>
     </el-table>
@@ -373,36 +353,32 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="calenderRefundPeriods && calenderRefundPeriods.length > 0"
+      v-if="calenderRefundPeriods&&calenderRefundPeriods.length > 0"
     >
     </el-alert>
 
     <el-table
       :data="calenderRefundPeriods"
       stripe
-      v-if="calenderRefundPeriods && calenderRefundPeriods.length > 0"
+      v-if="calenderRefundPeriods&&calenderRefundPeriods.length > 0"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
-      <el-table-column prop="refundAmount" label="回款金额"> </el-table-column>
-      <el-table-column prop="refundDate" label="回款状态">
+      <el-table-column prop="refundAmount" label="回款金额" >
+      </el-table-column>
+      <el-table-column prop="refundDate" label="回款状态" >
         <template slot-scope="scope">
-          <div
-            v-if="
-              calender.status == 'NO' ||
-                calender.status == 'OPEN' ||
-                calender.status == 'OVER' ||
-                calender.status == 'PAID'
-            "
-          >
-            {{ scope.row.refundFlag ? "已回款" : "回款中" }}
+
+          <div v-if="calender.status == 'NO'||calender.status == 'OPEN'||calender.status == 'OVER'||calender.status == 'PAID'">
+            {{scope.row.refundFlag?'已回款':'回款中'}}
           </div>
           <div v-else>
             --
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="refundDate" label="回款时间"> </el-table-column>
+      <el-table-column prop="refundDate" label="回款时间" >
+      </el-table-column>
     </el-table>
 
     <!-- 会员信息 -->
@@ -447,7 +423,7 @@ const initData = {
   studentNum: 0,
   phone: "",
   username: "",
-  calenderRefundPeriods: []
+  calenderRefundPeriods:[]
 };
 export default {
   components: { Item },
@@ -455,7 +431,7 @@ export default {
   data() {
     return {
       payVisible: false,
-      ...initData
+      ...initData,
     };
   },
   computed: {
@@ -473,12 +449,12 @@ export default {
       }
       return "";
     },
-    calenderFeeJson() {
+    calenderFeeJson(){
       const calenderFee = this.calender?.calenderFeeJson;
-      if (calenderFee) {
-        return JSON.parse(calenderFee);
+      if(calenderFee){
+        return JSON.parse(calenderFee)
       }
-      return null;
+      return null
     }
   },
   mounted() {
@@ -490,7 +466,7 @@ export default {
       try {
         const res = await musicGroupPaymentCalenderView({
           id: this.detail.id,
-          musicGroupId: this.detail.musicGroupId
+          musicGroupId: this.detail.musicGroupId,
         });
         for (const key in initData) {
           if (initData.hasOwnProperty(key)) {
@@ -498,8 +474,8 @@ export default {
           }
         }
       } catch (error) {}
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

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

@@ -426,8 +426,6 @@ export default {
           // item.isStatus = false;
           // } else {
           item.isStatus = true;
-          item.isStudentOptional = item.studentOptional;
-          item.optionalFlag = item.studentOptional;
           // }
         });
         this.courseInfo = tempInfo;