Merge branch 'ol_12_30' into test

src/views/backManager/index.vue

@@ -86,6 +86,14 @@
           <el-button native-type="submit" type="primary">搜索</el-button>
           <el-button native-type="reset" type="danger">重置</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            @click="exportBack"
+            v-permission="'export/userCashAccountLog'"
+            >导出</el-button
+          >
+        </el-form-item>
       </save-form>
       <div class="tableWrap">
         <el-table
@@ -163,11 +171,11 @@
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
-                    <auth auths='userCashAccountLog/update'>
-                <el-button type="text" @click="resetBackForm(scope.row)"
-                  >修改</el-button
-                >
-                    </auth>
+                <auth auths="userCashAccountLog/update">
+                  <el-button type="text" @click="resetBackForm(scope.row)"
+                    >修改</el-button
+                  >
+                </auth>
               </div>
             </template>
           </el-table-column>
@@ -183,7 +191,14 @@
       </div>
     </div>
     <el-dialog :visible.sync="resetVisible" title="修改退费记录" width="400px">
-      <el-form :model="form" :rules="rules" :inline="true" label-width="100px" class="form" ref="form">
+      <el-form
+        :model="form"
+        :rules="rules"
+        :inline="true"
+        label-width="100px"
+        class="form"
+        ref="form"
+      >
         <el-form-item label="编号"
           ><el-input :disabled="true" v-model="form.id"></el-input
         ></el-form-item>
@@ -202,7 +217,12 @@
         <el-form-item label="交易流水号"
           ><el-input v-model="form.transNo"></el-input
         ></el-form-item>
-        <el-form-item v-if="form.transNo" prop="payTime" label="打款时间" :rules="[{required: true, message: '请选择打款时间'}]">
+        <el-form-item
+          v-if="form.transNo"
+          prop="payTime"
+          label="打款时间"
+          :rules="[{ required: true, message: '请选择打款时间' }]"
+        >
           <el-date-picker
             v-model="form.payTime"
             clearable
@@ -217,13 +237,11 @@
           <el-input :disabled="true" v-model="form.createTime"></el-input>
         </el-form-item>
       </el-form>
-              <span slot="footer" class="dialog-footer">
-          <el-button @click="resetVisible = false">取 消</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="resetVisible = false">取 消</el-button>
 
-          <el-button  @click="resetRorm" type="primary"
-            >确 定</el-button
-          >
-        </span>
+        <el-button @click="resetRorm" type="primary">确 定</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -235,7 +253,9 @@ import pagination from "@/components/Pagination/index";
 import { getTimes } from "@/utils";
 import load from "@/utils/loading";
 import { backTypeList } from "@/utils/searchArray";
-import { getUserCashAccountLog,resetUserCashAccountLog } from "./api";
+import { getUserCashAccountLog, resetUserCashAccountLog } from "./api";
+import { Export } from "@/utils/downLoadFile";
+import qs from "qs";
 export default {
   components: { pagination },
   data() {
@@ -305,21 +325,40 @@ export default {
       this.form = { ...row };
       this.resetVisible = true;
     },
-    resetRorm(){
-      this.$refs.form.validate(async(flag)=>{
-        if(flag){
+    resetRorm() {
+      this.$refs.form.validate(async (flag) => {
+        if (flag) {
           try {
-            const res = await  resetUserCashAccountLog( this.form)
-            this.$message.success('修改成功')
-            this.resetVisible = false
-            this.getList()
-          }catch(e){
-            console.log(e)
+            const res = await resetUserCashAccountLog(this.form);
+            this.$message.success("修改成功");
+            this.resetVisible = false;
+            this.getList();
+          } catch (e) {
+            console.log(e);
           }
-
         }
-      })
-    }
+      });
+    },
+    exportBack() {
+      let { backTime, payTime, ...rest } = this.searchForm;
+      let params = {
+        ...rest,
+        page: this.rules.page,
+        rows: this.rules.limit,
+        ...getTimes(backTime, ["createStartTime", "createEndTime"]),
+        ...getTimes(payTime, ["payStartTime", "payEndTime"]),
+      };
+      Export(
+        this,
+        {
+          url: "/api-web/export/userCashAccountLog",
+          fileName: "退费列表.xls",
+          method: "post",
+          params: qs.stringify(params),
+        },
+        "您确定导出退费列表?"
+      );
+    },
   },
 };
 </script>
@@ -330,7 +369,7 @@ export default {
   }
 }
 .form {
-  /deep/.el-input{
+  /deep/.el-input {
     width: 220px;
   }
 }