Merge branch '11/24SAAS' into 03/03GRADE

dist/static/css/chunk-270efa4e.5cc2ad3f.css → dist/static/css/chunk-7a9a82b7.bd4e95a6.css

@@ -1 +1 @@
-.btns[data-v-1416250d]{text-align:right}.files[data-v-1416250d]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-1416250d]{position:absolute;right:20px;bottom:10px}.myCascader .el-radio{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input{visibility:hidden}.myCascader .el-cascader-node__postfix{top:10px}[data-v-02f311ee] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-02f311ee]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-02f311ee] .el-dialog__body{padding:0}.iframe_back[data-v-02f311ee]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-02f311ee]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-02f311ee]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}
+.btns[data-v-c514fda0]{text-align:right}.files[data-v-c514fda0]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-c514fda0]{position:absolute;right:20px;bottom:10px}.myCascader .el-radio{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input{visibility:hidden}.myCascader .el-cascader-node__postfix{top:10px}[data-v-02f311ee] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-02f311ee]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-02f311ee] .el-dialog__body{padding:0}.iframe_back[data-v-02f311ee]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-02f311ee]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-02f311ee]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}

src/views/accompaniment/modals/form.vue

@@ -529,7 +529,7 @@ export default {
       const xmlRead = new FileReader()
       xmlRead.onload = res => {
         this.partListNames = this.getPartListNames(res.target.result)
-        this.gradual = getGradualLengthByXml(xmlres.data).filter(item => item.length === 2)
+        this.gradual = getGradualLengthByXml(res.target.result).filter(item => item.length === 2)
         for (let j = 0; j < this.form.sysMusicScoreAccompaniments.length; j++) {
           this.form.sysMusicScoreAccompaniments[j].track =  this.partListNames[j]
           if (!this.form.sysMusicScoreAccompaniments[j].speed) {

src/views/main/notClassStudent.vue

@@ -58,6 +58,10 @@
         <el-form-item>
           <el-button type="danger" native-type="submit">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
+          <auth :auths="['export/noClassGroupStudentList']">
+            <el-button @click="onExport" type="primary">导出</el-button>
+              </auth>
+
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -119,6 +123,9 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import { queryNoClassMusicStudentInfo } from "./api.js";
+import { Export } from "@/utils/downLoadFile";
+import cleanDeep from "clean-deep";
+import qs from "qs";
 export default {
   components: { pagination },
   data() {
@@ -187,6 +194,18 @@ export default {
         },
       });
     },
+    onExport() {
+      Export(
+        this,
+        {
+          url: "/api-web/export/noClassGroupStudentList",
+          fileName: "未在班级学员.xls",
+          method: "post",
+          params: qs.stringify(cleanDeep(this.searchForm)),
+        },
+        "您确定导出未在班级学员?"
+      );
+    },
   },
 };
 </script>

src/views/main/studentLeaveList.vue

@@ -44,6 +44,10 @@
         <el-form-item>
           <el-button type="danger" native-type="submit">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
+          <auth :auths="['export/studentErrorLeaveList']">
+            <el-button @click="onExport" type="primary">导出</el-button>
+              </auth>
+
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -139,6 +143,9 @@ import pagination from "@/components/Pagination/index";
 import visit from "@/views/withdrawal-application/modals/visit";
 import studentLeaveDetail from "./modals/studentLeaveDetail";
 import { queryStudentErrorLeaveList } from "./api.js";
+import { Export } from "@/utils/downLoadFile";
+import cleanDeep from "clean-deep";
+import qs from "qs";
 export default {
   components: { pagination, visit, studentLeaveDetail },
   data() {
@@ -205,6 +212,18 @@ export default {
       this.leaveVisible = true;
       this.studentId = item.userId;
     },
+    onExport() {
+      Export(
+        this,
+        {
+          url: "/api-web/export/studentErrorLeaveList",
+          fileName: "学员请假列表.xls",
+          method: "post",
+          params: qs.stringify(cleanDeep(this.searchForm)),
+        },
+        "您确定导出学员请假列表?"
+      );
+    },
   },
 };
 </script>

src/views/productService/model/rechargeModel.vue

@@ -117,7 +117,8 @@ export default {
               orderSubject,
               tenantId,
               returnUrl,
-              notifyUrl
+              notifyUrl,
+              wxAppId
             } = res.data.payMap;
             this.orderNo = orderNo;
             this.codeUrl =
@@ -140,7 +141,9 @@ export default {
               "&returnUrl=" +
               returnUrl +
               "&notifyUrl=" +
-              notifyUrl;
+              notifyUrl +
+              "&wxAppId=" +
+              wxAppId;
             console.log(this.codeUrl, "codeUrl");
             this.payMentVisible = true;
           } catch (e) {}

src/views/productService/model/serviceModel.vue

@@ -191,7 +191,8 @@ export default {
               orderSubject,
               tenantId,
               returnUrl,
-              notifyUrl
+              notifyUrl,
+              wxAppId
             } = res.data.payMap;
             this.orderNo = orderNo;
             this.codeUrl =
@@ -214,7 +215,9 @@ export default {
               "&returnUrl=" +
               returnUrl +
               "&notifyUrl=" +
-              notifyUrl;
+              notifyUrl +
+              "&wxAppId=" +
+              wxAppId;
             console.log(this.codeUrl, "codeUrl");
             this.payMentVisible = true;
           } catch (e) {}