Merge branch 'wxl_01_27' into online

src/views/musicInspection/index.vue

@@ -6,6 +6,9 @@
         </h2>
         <div class="m-core">
             <save-form :inline="true" ref="searchForm" @submit="search" @reset="onReSet" :model="searchForm">
+                <el-form-item prop='search'>
+                    <el-input type="text" placeholder="请输入乐团名称" v-model="searchForm.search" />
+                </el-form-item>
                 <el-form-item prop='organId'>
                     <el-select class='multiple'
                                 v-model.trim="searchForm.organId"
@@ -43,7 +46,7 @@
                                 :value="item.userId"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item prop='musicGroupId'>
+                <!-- <el-form-item prop='musicGroupId'>
                     <el-select class='multiple'
                                 v-model.trim="searchForm.musicGroupId"
                                 filterable
@@ -54,7 +57,7 @@
                                 :label="item.name"
                                 :value="item.id"></el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item prop='conclusionStatus'>
                     <el-select class='multiple'
                                 v-model.trim="searchForm.conclusionStatus"
@@ -220,9 +223,10 @@ export default {
             activeRow: null,
             planDetail: null,
             searchForm: {
+                search: null,
                 organId: null,
                 userId: null,
-                musicGroupId: null,
+                // musicGroupId: null,
                 conclusionStatus: null,
                 cooperationOrganId: null,
                 createTimer: []
@@ -267,11 +271,11 @@ export default {
         });
 
         // 乐团列表 {只查询进行中的乐团}
-        await getTeamList({ musicGroupStatus: 'PROGRESS', rows: 9999 }).then(res => {
-            if(res.code == 200) {
-                this.musicGroupList = res.data.rows
-            }
-        })
+        // await getTeamList({ musicGroupStatus: 'PROGRESS', rows: 9999 }).then(res => {
+        //     if(res.code == 200) {
+        //         this.musicGroupList = res.data.rows
+        //     }
+        // })
     },
     methods: {
         dayjs,

src/views/resetTeaming/modals/subject-preview.vue

@@ -7,7 +7,7 @@
 		</div>
 
 		<div class="section">
-			<h2 class="title">{{ chargeTypeName }}</h2>
+			<h2 class="title">乐团训练辅助</h2>
             <p style="font-size: 14px; padding: 2px 0; color: #a1a1a1" v-if="serviceValidDate">服务有效期:{{ serviceValidDate }}</p>
 			<el-row class="title-row">
 				<el-col :span="12">服务项目</el-col>
@@ -20,7 +20,7 @@
 					<el-col :span="12">
 						<i class="check_default" :class="[item.isStatus ? 'check_active' : '']"></i>
 						<span style="display: flex; align-items: center;">
-							<template v-if="item.courseType == 'PROJECT'">{{ item.name }} </template><template v-else>{{ item.courseType | coursesType }}</template>
+							<template v-if="item.courseType == 'PROJECT'">{{ chargeTypeName }} </template><template v-else>{{ item.courseType | coursesType }}</template>
 						</span>
 						<el-icon v-if="item.courseType == 'PROJECT'" class="el-icon-question" @click.native="onQuestions" />
 					</el-col>
@@ -274,7 +274,7 @@ export default {
                                 this.courseShowStatus = true
                                 tempCourse = {
                                     courseCurrentPrice: (info.courseCurrentPrice + tempCourse.courseCurrentPrice),
-                                    courseOriginalPrice: (info.courseOriginalPrice + tempCourse.courseOriginalPrice),
+                                    courseOriginalPrice: 9800,
                                     courseType: 'PROJECT',
                                     isStatus: true,
                                     name: '乐团训练辅助系统'
@@ -927,11 +927,10 @@ export default {
 }
 
 .el-icon-question {
-    display: flex;
-    align-items: center;
     font-size: 16px;
     color: #4d4d4d;
     padding-left: 5px;
+    padding-top: 5px;
 }
 
 .fontBold {