浏览代码

Finish Hotfix-33

chen 3 年之前
父节点
当前提交
0d46a242f1

+ 5 - 1
src/views/engin_deposit/components/refund_list-detail.vue

@@ -522,6 +522,7 @@
 <script>
 import { downloadFiles } from "@/utils/util";
 import IMAGEUPLOAD from "@/components/Common/image-upload.vue";
+import { getFileUrl } from "@/api/common";
 import { mapGetters } from "vuex";
 import {
   getDepositManageDetail,
@@ -575,7 +576,10 @@ export default {
     },
     //下载
     downLoadFn(v) {
-      window.open(this.imageURL + v);
+      getFileUrl({ key: v }).then((res) => {
+        window.open(res.data);
+      });
+      // window.open(this.imageURL + v);
     },
     // 检查文件类型
     checkFileType(url) {

+ 14 - 0
src/views/finance/standbook_list.vue

@@ -193,6 +193,13 @@
             ></el-table-column>
             <el-table-column
               align="center"
+              label="操作时间"
+              prop="createTime"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
               label="摘要"
               prop="remark"
               min-width="160"
@@ -425,6 +432,13 @@
             ></el-table-column>
             <el-table-column
               align="center"
+              label="操作时间"
+              prop="createTime"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
               label="摘要"
               prop="remark"
               min-width="160"

+ 37 - 1
src/views/finance/wallet.vue

@@ -45,7 +45,14 @@
         </el-row>
       </el-form>
     </div>
-
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fr">
+        <el-button type="primary" size="small" @click="exportFn"
+          >导出</el-button
+        >
+      </div>
+    </div>
     <el-row>
       <el-col :xs="24" :sm="12" :lg="12">
         <div class="styl">现金钱包</div>
@@ -225,6 +232,26 @@
         <el-button type="primary" @click="determineFn">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 导出弹窗 -->
+    <el-dialog
+      title="导出"
+      :visible.sync="dialogExportForm"
+      width="30%"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="exportForm"
+        :rules="exportRules"
+        :model="exportForm"
+        label-width="120px"
+      >
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button>取 消</el-button>
+        <el-button type="primary">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -235,10 +262,14 @@ import {
   getWalletRebateRateUpdate,
   getCustomerList,
 } from "@/api/finance/wallet";
+import { downloadFiles } from "@/utils/util";
 import { getWalletCustomerList } from "@/api/finance/change_apply";
 export default {
   data() {
     return {
+      dialogExportForm: false,
+      exportRules: [],
+      exportForm: {},
       isShow: JSON.parse(localStorage.getItem("supply_user")).isCustomer,
       show: false,
       show2: true,
@@ -349,6 +380,11 @@ export default {
     ...mapGetters(["customerId"]),
   },
   methods: {
+    //导出
+    exportFn() {
+      // this.dialogExportForm = true;
+      downloadFiles("/wallet/count/export");
+    },
     //清空
     resetFn() {
       this.$refs.searchForm.resetFields();