Merge branch '07/06musicArchives' into test

src/views/teamDetail/components/studentList.vue

@@ -326,6 +326,17 @@
           </template>
         </el-table-column>
         <el-table-column
+          label="乐团会员有效期"
+          align="center"
+          width="100px"
+        >
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.membershipEndTime | dayjsFormat}}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
           align="center"
           fixed="right"
           width="360px;"
@@ -445,7 +456,11 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="学员性别" prop="sex">
-          <el-select v-model.trim="maskForm.sex" clearable style="width:185px!important">
+          <el-select
+            v-model.trim="maskForm.sex"
+            clearable
+            style="width: 185px !important"
+          >
             <el-option label="男" :value="1"></el-option>
             <el-option label="女" :value="0"></el-option>
           </el-select>
@@ -463,7 +478,7 @@
             filterable
             clearable
             v-model.trim="maskForm.currentGradeNum"
-            style="width:185px!important"
+            style="width: 185px !important"
           >
             <el-option
               v-for="item in gradeList"
@@ -497,7 +512,7 @@
             clearable
             filterable
             @change="onSoundChange"
-            style="width:185px!important"
+            style="width: 185px !important"
           >
             <el-option
               v-for="(item, index) in soundList"
@@ -1256,7 +1271,7 @@ export default {
                 isRefundTeachingAssistantsFee:
                   this.quitForm.isRefundTeachingAssistantsFee,
                 maintenanceFee: this.quitForm.maintenanceFee,
-                isRefundMemberFee:this.quitForm.isRefundMemberFee
+                isRefundMemberFee: this.quitForm.isRefundMemberFee,
               };
               // 退还乐器练习云教练费用
               if (this.quitForm.isRefundMemberFee) {
@@ -1274,7 +1289,7 @@ export default {
                   isMaintenanceFee: null,
                   cloudTeacherAmount: null,
                   isCloudTeacherAmount: null,
-                  isRefundMemberFee:null,
+                  isRefundMemberFee: null,
                   maintenanceFee: 0,
                   reason: "",
                 };
@@ -1696,7 +1711,7 @@ export default {
           isMaintenanceFee: null,
           cloudTeacherAmount: null,
           isCloudTeacherAmount: null,
-          isRefundMemberFee:null,
+          isRefundMemberFee: null,
           maintenanceFee: 0,
           reason: "",
         };