wolyshaw 4 vuotta sitten
vanhempi
commit
50f20710e6

+ 7 - 1
src/views/resetTeaming/modals/pay-items.vue

@@ -5,7 +5,13 @@
         align="center"
         prop="batchNo"
         width="200"
-        label="订单编号"
+        label="批次号"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="id"
+        width="120"
+        label="缴费单号"
       ></el-table-column>
       <el-table-column align="center" prop="paymentType" label="缴费类型">
         <template slot-scope="scope">

+ 1 - 5
src/views/resetTeaming/modals/user-pay-form.vue

@@ -149,7 +149,6 @@ import classrooms from "./classrooms";
 import otherform from "./other";
 import baseInfoVue from '../../teamDetail/components/baseInfo.vue';
 import merge from 'webpack-merge'
-import MusicStore from '@/views/resetTeaming/store'
 
 const paymentTypeFormat = {
   0: "MUSIC_APPLY",
@@ -195,7 +194,7 @@ export default {
   },
   computed: {
     musicGroup() {
-      return MusicStore.state.musicGroup
+      return this.baseInfo?.musicGroup
     },
     isCommon () {
       return this.form.leixing === "1";
@@ -283,9 +282,6 @@ export default {
   },
   mounted () {
     this.formatCourse()
-    MusicStore.dispatch('getBaseInfo', {
-      data: { musicGroupId: this.musicGroupId }
-    })
     this.init();
   },
   activated () {

+ 2 - 1
src/views/teamDetail/components/modals/classroom-setting-item.vue

@@ -75,7 +75,7 @@
               filterable>
               <el-option v-for="(item,index) in pricesArray"
                 :key="index"
-                :disabled="surplustime < item"
+                :disabled="(surplustime + (parseFloat(scope.row.time) || 0)) < item"
                 :label="item"
                 :value="item">
               </el-option>
@@ -214,5 +214,6 @@ export default {
   /deep/ .close-icon{
     cursor: pointer;
     font-size: 16px;
+    margin-bottom: 24px;
   }
 </style>