Merge branch 'master' into 0601Action

dist/static/css/chunk-55d02968.d6256679.css

@@ -1 +0,0 @@
-.m-container .m-core[data-v-40bbb794]{margin-top:20px}.m-container .m-core .m-wrap[data-v-40bbb794]{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:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-core .m-wrap .newBand[data-v-40bbb794]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-40bbb794]{width:150px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-40bbb794]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-40bbb794]{width:20px;height:20px;position:relative;top:12px}[data-v-40bbb794] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-acc4506c.2ae8b912.css

@@ -0,0 +1 @@
+.m-container .m-core[data-v-3b8f1e3e]{margin-top:20px}.m-container .m-core .m-wrap[data-v-3b8f1e3e]{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:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-core .m-wrap .newBand[data-v-3b8f1e3e]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-3b8f1e3e]{width:150px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-3b8f1e3e]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-3b8f1e3e]{width:20px;height:20px;position:relative;top:12px}[data-v-3b8f1e3e] .el-input__icon.el-icon-date{height:40px!important}

src/constant/index.js

@@ -334,5 +334,6 @@ export const backType = {
   VIP:'VIP退学',
   PRACTICE :'网管课关闭',
   MUSIC :'乐团退团',
-  GOODS:'商品退费'
+  GOODS:'商品退费',
+  SUBJECT_CHANGE:'声部更换'
 }

src/views/reportForm/index.vue

@@ -934,18 +934,18 @@ export default {
         this.$message.error("请选择分部");
         return;
       }
-      let data = qs.stringify({
+      let data = {
         organId: this.vipOrganId.join(","),
-      });
+      };
        let url = "/api-web/export/studentVipPractice";
       const options = {
-        method: "POST",
+        method: "get",
         headers: {
           Authorization: getToken(),
         },
-        data: qs.stringify(cleanDeep(data)),
+        params: cleanDeep(data),
         url,
-        responseType: "json",
+        responseType: "form",
       };
       this.$confirm("您确定导出VIP网管课耗", "提示", {
         confirmButtonText: "确定",

src/views/teamBuild/signupList.vue

@@ -292,6 +292,17 @@
                     </div>
                   </template>
                 </el-table-column>
+                <el-table-column
+                  label="收费金额"
+                  prop="totalAmount"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <div>
+                     {{ scope.row.totalAmount | moneyFormat}}元
+                    </div>
+                  </template>
+                </el-table-column>
                 <!-- <el-table-column label="购买乐器未入团人数" prop="cloudTeacherStudentNumOfApply" align="center">
                   <template slot="header">
                     <p>
@@ -317,10 +328,11 @@
                 </el-table-column> -->
               </el-table>
               <div
-                class="btnWrap"
+                class="leftbtnWrap"
                 v-permission="'musicGroup/updateExpectedStudentNum'"
                 style="margin-right: 20px; margin-top: 20px"
               >
+              <p style="color:red">收费总额:{{allSubjectTotal|moneyFormat}}元</p>
                 <el-button
                   v-show="
                     !isEdit &&
@@ -1129,7 +1141,7 @@ 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 parentsMeeting from './modals/parentsMeeting'
+import parentsMeeting from "./modals/parentsMeeting";
 export default {
   name: "signupList",
   components: {
@@ -1141,7 +1153,7 @@ export default {
     visit,
     newForecastList,
     quiteTeam,
-    parentsMeeting
+    parentsMeeting,
   },
   data() {
     return {
@@ -1288,7 +1300,7 @@ export default {
         meetingDate: null,
         address: null,
       },
-      sysMsg:''
+      sysMsg: "",
     };
   },
   created() {},
@@ -2139,7 +2151,7 @@ export default {
       };
     },
     onMeetingPayment(formName) {
-      console.log(this.$refs.meetingForm.$refs[formName])
+      console.log(this.$refs.meetingForm.$refs[formName]);
       this.$refs.meetingForm.$refs[formName].validate(async (valid) => {
         if (valid) {
           try {
@@ -2229,6 +2241,13 @@ export default {
         return ``;
       }
     },
+    allSubjectTotal(){
+      let allConut = 0;
+      this.leftList.forEach(item=>{
+        allConut+=Number(item.totalAmount)
+      })
+      return allConut
+    }
   },
 };
 </script>
@@ -2420,4 +2439,11 @@ export default {
 .left {
   text-align: left;
 }
+
+.leftbtnWrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>