修改

dist/static/css/chunk-0caa04ce.19cedcb9.css

@@ -0,0 +1 @@
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}[data-v-fcb2ec7e] .el-input-group__append{background:#dcdfe6;border-color:#dcdfe6}[data-v-fcb2ec7e] .el-input-group__append:active,[data-v-fcb2ec7e] .el-input-group__append:focus,[data-v-fcb2ec7e] .el-input-group__append:hover{background:#dcdfe6;border-color:#dcdfe6;color:#fff}.el-button--primary[data-v-fcb2ec7e],.el-button--primary[data-v-fcb2ec7e]:active,.el-button--primary[data-v-fcb2ec7e]:focus,.el-button--primary[data-v-fcb2ec7e]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-fcb2ec7e]{margin-top:40px}[data-v-fcb2ec7e] .el-col-12{width:60%}.el-col[data-v-fcb2ec7e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-fcb2ec7e],.el-input[data-v-fcb2ec7e]{width:200px;margin:0 20px}

dist/static/css/chunk-7fc307f0.07d6c7ae.css

@@ -1 +0,0 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}[data-v-9b4fcb64] .el-input-group__append{background:#dcdfe6;border-color:#dcdfe6}[data-v-9b4fcb64] .el-input-group__append:active,[data-v-9b4fcb64] .el-input-group__append:focus,[data-v-9b4fcb64] .el-input-group__append:hover{background:#dcdfe6;border-color:#dcdfe6;color:#fff}.el-button--primary[data-v-9b4fcb64],.el-button--primary[data-v-9b4fcb64]:active,.el-button--primary[data-v-9b4fcb64]:focus,.el-button--primary[data-v-9b4fcb64]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-9b4fcb64]{margin-top:40px}.el-col[data-v-9b4fcb64]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-9b4fcb64],.el-input[data-v-9b4fcb64]{width:200px;margin:0 20px}

src/api/buildTeam.js

@@ -757,7 +757,8 @@ export function getMusicGroupAllClass (data) {
 // 乐团【报名中、缴费中】 学生详情列表导出
 export function studentApplyDetailExport(data) {
   return request({
-    url: api + '/studentRegistration/queryStudentApplyDetailExport',
+    // url: api + '/studentRegistration/queryStudentApplyDetailExport',
+    url: api + '/export/studentApplyDetailExport',
     method: 'post',
     data: qs.stringify(data)
   })

src/views/categroyManager/generalSettings/overallManager.vue

@@ -93,6 +93,9 @@ export default {
 .el-row {
   margin-top: 40px;
 }
+/deep/.el-col-12 {
+  width: 60%;
+}
 .el-col {
   display: flex;
   align-items: center;

src/views/categroyManager/generalSettings/overallManagerTwo.vue

@@ -0,0 +1,111 @@
+<template>
+  <div class='m-container'>
+    <!-- <h2>参数设置</h2> -->
+    <div class="m-core">
+      <!-- 列表 -->
+      <el-row>
+        <el-col :span="12"
+                v-for="(config, index) in configList"
+                :key="config.id">
+          {{ config.description[0] }}
+          <el-input v-model="input[index]">
+            <template slot="append"
+                      v-if="config.description[1]">{{ config.description[1] }}</template>
+          </el-input>
+          <el-button @click="onSave(config, index)"
+                     type="primary">保存</el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+<script>
+import pagination from '@/components/Pagination/index'
+import { sysConfigList, sysConfigUpdate } from '@/api/generalSettings'
+export default {
+  components: { pagination },
+  name: 'musicalManager',
+  data () {
+    return {
+      configList: [],
+      input: []
+    }
+  },
+  mounted () {
+    this.__init()
+  },
+  methods: {
+    __init () {
+      sysConfigList({ group: 'payment_config' }).then(res => {
+        if (res.code == 200 && res.data.length > 0) {
+          res.data.forEach((item, index) => {
+            this.input[index] = item.paranValue
+            this.configList.push({
+              id: item.id,
+              paramName: item.paramName,
+              paranValue: item.paranValue,
+              description: item.description.split('{}')
+            })
+          })
+        }
+      })
+    },
+    onSave (row, index) {
+      let params = {
+        id: row.id,
+        paranValue: this.input[index],
+        paramName: row.paramName,
+        description: row.description.join('{}')
+      }
+      sysConfigUpdate(params).then(res => {
+        if (res.code == 200) {
+          this.$message.success('修改成功')
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+/deep/.el-input-group__append {
+  background: #dcdfe6;
+  border-color: #dcdfe6;
+  &:hover,
+  &:active,
+  &:focus {
+    background: #dcdfe6;
+    border-color: #dcdfe6;
+    color: #fff;
+  }
+}
+.el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover,
+  &:active,
+  &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #fff;
+  }
+}
+.el-row {
+  margin-top: 40px;
+}
+/deep/.el-col-12 {
+  width: 60%;
+}
+.el-col {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  justify-content: flex-end;
+  margin-right: 50%;
+}
+.el-input-group,
+.el-input {
+  width: 200px;
+  margin: 0 20px;
+}
+</style>

src/views/categroyManager/globalConfig.vue

@@ -6,58 +6,50 @@
     <div class="m-core">
       <!-- navMenu -->
       <el-tabs v-model="activeIndex" type="card" @tab-click="handleClick">
-        <el-tab-pane label="参数设置" name="0" v-if="permissionList.overallManager">
-            <overallManager v-if="activeIndex == 0" />
+        
+        <el-tab-pane label="声部设置" name="0" v-if="permissionList.musicalManager">
+            <musicalManager v-if="activeIndex == 0" />
         </el-tab-pane>
-        <el-tab-pane label="声部设置" name="1" v-if="permissionList.musicalManager">
-            <musicalManager v-if="activeIndex == 1" />
+        <el-tab-pane label="乐团收费类型" name="1" v-if="permissionList.typesManager">
+            <typesManager v-if="activeIndex == 1" />
         </el-tab-pane>
-        <el-tab-pane label="乐团收费类型" name="2" v-if="permissionList.typesManager">
-            <typesManager v-if="activeIndex == 2" />
+        <el-tab-pane label="乐团收费标准" name="2" v-if="permissionList.chargesList">
+          <chargesList v-if="activeIndex == 2" />
         </el-tab-pane>
-        <el-tab-pane label="乐团收费标准" name="3" v-if="permissionList.chargesList">
-          <!-- <charges v-if="activeIndex == 3" /> -->
-          <chargesList v-if="activeIndex == 3" />
+        <el-tab-pane label="乐团作业模板" name="3" v-if="permissionList.jobTemplateSetting">
+            <jobTemplateSetting v-if="activeIndex == 3" />
         </el-tab-pane>
-        <!-- <el-tab-pane label="VIP课程参数设置" name="3">
-          <vipParameterManager v-if="activeIndex == 3" />
-        </el-tab-pane> -->
-        <el-tab-pane label="乐团作业模板" name="4" v-if="permissionList.jobTemplateSetting">
-            <jobTemplateSetting v-if="activeIndex == 4" />
+        <el-tab-pane label="热词标签" name="4" v-if="permissionList.errorManager">
+          <errorManager v-if="activeIndex == 4" />
         </el-tab-pane>
-        <!-- <el-tab-pane label="梯度结算规则设置" name="5">
-            <gradientSet v-if="activeIndex == 5" />
-        </el-tab-pane> -->
-        <el-tab-pane label="热词标签" name="5" v-if="permissionList.errorManager">
-          <errorManager v-if="activeIndex == 5" />
+        <el-tab-pane label="参数设置" name="5" v-if="permissionList.overallManager">
+            <overallManager v-if="activeIndex == 5" />
+        </el-tab-pane>
+        <el-tab-pane label="收费分润配置" name="6" v-if="permissionList.overallManagerTwo">
+            <overallManagerTwo v-if="activeIndex == 6" />
         </el-tab-pane>
-       
       </el-tabs>
     </div>
   </div>
 </template>
 <script>
 import overallManager from './generalSettings/overallManager'
+import overallManagerTwo from './generalSettings/overallManagerTwo'
 import musicalManager from './specialSetup/musicalManager'
 import typesManager from './specialSetup/typesManager'
-// import vipParameterManager from './generalSettings/vipParameterManager'
 import jobTemplateSetting from './specialSetup/jobTemplateSetting'
-// import gradientSet from './insideSetting/gradientSet'
 import errorManager from './generalSettings/errorManager'
-// import charges from './specialSetup/charges'
 import chargesList from './specialSetup/chargesList'
 import { permission } from '@/utils/directivePage'
 export default {
   components: {
-    overallManager, 
+    overallManager,
+    overallManagerTwo,
     musicalManager, 
     typesManager, 
-    // vipParameterManager, 
     jobTemplateSetting, 
-    // gradientSet,
     errorManager,
     chargesList
-    // charges
   },
   name: 'globalConfig',
   data () {
@@ -65,6 +57,7 @@ export default {
       activeIndex: '0',
       permissionList: {
         overallManager: permission('/globalConfig/overallManager'),
+        overallManagerTwo: permission('/globalConfig/overallManagerTwo'),
         musicalManager: permission('/globalConfig/musicalManager'),
         typesManager: permission('/globalConfig/typesManager'),
         chargesList: permission('/globalConfig/chargesList'),

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -71,14 +71,14 @@
             {{ scope.row.teacherRole | workType }}
           </template>
         </el-table-column>
-        <el-table-column label="当前课次"
+        <!-- <el-table-column label="当前课次"
                          prop="currentClassTimes">
           <template slot-scope="scope">
             <div>
               {{  scope.row.currentClassTimes + '/' +scope.row.totalClassTimes  }}
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="签到">
           <template slot-scope="scope">
             {{ scope.row.signInStatus | attendanceType }}
@@ -102,7 +102,7 @@
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope"
-                    v-if="scope.row.courseScheduleType != 'VIP'">
+                    v-if="scope.row.courseScheduleType != 'VIP' && !scope.row.settlementTime">
             <el-button v-if="scope.row.courseScheduleType != 'DEMO'"
                        v-permission="{child: 'courseSchedule/updateTeacherCoursesSalary', parent: 'settlement/updateTeacherCoursesSalary'}"
                        @click="onUpdate(scope.row)"

src/views/teamBuild/signupList.vue

@@ -32,8 +32,8 @@
                @click="onCreateQRCode">报名链接</div>
           <div class='newBand'
                @click="onCreateQRCode2">缴费详情</div>
-          <!-- <div class='newBand'
-               @click='onDownLoadExecl'>报表导出</div> -->
+          <div class='newBand'
+               @click='onDownLoadExecl'>报表导出</div>
 
         </div>
       </div>
@@ -386,6 +386,8 @@ import { getintoClass, getStudentList, findSound, musicGroupOpenPay, openPayment
 import { resetStudentSubject, getStudentFeeDetail } from '@/api/studentManager'
 import { vaildStudentUrl, vaildTeacherUrl } from '@/utils/validate'
 import QRCode from 'qrcodejs2'
+import axios from 'axios'
+import { getToken } from '@/utils/auth'
 export default {
   components: {
     pagination
@@ -630,11 +632,35 @@ export default {
       }
     },
     onDownLoadExecl () { // 报表导出
-      studentApplyDetailExport({
+      let url = '/api-web/studentRegistration/queryStudentApplyDetailExport'
+      let data = {
         musicGroupId: this.$route.query.id,
         page: 1,
         rows: 9999
-      }).then(res => { })
+      }
+      const options = {
+        method: 'POST',
+        headers: {
+          'Authorization': getToken() 
+        },
+        data: (data),
+        url,
+        responseType: 'blob'
+      }
+      axios(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'
+            //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+        })
+        let objectUrl = URL.createObjectURL(blob)
+        let link = document.createElement("a")
+        let fname = `学生报名列表` //下载文件的名字
+        link.href = objectUrl
+        link.setAttribute("download", fname)
+        document.body.appendChild(link)
+        link.click()
+      })
     },
     onGoHome () { // 确认开团
       // 判断是否有学生缴费

src/views/teamDetail/teamDetailedList.vue

@@ -56,16 +56,21 @@
       </div>
     </div>
     <div class="btnWrap"
-         v-permission="'order/verifyMusicalList'"
          style="margin-top:20px;">
-      <div class="okBtn"
-           @click="okDetailList">确认</div>
+      <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>
+      <!-- <div class="okBtn" v-permission="'order/verifyMusicalList'"
+           @click="okDetailList">确认</div> -->
     </div>
   </div>
 </template>
 <script>
 import { getTeamDetailList } from '@/api/buildTeam'
 import { verifyMusicalList } from '@/api/orderManager'
+import axios from 'axios'
+import qs from 'qs'
+import { getToken } from '@/utils/auth'
 export default {
   data () {
     return {
@@ -106,6 +111,64 @@ export default {
         })
       }).catch(() => {})
       
+    },
+    musicalListExport () { // 报表导出
+      let url = '/api-web/order/musicalListExport'
+      let data = {
+        musicGroupId: this.$route.query.id,
+      }
+      const options = {
+        method: 'POST',
+        headers: {
+          'Authorization': getToken() 
+        },
+        data: qs.stringify(data),
+        url,
+        responseType: 'blob'
+      }
+      axios(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'
+            //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+        })
+        let objectUrl = URL.createObjectURL(blob)
+        let link = document.createElement("a")
+        let fname = `发放清单` //下载文件的名字
+        link.href = objectUrl
+        link.setAttribute("download", fname)
+        document.body.appendChild(link)
+        link.click()
+      })
+    },
+    musicalListDetailExport () { // 报表导出
+      let url = '/api-web/order/musicalListDetailExport'
+      let data = {
+        musicGroupId: this.$route.query.id
+      }
+      const options = {
+        method: 'POST',
+        headers: {
+          'Authorization': getToken() 
+        },
+        data: qs.stringify(data),
+        url,
+        responseType: 'blob'
+      }
+      axios(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'
+            //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+        })
+        let objectUrl = URL.createObjectURL(blob)
+        let link = document.createElement("a")
+        let fname = `分发清单` //下载文件的名字
+        link.href = objectUrl
+        link.setAttribute("download", fname)
+        document.body.appendChild(link)
+        link.click()
+      })
     }
   },
 }