Merge branch '10/23-test' into yuetuan

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/categroyManager/insideSetting/branchActive.vue

@@ -155,6 +155,7 @@ export default {
     async __init () {
       let vipGroupCategoryList = await vipGroupCategory({ page: 1, rows: 9999 })
       if (vipGroupCategoryList.code == 200) {
+        this.vipGroupCategoryList = []
         vipGroupCategoryList.data.forEach(item => {
           this.vipGroupCategoryList.push({
             label: item.name,
@@ -165,6 +166,7 @@ export default {
 
       let teacherList = await getTeacher()
       if (teacherList.code == 200) {
+        this.teacherList = []
         teacherList.data.forEach(item => {
           this.teacherList.push({
             label: item.realName,

src/views/resetTeaming/components/resetPayList.vue

@@ -456,7 +456,6 @@ export default {
   },
   computed: {
     payOrderTypeList() {
-      console.log(objectToOptions(userPaymentType))
       return objectToOptions(userPaymentType);
     },
     payFormTitle() {

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -432,7 +432,6 @@ export default {
   },
   computed: {
     payOrderTypeList() {
-      console.log(objectToOptions(userPaymentType))
       return objectToOptions(userPaymentType);
     },
     payFormTitle() {

src/views/resetTeaming/modals/payment-cycle.vue

@@ -32,7 +32,7 @@
           :key="item.value"
           :label="item.label"
           :value="item.value">
-        </el-option>
+        </el-option> 
       </el-select>
     </el-form-item>
     <el-form-item

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>
@@ -54,6 +54,9 @@ export default {
         });
       }
     },
+    permission(str){
+      return permission(str)
+    }
   },
 };
 </script>

src/views/teamBuild/components/soundSetComponents/chioseMusic.vue

@@ -78,7 +78,7 @@ export default {
       goods: ''
     }
   },
-  created () { console.log(this.item) },
+  created () {  },
   mounted () {
 
   },
@@ -86,8 +86,7 @@ export default {
     chioseMusic (val, music) {
       this.item.goodsList.map((some, index) => {
         if (some.id == val) {
-          music.groupPrice = some.groupPurchasePrice
-          console.log(music)
+          music.groupPrice = some.groupPurchasePrice         
         }
       })
     },

src/views/teamBuild/components/teamPayInfo.vue

@@ -1,34 +1,65 @@
 <template>
   <div class="pay-container">
-    <resetPayList :isNewGropu="true" :baseInfo="baseInfo"/>
+    <el-tabs v-model.trim="activeIndex" type="card" @tab-click="handleClick">
+      <el-tab-pane
+        label="学员缴费"
+        v-if="permission('/resetTeaming/teamBaseInfo')"
+        name="1"
+      >
+          <resetPayList :isNewGropu="true" :baseInfo="baseInfo" />
+      </el-tab-pane>
+      <el-tab-pane
+        label="学校缴费"
+        v-if="permission('/resetTeaming/resetSound')"
+        name="2"
+      >
+        <resetPayListSchool :isNewGropu="true" :baseInfo="baseInfo"  v-if="activeIndex == 2" />
+      </el-tab-pane>
+    </el-tabs>
+  
     <div class="btnWrap">
-      <div class="PrevBtn" @click="goback">上一步</div> 
+      <div class="PrevBtn" @click="goback">上一步</div>
       <!--  v-if="teamStatus != 'teamAudit'" -->
       <div class="submitBtn">预览</div>
-  
+      <div class="submitBtn" @click="goHome">确定</div>
     </div>
   </div>
 </template>
 <script>
 // import { payOrderTypeList}  from "@/utils/searchArray";
 import resetPayList from "@/views/resetTeaming/components/resetPayList";
+import resetPayListSchool from '@/views/resetTeaming/components/resetPayListSchool'
+import { permission } from '@/utils/directivePage'
 export default {
-  props:['baseInfo'],
-  components: { resetPayList },
+  props: ["baseInfo"],
+  components: { resetPayList,resetPayListSchool },
   data() {
     return {
-      searchForm: {
-        courseScheduleType: null,
-      },
+      activeIndex: '1',
     };
   },
   created() {},
   methods: {
     goback() {
-       this.$emit("chiosetab",1);
+      this.$emit("chiosetab", 1);
+    },
+    submitAudit() {
+      let teamId = this.$route.query.id;
+    },
+    handleClick(val){
+      this.activeIndex = val.name
+    },
+       permission (str) {
+      return permission(str)
     },
-    submitAudit(){
-      let teamId =  this.$route.query.id
+    goHome(){
+      let query = this.$route.query
+      this.$router.push({
+              path: '/business/teamDetail',
+              query: {
+               ...query
+              }
+            })
     }
   },
 };

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
               }
             })
           }