Merge branch '09/26smallFuction' into 11/24SAAS

src/views/main/notClassStudent.vue

@@ -58,6 +58,7 @@
         <el-form-item>
           <el-button type="danger" native-type="submit">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
+          <el-button @click="onExport" type="primary">导出</el-button>
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -119,6 +120,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 +191,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,7 @@
         <el-form-item>
           <el-button type="danger" native-type="submit">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
+          <el-button @click="onExport" type="primary">导出</el-button>
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -139,6 +140,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 +209,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) {}