Merge branch '0601afternoon' into 0601Action

dist/static/css/chunk-fcd89c9c.16a43373.css → dist/static/css/chunk-40694e27.69adfe7a.css

@@ -1 +1 @@
-.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-69ae4217] .description-title{margin:0!important}
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-950774ca] .description-title{margin:0!important}

dist/static/css/chunk-41c0f7b4.8422f03e.css

@@ -0,0 +1 @@
+.statistic .statistic-content>span[data-v-be006b80]{font-size:22px!important}.statistic .statistic-content>span[data-v-be006b80]:first-child{font-size:14px!important}

dist/static/css/chunk-4589d139.2c057146.css

@@ -1 +0,0 @@
-.statistic .statistic-content>span[data-v-0c81c296]{font-size:20px!important}.statistic .statistic-content>span[data-v-0c81c296]:first-child{font-size:24px!important;color:rgba(0,0,0,.85);font-weight:700}

dist/static/css/chunk-58b45c3b.74abdf68.css

@@ -1 +0,0 @@
-.newBand[data-v-6812ad51]{display:inline-block;margin-right:10px}.right-code .title[data-v-6812ad51]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-6812ad51] .studentInfo .multiple.el-select{width:185px!important}

dist/static/css/chunk-79efab4d.f2382d8f.css → dist/static/css/chunk-5bc28020.0c3ac260.css

@@ -1 +1 @@
-.btns[data-v-7d36c199]{text-align:right}.files[data-v-7d36c199]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-7d36c199]{position:absolute;right:20px;bottom:10px}.remark[data-v-5883ea72]{display:inline;overflow:hidden;white-space:pre}
+.btns[data-v-05831223]{text-align:right}.files[data-v-05831223]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-05831223]{position:absolute;right:20px;bottom:10px}.remark[data-v-5883ea72]{display:inline;overflow:hidden;white-space:pre}

dist/static/css/chunk-05215e45.31b4c289.css → dist/static/css/chunk-888c7004.d5bdba23.css

