Merge branch 'baoming-jiaofei' into dev

src/utils/downLoadFile.js

@@ -4,6 +4,7 @@ import {
   getToken
 } from '@/utils/auth'
 import load from '@/utils/loading'
+import cleanDeep from 'clean-deep'
 
 /**
  * 导出模板
@@ -38,7 +39,7 @@ export const Export = (that, params, message) => {
         })
         .then(() => {
             load.startLoading()
-            axios(options).then(res => {
+            axios(cleanDeep(options)).then(res => {
                 let blob = new Blob([res.data], {
                 // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
                 type: "application/vnd.ms-excel;charset=utf-8"

src/views/accompaniment/modals/form.vue

@@ -28,6 +28,22 @@
         </el-select> -->
       </el-form-item>
       <el-form-item
+        prop="sysMusicScore.clientType"
+        label="客户端类型"
+        :rules="[{required: true, message: '请选择客户端类型'}]"
+      >
+        <el-select style="width: 100%!important;" v-model="form.sysMusicScore.clientType" placeholder="请选择客户端类型">
+          <el-option
+            value="NETWORK_ROOM"
+            label="网络教室"
+          ></el-option>
+          <el-option
+            value="SMART_PRACTICE"
+            label="智能陪练"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
         prop="sysMusicScore.order"
         label="排序"
         :rules="[{required: true, message: '请输入排序'}]"
@@ -147,6 +163,7 @@ export default {
           url: '',
           order: '',
           musicScoreCategoriesId: [],
+          clientType: '',
         },
         sysMusicScoreAccompaniments: [
           {
@@ -175,6 +192,7 @@ export default {
         name: this.detail.name,
         url: this.detail.url,
         order: this.detail.order,
+        clientType: this.detail.clientType,
         musicScoreCategoriesId: this.detail.categoriesId ? this.formatParentId(this.detail.categoriesId, this.tree) : [],
       })
       this.FeatchDetailList()

src/views/teamBuild/components/forecast-list.vue

@@ -32,6 +32,16 @@
                         <el-option v-for="item in selects.subjects" :value="item.id" :label="item.name" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item prop="cloudTeacherMethod">
+                    <el-select
+                        v-model.trim="searchForm.cloudTeacherMethod"
+                        clearable
+                        placeholder="系统意向"
+                    >
+                        <el-option label="团购" value="GROUP"></el-option>
+                        <el-option label="自备" value="OWNED"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="danger" native-type="seach">搜索</el-button>
                     <el-button native-type="reset" type="primary">重置</el-button>
@@ -116,6 +126,14 @@
                     </el-table-column>
                     <el-table-column
                         align="center"
+                        label="系统意向"
+                    >
+                        <template slot-scope="scope">
+                            {{ scope.row.cloudTeacherMethod | instrumentType }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        align="center"
                         prop="isRegistered"
                         label="是否已报名"
                     >
@@ -152,6 +170,7 @@ export default {
                 name: null,
                 subjectId: null,
                 isAllowAdjust: null,
+                cloudTeacherMethod: null
             },
             tableList: [],
             pageInfo: {

src/views/teamBuild/forecastName.vue

@@ -63,6 +63,16 @@
                         <el-option v-for="item in selects.subjects" :value="item.id" :label="item.name" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item prop="cloudTeacherMethod">
+                    <el-select
+                        v-model.trim="searchForm.cloudTeacherMethod"
+                        clearable
+                        placeholder="系统意向"
+                    >
+                        <el-option label="团购" value="GROUP"></el-option>
+                        <el-option label="自备" value="OWNED"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="danger" native-type="seach">搜索</el-button>
                     <el-button native-type="reset" type="primary">重置</el-button>
@@ -145,7 +155,6 @@
                     </el-table-column>
                     <el-table-column
                         align="center"
-                        prop="realName"
                         label="乐器准备方式"
                     >
                         <template slot-scope="scope">
@@ -154,6 +163,14 @@
                     </el-table-column>
                     <el-table-column
                         align="center"
+                        label="系统意向"
+                    >
+                        <template slot-scope="scope">
+                            {{ scope.row.cloudTeacherMethod | instrumentType }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        align="center"
                         prop="courseScheduleId"
                         width="150"
                         label="操作"
@@ -263,6 +280,7 @@ export default {
                 name: null,
                 subjectId: null,
                 isAllowAdjust: null,
+                cloudTeacherMethod: null,
             },
             tableList: [],
             pageInfo: {

src/views/teamBuild/signupList.vue

@@ -143,7 +143,7 @@
       <el-dialog
         title="预报名名单"
         :visible.sync="forecastVisible"
-        width="950px"
+        width="1100px"
       >
         <forecastList v-if="forecastVisible" @close="forecastVisible = false" />
       </el-dialog>