Merge branch '07/06musicArchives' into test

src/components/copy-text/index.vue

@@ -40,7 +40,7 @@ export default {
     },
     copyText(e) {
 
-      const text = this.content
+      const text = this.content.replace(/(^\s*)|(\s*$)/g, "")
       if (text) {
         copy(text)
         if (this.hint) {

src/views/teamBuild/signupList.vue

@@ -220,7 +220,11 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="购买云教练人数" prop="buyCloudTeacherNum" align="center">
+                <el-table-column
+                  label="购买云教练人数"
+                  prop="buyCloudTeacherNum"
+                  align="center"
+                >
                   <template slot="header">
                     <p>
                       购买云教练人数
@@ -237,13 +241,19 @@
                   </template>
                   <template slot-scope="scope">
                     <div>
-                      <el-button type="text" @click="getCheckNum(scope.row, 'buyCloud')">{{
-                        scope.row.buyCloudTeacherNum
-                      }}</el-button>
+                      <el-button
+                        type="text"
+                        @click="getCheckNum(scope.row, 'buyCloud')"
+                        >{{ scope.row.buyCloudTeacherNum }}</el-button
+                      >
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="入团未购云教练" prop="noCloudTeacherStudentNumOfNormal" align="center">
+                <el-table-column
+                  label="入团未购云教练"
+                  prop="noCloudTeacherStudentNumOfNormal"
+                  align="center"
+                >
                   <template slot="header">
                     <p>
                       入团未购云教练
@@ -260,9 +270,13 @@
                   </template>
                   <template slot-scope="scope">
                     <div>
-                      <el-button type="text" @click="getCheckNum(scope.row, 'noCloud')">{{
-                        scope.row.noCloudTeacherStudentNumOfNormal
-                      }}</el-button>
+                      <el-button
+                        type="text"
+                        @click="getCheckNum(scope.row, 'noCloud')"
+                        >{{
+                          scope.row.noCloudTeacherStudentNumOfNormal
+                        }}</el-button
+                      >
                     </div>
                   </template>
                 </el-table-column>
@@ -472,7 +486,7 @@
             <el-option label="退团" value="QUIT"></el-option> -->
             <el-option label="报名" value="APPLY"></el-option>
           </el-select>
-      </el-form-item>
+        </el-form-item>
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
         <el-form-item>
           <el-button type="danger" native-type="search">搜索</el-button>
@@ -614,7 +628,13 @@
             </div>
           </template>
         </el-table-column>
-
+        <el-table-column label="备注" prop="remark" align="center">
+          <template slot-scope="scope">
+            <div>
+              <overflow-text :text="scope.row.remark"></overflow-text>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作"
           fixed="right"
@@ -642,7 +662,7 @@
               </auth>
 
               <!-- APPLY  status == "APPLY" || s-->
-              <el-popover
+              <!-- <el-popover
                 v-show="scope.row.remark"
                 placement="top-start"
                 title="备注"
@@ -651,7 +671,7 @@
                 :content="scope.row.remark"
               >
                 <el-button type="text" slot="reference">备注</el-button>
-              </el-popover>
+              </el-popover> -->
               <!-- PAY -->
               <!-- &&  status == "PAY"-->
               <auth
@@ -690,7 +710,10 @@
                 :auths="'subjectChange/getStudentOriginal'"
                 v-show="scope.row.paymentStatus == 2"
               >
-                <el-button type="text" @click="openChangeVoice(scope.row)"
+                <el-button
+                  type="text"
+                  @click="openChangeVoice(scope.row)"
+                  v-if="status == !'PROGRESS'"
                   >更改声部</el-button
                 >
               </auth>
@@ -706,11 +729,11 @@
                   >解除预约限制</el-button
                 >
               </auth>
-              <auth
-
-                :auths="'studentRegistration/setCloudTeacherToFailed'"
-              >
-                <el-button type="text"    v-if="scope.row.payingStatus == 2" @click="failedRelieve(scope.row)"
+              <auth :auths="'studentRegistration/setCloudTeacherToFailed'">
+                <el-button
+                  type="text"
+                  v-if="scope.row.payingStatus == 2"
+                  @click="failedRelieve(scope.row)"
                   >拒绝审核</el-button
                 >
               </auth>
@@ -812,8 +835,12 @@
       <template v-if="orderForm.length > 0">
         <descriptions :column="2">
           <template v-for="(item, index) in orderForm">
-            <descriptions-item :key="index" :label="item.name">{{ item.price | moneyFormat }}元</descriptions-item>
-            <descriptions-item :key="index" label="缴费时间">{{ item.createTime }}</descriptions-item>
+            <descriptions-item :key="index" :label="item.name"
+              >{{ item.price | moneyFormat }}元</descriptions-item
+            >
+            <descriptions-item :key="index" label="缴费时间">{{
+              item.createTime
+            }}</descriptions-item>
           </template>
         </descriptions>
       </template>
@@ -969,8 +996,8 @@ import { permission } from "@/utils/directivePage";
 import cleanDeep from "clean-deep";
 import changeVoice from "./modals/change-voice";
 import visit from "@/views/withdrawal-application/modals/visit";
-import quiteTeam from "@/views/teamDetail/components/modals/quite-team"
-import { courseType } from '@/constant/index'
+import quiteTeam from "@/views/teamDetail/components/modals/quite-team";
+import { courseType } from "@/constant/index";
 export default {
   name: "signupList",
   components: {
@@ -1007,7 +1034,7 @@ export default {
         hasCloudTeacher: null, // 是否购买云教练
         payingStatus: null,
         noneNeedCloudTeacher: null,
-        studentStatus: null
+        studentStatus: null,
       },
       quitForm: {
         // 退团信息确认
@@ -1578,20 +1605,20 @@ export default {
         studentId: row.studentId,
       }).then((res) => {
         if (res.code == 200) {
-          const paymentList = res.data || []
-          paymentList.forEach(item => {
-            if(item.type == 'MAINTENANCE') {
-              item.name = '乐器保养'
-            } else if(item.type == 'CLOUD_TEACHER') {
-              item.name = '乐器练习云教练'
-            } else if(item.type == 'COURSE') {
-              item.name = '课程'
+          const paymentList = res.data || [];
+          paymentList.forEach((item) => {
+            if (item.type == "MAINTENANCE") {
+              item.name = "乐器保养";
+            } else if (item.type == "CLOUD_TEACHER") {
+              item.name = "乐器练习云教练";
+            } else if (item.type == "COURSE") {
+              item.name = "课程";
             }
-            if(courseType[item.type]) {
-              item.name = courseType[item.type]
+            if (courseType[item.type]) {
+              item.name = courseType[item.type];
             }
-          })
-          this.orderForm = paymentList
+          });
+          this.orderForm = paymentList;
         }
       });
 
@@ -1606,7 +1633,7 @@ export default {
     quitTeam(row) {
       this.activeRow = row;
       this.quitVisible = true;
-      this.activeRow.courseViewType = this.courseViewType
+      this.activeRow.courseViewType = this.courseViewType;
       this.quitForm.cloudTeacherAmount = row.cloudTeacherAmount;
     },
     quieTeams(row) {
@@ -1793,7 +1820,7 @@ export default {
       }).then(async () => {
         try {
           const res = await setNoneCloudTeacher({ id: row.id });
-          console.log('code',res.code)
+          console.log("code", res.code);
           if (res.code == 200) {
             this.$message.success("解除预约成功");
             this.getList();
@@ -1814,7 +1841,7 @@ export default {
             });
           }
         } catch (e) {
-          console.log('错误',e);
+          console.log("错误", e);
         }
       });
     },
@@ -1849,11 +1876,11 @@ export default {
         noneNeedCloudTeacher: null,
       };
       this.searchFrom.subject = row.subjectId;
-      if(type == 'buyCloud') {
-        this.searchFrom.hasCloudTeacher = 1
-      } else if(type == 'noCloud') {
-        this.searchFrom.hasCloudTeacher = 0
-        this.searchFrom.studentStatus = 'NORMAL'
+      if (type == "buyCloud") {
+        this.searchFrom.hasCloudTeacher = 1;
+      } else if (type == "noCloud") {
+        this.searchFrom.hasCloudTeacher = 0;
+        this.searchFrom.studentStatus = "NORMAL";
       } else {
         this.searchFrom.payingStatus = 2;
         this.searchFrom.hasCloudTeacher = 0;
@@ -1909,7 +1936,7 @@ export default {
     },
     orderVisible(val) {
       if (!val) {
-        this.orderForm = []
+        this.orderForm = [];
       }
     },
     qrcodeStatus(val) {

src/views/teamDetail/components/studentList.vue

@@ -336,6 +336,13 @@
             </div>
           </template>
         </el-table-column>
+            <el-table-column label="备注" prop="remark" align="center">
+          <template slot-scope="scope">
+            <div>
+              <overflow-text :text="scope.row.remark"></overflow-text>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
           align="center"
           fixed="right"
@@ -391,7 +398,7 @@
                 >新增回访</el-button
               >
 
-              <el-popover
+              <!-- <el-popover
                 v-show="scope.row.remark"
                 placement="top-start"
                 title="备注"
@@ -400,7 +407,7 @@
                 :content="scope.row.remark"
               >
                 <el-button type="text" slot="reference">备注</el-button>
-              </el-popover>
+              </el-popover> -->
             </div>
           </template>
         </el-table-column>