Merge branch 'Nov16thResetMusic' into online

src/views/resetTeaming/components/resetPayList.vue

@@ -84,10 +84,10 @@
             </div>
           </template>
         </el-table-column> -->
-        <el-table-column align="center"
+        <!-- <el-table-column align="center"
                          prop="operatorName"
                          label="责任人">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align="center"
                          prop="memo"
                          width="200px"
@@ -98,7 +98,7 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         min-width="60px">
+                         min-width="120px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
@@ -110,16 +110,16 @@
               <!-- <el-button type="text"
                          @click="openChioseStudent(scope.row)"
                          v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
-                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
+                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button> -->
               <el-button type="text"
-                         v-if="scope.row.status == 'REJECT'&&teamStatus"
+                         v-if="teamStatus"
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
 
-              <el-button type="text"
+              <!-- <el-button type="text"
                          v-if="!isNewGropu&&teamStatus&&scope.row.paymentType!='MUSIC_APPLY'"
-                         @click="onCreateQRCode(scope.row)">续费二维码</el-button>
-              <el-button type="text"
+                         @click="onCreateQRCode(scope.row)">续费二维码</el-button> -->
+              <!-- <el-button type="text"
                          v-if="isNewGropu"
                          v-permission="'musicGroup/findMusicGroupSubjectInfo/966'"
                          @click="onPreview(scope.row)">预览</el-button> -->

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -84,10 +84,10 @@
             </div>
           </template>
         </el-table-column> -->
-        <el-table-column align="center"
+        <!-- <el-table-column align="center"
                          prop="operatorName"
                          label="责任人">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align="center"
                          prop="memo"
                          width="200px"
@@ -110,16 +110,16 @@
               <!-- <el-button type="text"
                          @click="openChioseStudent(scope.row)"
                          v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
-                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
+                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button> -->
               <el-button type="text"
                          v-if="scope.row.status == 'REJECT'&&teamStatus"
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
 
-              <el-button type="text"
+              <!-- <el-button type="text"
                          v-if="!isNewGropu&&teamStatus&&scope.row.paymentType!='MUSIC_APPLY'"
-                         @click="onCreateQRCode(scope.row)">续费二维码</el-button>
-              <el-button type="text"
+                         @click="onCreateQRCode(scope.row)">续费二维码</el-button> -->
+              <!-- <el-button type="text"
                          v-if="isNewGropu"
                          v-permission="'musicGroup/findMusicGroupSubjectInfo/966'"
                          @click="onPreview(scope.row)">预览</el-button> -->

src/views/resetTeaming/modals/pay-items.vue

@@ -14,6 +14,13 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column align="center" prop="status" label="缴费状态">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.status | payTypeStatus }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         align="center"
         prop="expectNum"
@@ -44,15 +51,8 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="status" label="缴费状态">
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.status | payTypeStatus }}
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column align="center" prop="memo" label="备注"></el-table-column>
-      <el-table-column label="操作" fixed="right" min-width="260px">
+      <el-table-column label="操作" fixed="right" min-width="200px">
         <template slot-scope="scope">
           <div>
             <el-button
@@ -74,13 +74,13 @@
               v-permission="'musicGroupPaymentCalenderDetail/batchAdd'"
               >添加学员</el-button
             >
-            <el-button
+            <!-- <el-button
               type="text"
               v-if="scope.row.status == 'REJECT' && teamStatus"
               v-permission="'musicGroupPaymentCalender/update'"
               @click="$listeners.resetPay(scope.row)"
               >修改</el-button
-            >
+            > -->
             <el-button
               type="text"
               v-permission="'musicGroupPaymentCalender/makesureSchoolePaid'"

src/views/resetTeaming/modals/user-pay-form.vue

@@ -48,7 +48,7 @@
                 class="alert"
                 type="info">
       </el-alert>
-      <template v-if="isUserType && paymentType == '0'">
+      <template v-if="isMulticycle">
         <el-form ref="payment" :model="payment">
           <el-form-item
             label-width="160px"
@@ -137,6 +137,7 @@ import {
   musicGroupPaymentCalenderAdd,
   musicGroupPaymentCalenderDetailBatchUpdate,
   queryByMusicGroupOrganizationCourseSettingsId,
+  musicGroupPaymentCalenderView,
 } from "../api";
 import { paymentPatternType } from '@/constant'
 import { getTimes, objectToOptions } from "@/utils";
@@ -184,6 +185,7 @@ export default {
       payment: {
         paymentPattern: null,
       },
+      viewDetail: null,
       organizationCourseUnitPriceSettingsByType: {},
       paymentPatternTypeOptions: objectToOptions(paymentPatternType),
     };
