Merge branch 'ol_12_30' into test

src/constant/index.js

@@ -331,8 +331,8 @@ export const orderType = {
 }
 
 export const backType = {
-  VIP:'vip',
-  PRACTICE :'网管课',
-  MUSIC :'退团',
-  GOODS:'商品'
+  VIP:'VIP退学',
+  PRACTICE :'网管课关闭',
+  MUSIC :'乐团退团',
+  GOODS:'商品退费'
 }

src/views/backManager/index.vue

@@ -56,6 +56,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="returnFeeFlag">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.returnFeeFlag"
+            filterable
+            clearable
+            placeholder="退费状态"
+          >
+            <el-option label="已打款" value="1"></el-option>
+            <el-option label="未打款" value="0"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="backTime">
           <el-date-picker
             v-model.trim="searchForm.backTime"
@@ -268,6 +280,7 @@ export default {
         organId: [],
         backTime: [],
         payTime: [],
+        returnFeeFlag:null
       },
       backTypeList,
       tableList: [],
@@ -298,12 +311,12 @@ export default {
       this.getList();
     },
     async getList() {
-      let { backTime, payTime,organId, ...rest } = this.searchForm;
+      let { backTime, payTime, organId, ...rest } = this.searchForm;
       let params = {
         ...rest,
         page: this.rules.page,
         rows: this.rules.limit,
-        organId:organId.join(','),
+        organId: organId.join(","),
         ...getTimes(backTime, ["createStartTime", "createEndTime"]),
         ...getTimes(payTime, ["payStartTime", "payEndTime"]),
       };
@@ -343,12 +356,12 @@ export default {
       });
     },
     exportBack() {
-      let { backTime, payTime,organId, ...rest } = this.searchForm;
+      let { backTime, payTime, organId, ...rest } = this.searchForm;
       let params = {
         ...rest,
         page: this.rules.page,
         rows: this.rules.limit,
-         organId:organId.join(','),
+        organId: organId.join(","),
         ...getTimes(backTime, ["createStartTime", "createEndTime"]),
         ...getTimes(payTime, ["payStartTime", "payEndTime"]),
       };

src/views/reportForm/index.vue

@@ -391,7 +391,8 @@
             type="primary"
             @click="exportTrain"
             v-permission="'export/cloudStudyStudentTrainData'"
-            >导出</el-button>
+            >导出</el-button
+          >
         </div>
       </div>
       <el-divider></el-divider>
@@ -406,20 +407,24 @@
             placeholder="请选择导出类型"
             clearable
           >
-            <el-option label="云教练用户反馈" value="CLOUD_TEACHER_FEEDBACK" ></el-option>
+            <el-option
+              label="云教练用户反馈"
+              value="CLOUD_TEACHER_FEEDBACK"
+            ></el-option>
           </el-select>
           <el-button
             style="margin-left: 10px"
             type="primary"
             @click="exportQuestion"
-             v-if="$helpers.permission('questionnaireUserResult/export/report')"
-            >导出</el-button>
+            v-if="$helpers.permission('questionnaireUserResult/export/report')"
+            >导出</el-button
+          >
         </div>
       </div>
-            <el-divider></el-divider>
+      <el-divider></el-divider>
       <div class="m-core">
         <div class="m-wrap">
-          <div class="title">vip网管课导出：</div>
+          <div class="title">VIP网管课耗导出：</div>
           <select-all
             v-model.trim="vipOrganId"
             class="organSelect"
@@ -440,7 +445,8 @@
             type="primary"
             @click="exportVip"
             v-permission="'export/studentVipPractice'"
-            >导出</el-button>
+            >导出</el-button
+          >
         </div>
       </div>
     </div>
@@ -478,8 +484,8 @@ export default {
       AccountDetailOrganId: [],
       AccountDetailTimer: [],
       trainOrganId: null,
-      questionActiveType: 'CLOUD_TEACHER_FEEDBACK',
-      vipOrganId:[]
+      questionActiveType: "CLOUD_TEACHER_FEEDBACK",
+      vipOrganId: [],
     };
   },
   mounted() {
@@ -834,19 +840,23 @@ export default {
           fileName: "云教练学员统计.xls",
           method: "post",
           params: qs.stringify({
-            organId: this.trainOrganId
+            organId: this.trainOrganId,
           }),
         },
         "您确定导出云教练学员统计?"
       );
     },
     exportQuestion() {
-      Export(this, {
-        url: '/api-web/questionnaireUserResult/export',
-        fileName: '问卷调查.xls',
-        method: 'get',
-        params: { activeType: this.questionActiveType }
-      }, '您确定导出问卷调查?')
+      Export(
+        this,
+        {
+          url: "/api-web/questionnaireUserResult/export",
+          fileName: "问卷调查.xls",
+          method: "get",
+          params: { activeType: this.questionActiveType },
+        },
+        "您确定导出问卷调查?"
+      );
     },
     exportLeBao() {
       let endTime, startTime;
@@ -871,14 +881,14 @@ export default {
         "您确定导出乐保订单?"
       );
     },
