11/5

src/views/auditList/index.vue

@@ -148,7 +148,7 @@
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.auditStatus | auditType }}
+                {{ scope.row.auditStatus | auditType }} 
               </div>
             </template>
           </el-table-column>
@@ -262,7 +262,8 @@ export default {
       // this.detail = res.data
       this.detail = {
         id:row.musicGroupPaymentCalenderId,
-        musicGroupId:row.musicGroupId
+        musicGroupId:row.musicGroupId,
+        status:row.auditStatus
       }
       this.typeStatus = true;
     },

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -84,7 +84,7 @@
         </div>
       </el-form-item>
       <el-form-item label="收费内容">
-        <div class="inputStyle">{{ titleForm.calenderSettingsName }}</div>
+        <div class="inputStyle" style="width:500px">{{ infoMsg }}</div>
       </el-form-item>
     </el-form>
     <div class="m-core">
@@ -395,6 +395,8 @@ import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import cleanDeep from "clean-deep";
 import qs from "qs";
+import {courseType} from '@/utils/searchArray'
+import { paymentPatternType } from '@/constant'
 import {
   findSound,
   getmusicGroupPaymentCalenderDetail,
@@ -461,6 +463,7 @@ export default {
         paymentValidEndDate: "",
         calenderSettingsName: "",
       },
+      msgList:[]
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -505,15 +508,16 @@ export default {
           }
           this.titleForm = {
             paymentType: res.data.calender.paymentType,
-            musicGroupOrganizationCourseSettingId:res.data.calender.musicGroupOrganizationCourseSettingId,
-            paymentPattern: res.data.calender.paymentPattern,
+            musicGroupOrganizationCourseSettingId:res.data.calenderSettingsName,
+            paymentPattern: paymentPatternType[res.data.calender.paymentPattern],
             paymentValidStartDate:res.data.calender.paymentValidStartDate,
             paymentValidEndDate: res.data.calender.paymentValidEndDate,
             calenderSettingsName: res.data.calenderSettingsName, 
           };
+          this.msgList = res.data.musicGroupPaymentCalenderCourseSettings
           this.searchForm.id = this.id;
           this.searchForm.page = this.rules.page;
-          this.searchForm.rows = this.rules.limit;
+          this.searchForm.rows = this.rules.limit; 
           getmusicGroupPaymentCalenderDetail(this.searchForm).then(
             (payment) => {
               if (payment.code == 200) {
@@ -735,6 +739,20 @@ export default {
       }
     },
   },
+  computed:{
+    infoMsg(){
+      // courseType
+      let str = ''
+      this.msgList.forEach(item=>{
+      courseType.forEach(course=>{
+         if(item.courseType == course.value){
+           str += `${course.label}/${item.courseTotalMinuties}分钟、`
+         }
+       })
+      })
+      return str
+    }
+  }
 };
 </script>
 <style lang='scss' scoped>

src/views/resetTeaming/modals/review.vue

@@ -1,16 +1,16 @@
 <template>
   <div>
     <reviewDetail v-if="detail && detail.id" :detail="detail" />
-    <el-alert title="审核意见" :closable="false" class="alert" type="info">
+    <el-alert title="审核意见" :closable="false" class="alert" type="info" v-if="detail.status=='AUDITING'">
     </el-alert>
-    <el-input
+    <el-input  v-if="detail.status=='AUDITING'"
       type="textarea"
       :autosize="{ minRows: 2, maxRows: 4 }"
       placeholder="请输入审核意见"
       v-model="remark"
     >
     </el-input>
-    <div slot="footer" class="dialog-footer">
+    <div slot="footer" class="dialog-footer" v-if="detail.status=='AUDITING'">
       <!-- <el-button @click="$listeners.close">取 消</el-button> -->
       <el-button type="primary" @click="submit(1)" v-if="permission('musicGroupPaymentCalender/auditPass')">审核通过</el-button>
       <el-button type="danger" @click="submit(0)"   v-if="permission('musicGroupPaymentCalender/auditRefuse')">驳回</el-button>

src/views/teamBuild/components/teamPayInfo.vue

@@ -21,6 +21,7 @@
       <div class="PrevBtn" @click="goback">上一步</div>
       <!--  v-if="teamStatus != 'teamAudit'" -->
       <div class="submitBtn">预览</div>
+      <div class="submitBtn" @click="goHome">确定</div>
     </div>
   </div>
 </template>
@@ -51,6 +52,15 @@ export default {
        permission (str) {
       return permission(str)
     },
+    goHome(){
+      let query = this.$route.query
+      this.$router.push({
+              path: '/business/teamDetail',
+              query: {
+               ...query
+              }
+            })
+    }
   },
 };
 </script>

src/views/teamBuild/signupList.vue

@@ -950,13 +950,12 @@ export default {
           musicGroupId: this.$route.query.id
         }).then(res => {
           if (res.code == 200) {
+            let query = this.$route.query
             this.$message.success('开启成功')
             this.$router.push({
-              path: '/business/teamSeting',
+              path: '/business/teamDetail',
               query: {
-                status: 'PREPARE',
-                id: this.$route.query.id,
-                name: this.$route.query.name
+               ...query
               }
             })
           }