mo 4 éve
szülő
commit
e1efb7ccd2

+ 2 - 2
src/views/resetTeaming/components/strudentPayInfo.vue

@@ -219,14 +219,14 @@
               </div>
             </template>
           </el-table-column>
-          <!-- <el-table-column align="center"
+          <el-table-column align="center"
                            label="是否开启缴费">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.open ? '是' : '否' }}
               </div>
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column align="center"
                            label="缴费状态">
             <template slot-scope="scope">

+ 35 - 39
src/views/teamDetail/components/studentList.vue

@@ -87,13 +87,13 @@
         <el-select v-model.trim="searchForm.isPay"
                    clearable
                    filterable
-                   placeholder="报名缴费">
+                   placeholder="缴费状态">
           <!-- <el-option label="已开启"
                      value="1"></el-option> -->
           <el-option label="未缴费"
-                     value="0"></el-option>
+                     value="NON_PAYMENT"></el-option>
           <el-option label="已缴费"
-                     value="1"></el-option>
+                     value="PAID_COMPLETED"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -195,9 +195,9 @@
                          label="缴费金额"
                          prop="courseFee"></el-table-column> -->
         <el-table-column align="center"
-                         label="报名缴费">
+                         label="缴费状态">
           <template slot-scope="scope">
-            <div>{{ scope.row.paymentStatus | studentPays}}</div>
+            <div>{{ scope.row.paymentStatus | studentPay}}</div>
           </template>
         </el-table-column>
         <el-table-column align="center"
@@ -248,11 +248,10 @@
                ref="maskForm"
                :rules="maskRules"
                :inline="true">
-        <el-alert
-          title="基本信息"
-          :closable="false"
-          class="alert"
-          type="info">
+        <el-alert title="基本信息"
+                  :closable="false"
+                  class="alert"
+                  type="info">
         </el-alert>
         <el-form-item label="联系电话"
                       prop="phone"
@@ -701,23 +700,19 @@
                    @click="submitAddVisit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="选择班级"
-      destroy-on-close
-      width="700px"
-      :visible.sync="createUserPayVisible"
-    >
-      <createUserPay
-        :signList="signList"
-        :mixList="mixList"
-        :highList="highList"
-        :snapList="snapList"
-        :musicGroupId="this.teamid"
-        :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
-        :createdUserId="createdUserId"
-        @submited="getList"
-        @close="createUserPayVisible = false"
-      />
+    <el-dialog title="选择班级"
+               destroy-on-close
+               width="700px"
+               :visible.sync="createUserPayVisible">
+      <createUserPay :signList="signList"
+                     :mixList="mixList"
+                     :highList="highList"
+                     :snapList="snapList"
+                     :musicGroupId="this.teamid"
+                     :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
+                     :createdUserId="createdUserId"
+                     @submited="getList"
+                     @close="createUserPayVisible = false" />
     </el-dialog>
   </div>
 </template>
@@ -758,6 +753,7 @@ export default {
   name: "tstudentList",
   data () {
     return {
+      teamid: '',
       payVisible: false,
       quitVisible: false, // 退团信息确认的弹窗
       studentClassVisible: false, // 学员所在班级弹窗
@@ -949,7 +945,7 @@ export default {
         rows: 9999
       })
       this.organizationCourseUnitPriceSettings = res.data.rows
-    } catch (error) {}
+    } catch (error) { }
     this.init();
   },
   methods: {
@@ -1123,16 +1119,16 @@ export default {
         }
       });
     },
-    addCycle() {
+    addCycle () {
       this.cycles.push({})
       this.collapse.push(this.collapse.length)
     },
-    removeCycle(index) {
+    removeCycle (index) {
       this.cycles[index] = null
       this.cycles = this.cycles.filter(item => !!item)
       this.collapse.pop()
     },
-    collapseChange(val) {
+    collapseChange (val) {
       this.collapse = val
     },
     gotoSignin () {
@@ -1613,28 +1609,28 @@ export default {
 .export {
   background: #14928a;
 }
-.alert{
+.alert {
   margin-bottom: 10px;
 }
-.collapse-title{
+.collapse-title {
   display: flex;
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  .el-icon-circle-close{
+  .el-icon-circle-close {
     font-size: 16px;
     margin-right: 10px;
   }
 }
-/deep/ .el-collapse-item__wrap{
+/deep/ .el-collapse-item__wrap {
   padding-top: 20px;
 }
-.cycleForm{
-  /deep/ .el-form-item{
+.cycleForm {
+  /deep/ .el-form-item {
     display: flex;
     width: 100%;
-    /deep/ .el-form-item__content{
-      margin-left: 0!important;
+    /deep/ .el-form-item__content {
+      margin-left: 0 !important;
       flex: 1;
     }
   }