-    exportAccount(){
+    exportAccount() {
       let endTime, startTime;
       if (this.AccountTimer && this.AccountTimer.length > 1) {
         startTime = this.AccountTimer[0];
         endTime = this.AccountTimer[1];
-      }else{
-        startTime=null;
-        endTime=null;
+      } else {
+        startTime = null;
+        endTime = null;
       }
       Export(
         this,
@@ -886,20 +896,23 @@ export default {
           url: "/api-web/export/userCoursesAccount",
           fileName: "课程余额明细.xls",
           method: "post",
-          params: qs.stringify({ startTime: startTime, endTime: endTime,organId: this.AccountOrganId.join(",") }),
+          params: qs.stringify({
+            startTime: startTime,
+            endTime: endTime,
+            organId: this.AccountOrganId.join(","),
+          }),
         },
         "您确定导出课程余额明细?"
       );
     },
-    exportDetailAccount(){
+    exportDetailAccount() {
       let endTime, startTime;
       if (this.AccountDetailTimer && this.AccountDetailTimer.length > 1) {
         startTime = this.AccountDetailTimer[0];
         endTime = this.AccountDetailTimer[1];
-
-      }else{
-        startTime=null;
-        endTime=null;
+      } else {
+        startTime = null;
+        endTime = null;
       }
       Export(
         this,
@@ -907,29 +920,78 @@ export default {
           url: "/api-web/export/userCashAccountDetail",
           fileName: "账户余额明细.xls",
           method: "post",
-          params:qs.stringify( { startTime: startTime, endTime: endTime,organId: this.AccountDetailOrganId.join(",") })
+          params: qs.stringify({
+            startTime: startTime,
+            endTime: endTime,
+            organId: this.AccountDetailOrganId.join(","),
+          }),
         },
         "您确定导出账户余额明细?"
       );
     },
-    exportVip(){
-      if (!this.vipOrganId.length<0) {
+    exportVip() {
+      if (!this.vipOrganId.length < 0) {
         this.$message.error("请选择分部");
         return;
       }
-      Export(
-        this,
-        {
-          url: "/api-web/export/studentVipPractice",
-          fileName: "vip网管课.xls",
-          method: "post",
-          params: qs.stringify({
-            organId: this.vipOrganId.join(',')
-          }),
+      let data = qs.stringify({
+        organId: this.vipOrganId.join(","),
+      });
+       let url = "/api-web/export/studentVipPractice";
+      const options = {
+        method: "POST",
+        headers: {
+          Authorization: getToken(),
         },
-        "您确定导出vip网管课?"
-      );
-    }
+        data: qs.stringify(cleanDeep(data)),
+        url,
+        responseType: "json",
+      };
+      this.$confirm("您确定导出VIP网管课耗", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          load.startLoading();
+          axios(options)
+            .then((res) => {
+              load.endLoading();
+              if (res.data.code == 200) {
+                this.$message.info(res.data.msg);
+              } else {
+                this.$message.error(res.data.msg);
+              }
+              // this.$confirm(res.data.data, "提示", {
+              //   confirmButtonText: "确定",
+              //   cancelButtonText: "取消",
+              //   type: "warning",
+              // }).then(() => {
+
+              // }).catch(err => {
+
+              // })
+            })
+            .catch((error) => {
+              this.$message.error("导出数据失败，请联系管理员");
+              load.endLoading();
+            });
+        })
+        .catch(() => {});
+
+      // Export(
+      //   this,
+      //   {
+      //     url: "/api-web/export/studentVipPractice",
+      //     fileName: "vip网管课.xls",
+      //     method: "post",
+      //     params: qs.stringify({
+      //       organId: this.vipOrganId.join(',')
+      //     }),
+      //   },
+      //   "您确定导出vip网管课?"
+      // );
+    },
   },
   // AccountDetailTimer
 };