Browse Source

添加学员按钮

wolyshaw 4 years ago
parent
commit
57e4ab98bc

+ 4 - 4
src/views/resetTeaming/components/resetPayList.vue

@@ -108,7 +108,7 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         min-width="160px">
+                         min-width="200px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
@@ -117,10 +117,10 @@
               <!-- <el-button type="text"
                          @click="lookDetail(scope.row)"
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button> -->
-              <!-- <el-button type="text"
+              <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="teamStatus && scope.row.auditStatus === 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/update'"
@@ -652,7 +652,7 @@ export default {
           this.$refs.setStudentFee.clearTable();
           this.payVisible = false;
           this.chioseStudentVisible = false;
-          this.$refs.payItems?.getList()
+          // this.$refs.payItems?.getList()
           this.getList();
 
         }

+ 4 - 4
src/views/resetTeaming/components/resetPayListSchool.vue

@@ -108,7 +108,7 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         min-width="160px">
+                         min-width="200px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
@@ -117,10 +117,10 @@
               <!-- <el-button type="text"
                          @click="lookDetail(scope.row)"
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button> -->
-              <!-- <el-button type="text"
+              <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="teamStatus && scope.row.auditStatus === 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/update'"
@@ -638,7 +638,7 @@ export default {
           this.payVisible = false;
           this.chioseStudentVisible = false;
           this.getList();
-          this.$refs.payItems?.getList()
+          // this.$refs.payItems?.getList()
         }
       });
     },

+ 4 - 3
src/views/resetTeaming/components/studentPayBase.vue

@@ -39,6 +39,7 @@
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                 :data="tableList"
                 ref='multipleTable'
+                max-height="300"
                 @selection-change="handleSelectionChange">
         <el-table-column type="selection"
                          width="55">
@@ -128,7 +129,7 @@ import { findSound, getMusicGroupStudentFee, resetMusicGroupStudentFee, queryCan
 
 export default {
   components: { pagination },
-  props: ['clearStduent', 'musicGroupPaymentCalenderId'],
+  props: ['clearStduent', 'musicGroupPaymentCalenderId', 'batchNo'],
   data () {
     return {
       searchForm: {
@@ -196,7 +197,7 @@ export default {
       this.searchForm.musicGroupId = this.teamid;
       queryCanAddStudent({
         ...this.searchForm,
-        musicGroupPaymentCalenderId: this.musicGroupPaymentCalenderId,
+        batchNo: this.batchNo,
       }).then(res => {
         if (res.code == 200) {
           // this.rules.total = res.data.total;
@@ -286,7 +287,7 @@ export default {
 </script>
 <style lang='scss' scoped>
 .tableWrap {
-  height: 300px;
+  // height: 300px;
   overflow: auto;
 }
 </style>

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

@@ -71,7 +71,7 @@
               v-permission="'musicGroupPaymentCalender/auditListDetail'"
               >查看</el-button
             >
-            <el-button
+            <!-- <el-button
               type="text"
               @click="$listeners.openChioseStudent(scope.row)"
               v-if="
@@ -83,7 +83,7 @@
               "
               v-permission="'musicGroupPaymentCalenderDetail/batchAdd'"
               >添加学员</el-button
-            >
+            > -->
             <!-- <el-button
               type="text"
               v-if="scope.row.status == 'REJECT' && teamStatus"