@@ -210,6 +212,23 @@ export default {
     },
     paymentAmountDisabled() {
       return (this.isUserType || (this.isCommon && this.isUserType)) && this.isDisabled
+    },
+    isMulticycle() {
+      let editMulticycle = false
+      if (this.viewDetail) {
+        const { musicGroupPaymentCalenders, auditDto } = this.viewDetail
+        editMulticycle = (musicGroupPaymentCalenders > 1 ||
+          musicGroupPaymentCalenders[0]?.paymentType == 'MUSIC_APPLY')
+        if (editMulticycle) {
+          this.$set(this.payment, 'paymentPattern', String(auditDto?.paymentPattern))
+          this.cycles = musicGroupPaymentCalenders.map(item => ({
+            paymentAmount: item.paymentAmount,
+            paymentDate: [item?.startPaymentDate, item?.deadlinePaymentDate],
+            paymentValid: [item?.paymentValidStartDate, item?.paymentValidEndDate]
+          }))
+        }
+      }
+      return this.isUserType && this.paymentType == '0' || editMulticycle
     }
   },
   watch: {
@@ -282,9 +301,11 @@ export default {
           this.form.musicGroupOrganizationCourseSettingId = this.rowDetail.musicGroupOrganizationCourseSettingId;
         } else {
           try {
-            const res = await getMusicGroupPaymentCalenderDetail({
-              id: this.rowDetail.id
+            const res = await musicGroupPaymentCalenderView({
+              musicGroupId: this.musicGroupId,
+              batchNo: this.rowDetail.batchNo,
             })
+            this.viewDetail = res.data
             this.eclass = res.data.musicGroupPaymentCalenderCourseSettings
             this.syncAllMoney()
           } catch (error) {}

src/views/teamDetail/componentCourse/courseEvaluate.vue

@@ -2,24 +2,31 @@
 <template>
   <div class>
     <div class="tableWrap">
-      <el-table :data="tableList"
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center"
-                         width="100"
-                         prop="username"
-                         label="学生姓名"></el-table-column>
-        <el-table-column align="center"
-                         width="100"
-                         prop="score"
-                         label="星级">
+      <el-table
+        :data="tableList"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      >
+        <el-table-column
+          align="center"
+          width="150"
+          prop="username"
+          label="学生姓名"
+        >
           <template slot-scope="scope">
             <div>
-              {{ scope.row.score?scope.row.score+'星':'' }}
+              {{ scope.row.username }}
+              <span style="color: #f56c6c">({{ scope.row.userId }})</span>
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="reason"
-                         label="评价内容"></el-table-column>
+        <el-table-column align="center" width="100" prop="score" label="星级">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.score ? scope.row.score + "星" : "" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="reason" label="评价内容"></el-table-column>
       </el-table>
       <!-- <pagination
         :total="rules.total"
@@ -33,10 +40,10 @@
 
 <script>
 // import pagination from '@/components/Pagination/index'
-import { getStuAndTeaReview } from '@/api/buildTeam'
+import { getStuAndTeaReview } from "@/api/buildTeam";
 export default {
-  props: ['courseScheduleId'],
-  data () {
+  props: ["courseScheduleId"],
+  data() {
     return {
       tableList: [],
       rules: {
@@ -44,28 +51,28 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
-      }
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created () { },
+  created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted () {
-    this.getList()
+  mounted() {
+    this.getList();
   },
-  activated () {
-    this.getList()
+  activated() {
+    this.getList();
   },
   methods: {
-    getList () {
-      getStuAndTeaReview({ courseId: this.courseScheduleId }).then(res => {
+    getList() {
+      getStuAndTeaReview({ courseId: this.courseScheduleId }).then((res) => {
         if (res.code == 200) {
-          this.tableList = res.data.courseScheduleComplaints
+          this.tableList = res.data.courseScheduleComplaints;
         }
-      })
-    }
-  }
+      });
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -30,7 +30,8 @@
                          label="学生姓名">
           <template slot-scope="scope">
             <div>
-              {{scope.row.username}}({{scope.row.userId}})
+              {{scope.row.username}}
+               <span style="color: #f56c6c">({{scope.row.userId}})</span>
             </div>
           </template>
         </el-table-column>

src/views/teamDetail/componentCourse/studentWork.vue

@@ -1,12 +1,11 @@
 <template>
   <div>
-  <el-alert
-    title="作业内容"
+  <!-- <el-alert
     type="info"
     :closable="false"
     :description="content">
-  </el-alert>
-    <!-- <div class="workTitle">作业内容:  <span>{{content}}</span> </div> -->
+  </el-alert> -->
+      <div class="workTitle">作业标题 : <span> {{content}}</span></div>
     <el-form :inline="true"
              class="workForm"
              style="padding: 0 25px">
@@ -37,7 +36,8 @@
                          label="学生姓名">
           <template slot-scope="scope">
             <div>
-              {{scope.row.studentName}}({{scope.row.studentId}})
+              {{scope.row.studentName}}
+              <span style="color: #f56c6c">({{scope.row.studentId}})</span>
             </div>
           </template>
         </el-table-column>
@@ -259,7 +259,8 @@ export default {
           if (res.data) {
             this.content = res.data.content;
           }
-          this.content ? this.content : (this.content = "还未布置作业");
+         
+          this.content ? this.content : (this.content = "这是布置的作业XXXXXXX");
         }
       });
       this.getList();
@@ -379,9 +380,14 @@ export default {
 }
  .workTitle {
     padding-left: 25px;
-    color: #333;
+    color:#14928A;
     font-weight: bold;
-
+    background-color: #f4f4f5;
+    line-height: 40px;
+    span {
+      color: #303133;
+      font-weight: normal;
+    }
   }
   .workContainer {
     margin-bottom:20px ;

src/views/teamDetail/componentCourse/teacherList.vue

@@ -8,7 +8,8 @@
                        label="老师姓名">
         <template slot-scope="scope">
           <div>
-            {{scope.row.teacherName}}({{scope.row.teacherId}})
+            {{scope.row.teacherName}}
+             <span style="color: #f56c6c">({{scope.row.teacherId}})</span>
           </div>
         </template>
       </el-table-column>