@@ -1 +1 @@
-[data-v-5bd2dce3] .el-select{width:100%!important}[data-v-7f80e971] .el-table th{background:#edeef0}.btnList[data-v-2da9bd42]{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:start;-ms-flex-pack:start;justify-content:flex-start}.code-url[data-v-2da9bd42]{margin-top:10px}
+[data-v-5bd2dce3] .el-select{width:100%!important}[data-v-5616c374] .el-table th{background:#edeef0}.btnList[data-v-2da9bd42]{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:start;-ms-flex-pack:start;justify-content:flex-start}.code-url[data-v-2da9bd42]{margin-top:10px}

dist/static/css/chunk-a265025c.db7edbc4.css

@@ -0,0 +1 @@
+.statistic .statistic-content>span[data-v-51f2c316]{font-size:20px!important}.statistic .statistic-content>span[data-v-51f2c316]:first-child{font-size:24px!important;color:rgba(0,0,0,.85);font-weight:700}

dist/static/css/chunk-c591f414.aa1e3fce.css

@@ -1 +0,0 @@
-.statistic .statistic-content>span[data-v-15bf9c51]{font-size:22px!important}.statistic .statistic-content>span[data-v-15bf9c51]:first-child{font-size:14px!important}

dist/static/css/chunk-cf5d2bca.cba33aa7.css

@@ -0,0 +1 @@
+.newBand[data-v-af9f3a52]{display:inline-block;margin-right:10px}.right-code .title[data-v-af9f3a52]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-af9f3a52] .studentInfo .multiple.el-select{width:185px!important}

src/components/singe-file-upload/index.vue

@@ -6,10 +6,9 @@
     :on-remove="remove"
     :on-progress="progress"
     :on-error="error"
-    :limit="1"
     :file-list="filelist"
     :accept="accept">
-    <el-button size="small" type="primary" plain>点击上传</el-button>
+    <el-button size="small" type="primary" plain >点击上传</el-button>
     <div slot="tip" v-if="tips" class="el-upload__tip">{{tips}}</div>
     <div slot="file" slot-scope="{file}">
       <div style="display: flex; align-items: center;flex: 1 auto;justify-content: space-between;">

src/views/accompaniment/modals/form.vue

@@ -202,7 +202,10 @@ export default {
     formatParentId(id, list, ids = []) {
       for (const item of list) {
         if (item.sysMusicScoreCategoriesList) {
-          return this.formatParentId(id, item.sysMusicScoreCategoriesList, [...ids, item.id])
+          const cIds = this.formatParentId(id, item.sysMusicScoreCategoriesList, [...ids, item.id])
+          if(cIds.includes(id)) {
+            return cIds
+          }
         }
         if (item.id === id) {
           return [...ids, id]

src/views/categroyManager/insideSetting/addressManager.vue

@@ -50,7 +50,7 @@
             placeholder="可用状态"
           >
             <el-option label="个人" value="0"></el-option>
-            <el-option label="公用" value="1"></el-option>
+            <el-option label="公共" value="1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>

src/views/childrensDay/detail.vue

@@ -53,7 +53,7 @@
             v-model.trim="searchForm.gradeFlag"
             filterable
             clearable
-            placeholder="是否参加乐器考级"
+            placeholder="是否参加器乐考级"
           >
             <el-option value="1" label="是"></el-option>
             <el-option value="0" label="否"></el-option>
@@ -157,7 +157,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="studentId" label="报考乐器等级">
+          <el-table-column align="center" prop="studentId" label="器乐报考等级">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.gradeLeave ? scope.row.gradeLeave + "级" : "-" }}

src/views/childrensDay/index.vue

@@ -4,7 +4,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      21暑期考级
+      个人技能测评
     </h2>
     <div class="m-core">
       <save-form
@@ -71,10 +71,10 @@
       </save-form>
       <div class="btnList">
         <el-button type="primary" @click="onCreateQRCode('placeholder')"
-          >占位链接</el-button
+          >预报名链接</el-button
         >
         <el-button type="primary" @click="onCreateQRCode('music')"
-          >乐器考级链接</el-button
+          >器乐考级报名链接</el-button
         >
         <el-button type="primary" @click="onCreateQRCode('vip')"
           >VIP课程链接</el-button
@@ -97,7 +97,7 @@
       </div>
       <statistic :col="4" class="statistic" :cols="0">
         <statistic-item>
-          <span>乐器考级人次</span>
+          <span>器乐考级人次</span>
           <span><count-to :endVal="statInfo.instrumentalMusicNum" /></span>
         </statistic-item>
         <statistic-item>
@@ -175,7 +175,7 @@
           <el-table-column
             align="center"
             prop="instrumentalMusicNum"
-            label="乐器考级人次"
+            label="器乐考级人次"
           ></el-table-column>
           <el-table-column
             align="center"
@@ -358,7 +358,7 @@ export default {
     },
     onCreateQRCode(status) {
       if (status == "placeholder") {
-        this.codeTitle = "占位链接";
+        this.codeTitle = "预报名链接";
         this.qrCodeUrl = vaildStudentUrl() + "/#/childrenSeat";
       }
       if (status == "theory") {
@@ -367,7 +367,7 @@ export default {
       }
 
       if (status == "music") {
-        this.codeTitle = "乐器考级链接";
+        this.codeTitle = "器乐考级报名链接";
         this.qrCodeUrl = vaildStudentUrl() + "/#/childrenPayment?dHlwZT0x";
       }
       if (status == "vip") {

src/views/reaplceMusicPlayer/modals/detail.vue

@@ -96,14 +96,14 @@
           prop="mobileNo"
           label="联系电话"
         ></el-table-column>
-        <el-table-column align="center" prop="actualAmount" label="现金">
+        <el-table-column align="center" prop="actualAmount" label="现金支付">
           <template slot-scope="scope">
             <div>
               {{ scope.row.actualAmount | moneyFormat }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="balance" label="余额">
+        <el-table-column align="center" prop="balance" label="余额支付">
           <template slot-scope="scope">
             <div>
               {{ scope.row.balance | moneyFormat }}

src/views/studentManager/studentList.vue

@@ -411,7 +411,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="家长姓名" prop="parseName">
-          <el-input v-model.trim="studentForm.parseName"></el-input>
+          <el-input v-model.trim="studentForm.parseName" :disabled="!isNew"></el-input>
         </el-form-item>
         <el-form-item
           label="联系电话"

src/views/teamBuild/components/teamBaseInfo.vue

@@ -312,11 +312,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label prop="isClass">
+        <!-- <el-form-item label prop="isClass">
           <el-checkbox v-model.trim="topFrom.isClass" :disabled="basdisabled"
             >课堂课乐团</el-checkbox
           >
-        </el-form-item>
+        </el-form-item> -->
         <br />
         <el-form-item label="" v-if="teamStatus == 'teamDraft'">
           <p style="color: red; padding-left: 50px">
@@ -517,7 +517,7 @@ export default {
       if (this.teamid) {
         let loadash = this.$helpers.lodash;
         let sotrage = JSON.parse(localStorage.getItem(`${this.teamid}base`));
-        console.log(sotrage,this.topFrom)
+        // console.log(sotrage,this.topFrom)
         if (!loadash.isEqual(this.topFrom, sotrage) && sotrage) {
           // 提示保存
           return await this.$confirm("已修改当前页面数据是否保存", "提示", {