Merge branch 'wxl' into online

src/views/teamBuild/signupList.vue

@@ -32,9 +32,8 @@
                @click="onCreateQRCode">报名链接</div>
           <div class='newBand'
                @click="onCreateQRCode2">缴费详情</div>
-          <div class='newBand'
+          <div class='newBand' v-permission="'studentRegistration/queryStudentApplyDetailExport'"
                @click='onDownLoadExecl'>报表导出</div>
-
         </div>
       </div>
       <!--  stepImgs: {
@@ -388,6 +387,7 @@ import { vaildStudentUrl, vaildTeacherUrl } from '@/utils/validate'
 import QRCode from 'qrcodejs2'
 import axios from 'axios'
 import { getToken } from '@/utils/auth'
+import qs from 'qs'
 export default {
   components: {
     pagination
@@ -643,7 +643,7 @@ export default {
         headers: {
           'Authorization': getToken() 
         },
-        data: (data),
+        data: qs.stringify(data),
         url,
         responseType: 'blob'
       }

src/views/teamDetail/teamDetailedList.vue

@@ -57,9 +57,9 @@
     </div>
     <div class="btnWrap"
          style="margin-top:20px;">
-      <el-button type="primary" @click="musicalListExport">发放清单</el-button>
-      <el-button type="primary" @click="musicalListDetailExport">分发清单</el-button>
-      <el-button type="warning" v-permission="'order/verifyMusicalList'" @click="okDetailList">确认</el-button>
+      <el-button type="primary" v-permission="'order/musicalListExport'" @click="musicalListExport">发放清单导出</el-button>
+      <el-button type="primary" v-permission="'order/musicalListDetailExport'" @click="musicalListDetailExport">分发清单导出</el-button>
+      <el-button type="warning okBtn" v-permission="'order/verifyMusicalList'" @click="okDetailList">确认</el-button>
       <!-- <div class="okBtn" v-permission="'order/verifyMusicalList'"
            @click="okDetailList">确认</div> -->
     </div>