添加人员

src/views/resetTeaming/components/resetPayList.vue

@@ -135,13 +135,17 @@
         <el-table-column align="center"
                          prop="memo"
                          label="备注"></el-table-column>
-        <el-table-column label="操作" fixed="right" min-width="150px">
+        <el-table-column label="操作" fixed="right" min-width="260px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
                          @click="lookDetail(scope.row)"
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button>
               <el-button type="text"
+                         @click="openChioseStudent(scope.row)"
+                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'"
+                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
+              <el-button type="text"
                          v-if="scope.row.status == 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
@@ -671,15 +675,19 @@ export default {
     onReSet() {
       this.searchForm = { payUserType: null };
     },
+    openChioseStudent (row) {
+      this.chioseStudentVisible = true;
+      this.musicGroupPaymentCalenderId = row.id;
+    },
     async payedSubmited(data) {
       try {
         await this.getList();
-        if (!this.isNewGropu) {
-          this.chioseStudentVisible = true;
-          if (data) {
-            this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
-          }
-        }
+        // if (!this.isNewGropu) {
+        //   this.chioseStudentVisible = true;
+        //   if (data) {
+        //     this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
+        //   }
+        // }
       } catch (error) {}
     },
   },

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -111,17 +111,20 @@
         <el-table-column align="center"
                          prop="memo"
                          label="备注"></el-table-column>
-        <el-table-column label="操作" fixed="right" min-width="150px">
+        <el-table-column label="操作" fixed="right" min-width="260px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
                          @click="lookDetail(scope.row)"
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button>
               <el-button type="text"
+                         @click="openChioseStudent(scope.row)"
+                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'"
+                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
+              <el-button type="text"
                          v-if="scope.row.status == 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
-
               <el-button type="text" v-if="!isNewGropu" @click="onCreateQRCode(scope.row)">续费二维码</el-button>
             </div>
           </template>
@@ -647,15 +650,19 @@ export default {
     onReSet() {
       this.searchForm = { payUserType: null };
     },
+    openChioseStudent (row) {
+      this.chioseStudentVisible = true;
+      this.musicGroupPaymentCalenderId = row.id;
+    },
     async payedSubmited(data) {
       try {
         await this.getList();
-        if (!this.isNewGropu) {
-          this.chioseStudentVisible = true;
-          if (data) {
-            this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
-          }
-        }
+        // if (!this.isNewGropu) {
+        //   this.chioseStudentVisible = true;
+        //   if (data) {
+        //     this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
+        //   }
+        // }
       } catch (error) {}
     },
   },

src/views/resetTeaming/components/studentPayBase.vue

@@ -68,9 +68,9 @@
             </div>
           </template>
         </el-table-column> -->
-        <el-table-column align="center"
+        <!-- <el-table-column align="center"
                          prop="courseFee"
-                         label="缴费金额(元)"></el-table-column>
+                         label="缴费金额(元)"></el-table-column> -->
         <!-- <el-table-column align="center"
                          label="操作">
           <template slot-scope="scope">

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

@@ -58,7 +58,7 @@
     <otherform :form="other" ref="other" />
     <div slot="footer" class="dialog-footer">
       <el-button @click="$listeners.close">取 消</el-button>
-      <el-button type="primary" @click="submit">{{paymentType == '0' ? '确认' : '下一步'}}</el-button>
+      <el-button type="primary" @click="submit">确认</el-button>
     </div>
     <el-dialog
       :title="nextTitle"