Merge branch 'master' into 02/23reviewBUG

dist/static/css/chunk-1269a5c2.e362d77d.css → dist/static/css/chunk-1860c518.14c632b5.css

@@ -1 +1 @@
-[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-5ec13f8a]{width:100%}.number-input[data-v-5ec13f8a] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-6a256aca]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-6a256aca],[data-v-6a256aca] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-6a256aca] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-6a256aca] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-6a256aca] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-6a256aca] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-6a256aca] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-225a961a]{line-height:44px}.fixedBox[data-v-225a961a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-225a961a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-225a961a]{font-size:18px;cursor:pointer}[data-v-225a961a] .el-divider--horizontal{margin:0!important}.minus[data-v-225a961a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-5ec13f8a]{width:100%}.number-input[data-v-5ec13f8a] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-4c19b502]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-4c19b502],[data-v-4c19b502] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-4c19b502] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-4c19b502] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-4c19b502] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-4c19b502] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-4c19b502] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-225a961a]{line-height:44px}.fixedBox[data-v-225a961a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-225a961a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-225a961a]{font-size:18px;cursor:pointer}[data-v-225a961a] .el-divider--horizontal{margin:0!important}.minus[data-v-225a961a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

dist/static/css/chunk-42ab66a4.b2d5d021.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-2ccd281c],.el-button--primary[data-v-2ccd281c]:active,.el-button--primary[data-v-2ccd281c]:focus,.el-button--primary[data-v-2ccd281c]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2ccd281c] .el-date-editor.el-input,[data-v-2ccd281c] .el-select{width:100%!important}[data-v-2ccd281c] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-2ccd281c] .el-dialog__body{padding:10px 20px}.newBand[data-v-2ccd281c]{display:inline-block}

dist/static/css/chunk-69a2a9da.924372aa.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-411c7eea],.el-button--primary[data-v-411c7eea]:active,.el-button--primary[data-v-411c7eea]:focus,.el-button--primary[data-v-411c7eea]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-411c7eea] .el-date-editor.el-input,[data-v-411c7eea] .el-select{width:100%!important}[data-v-411c7eea] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-411c7eea] .el-dialog__body{padding:10px 20px}.newBand[data-v-411c7eea]{display:inline-block}

src/constant/index.js

@@ -113,7 +113,7 @@ export const auditPaymentType = {
   ADD_COURSE: '临时加课',
   MUSIC_APPLY: '乐团报名',
   MUSIC_RENEW: '乐团续费',
-  SPAN_GROUP_CLASS_ADJUST: '跨团合班',
+  SPAN_GROUP_CLASS_ADJUST: '合班缴费',
 }
 
 export const orderServerType = {

src/views/auditList/index.vue

@@ -3,7 +3,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      审核列表
+      费用审核列表
     </h2>
     <div class="m-core">
       <!-- 搜索标题 -->

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -66,7 +66,7 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="goodsDiscountRate"
-                           label="缴费金额">
+                           label="每分钟费用">
             <template slot-scope="scope">{{
               scope.row.unitPrice
             }}</template>

src/views/main/constant.js

@@ -106,6 +106,7 @@ export const errorType = {
     query: {
       searchType: 'ERR_ATTENDANCE',
       ...dates,
+      start: '2021-02-20',
     },
   },
   TEACHER_NOT_A_CLASS: {
@@ -116,6 +117,7 @@ export const errorType = {
     query: {
       searchType: 'NO_ATTENDANCE',
       ...dates,
+      start: '2021-02-20',
     },
   },
   TEACHER_LEAVE: {

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -610,6 +610,12 @@ export default {
           path: "/business/resetTeaming",
           query: { ...this.$route.query },
         });
+      } else if(query.type == 'look') {
+        this.$store.dispatch("delVisitedViews", this.$route);
+        this.$router.push({
+          path: "/business/teamLookBase",
+          query: { ...this.$route.query },
+        });
       }
     },
     handleSelectionChange(val) {

src/views/teamBuild/signupList.vue

@@ -1350,7 +1350,9 @@ export default {
       // this.visitForm.studentName = row.studentName;
       // this.visitForm.musicGroupId = this.teamid;
       // this.visitForm.studentId = row.studentId;
+      row.userId = row.studentId
       this.detail = row
+      this.detail.musicGroupId = this.$route.query.id
       this.visitVisiable = true;
     },
     openChangeVoice(row) {

src/views/teamDetail/componentClass/calenderStudentList.vue

@@ -10,7 +10,7 @@
     />
     <otherform :form="other" ref="other" />
     <div style="margin-bottom: 20px">
-      <el-button type="primary" @click="dialogVisible = true">一件修改差价</el-button>
+      <el-button type="primary" @click="dialogVisible = true">一键修改差价</el-button>
       <el-button type="primary" @click="init">还原差价</el-button>
     </div>
     <el-table