冲突解决

src/main.js

@@ -21,6 +21,7 @@ import plugins from './plugins' // plugins
 import {
   download,
   post,
+  postTwo,
   get
 } from '@/utils/request'
 
@@ -82,6 +83,7 @@ console.log(i18n.global.t('login.welcomeToLogin'))
 app.config.globalProperties.useDict = useDict
 app.config.globalProperties.get = get
 app.config.globalProperties.post = post
+app.config.globalProperties.postTwo = postTwo
 app.config.globalProperties.download = download
 app.config.globalProperties.parseTime = parseTime
 app.config.globalProperties.resetForm = resetForm

src/utils/request.js

@@ -125,7 +125,7 @@ service.interceptors.response.use(res => {
       })
       return Promise.reject('error')
     } else {
-
+      
       return Promise.resolve(res.data)
     }
   },

src/views/finance/fundManage/flow/index.vue

@@ -13,13 +13,14 @@
             text: '添加流水',
             action: () => openModal('add'),
           },
+          {
+            text: '导出Excel',
+            action: () => deriveExcel(),
+          },
         ]"
-        @get-list="getList"
-      >
+        @get-list="getList">
         <template #amount="{ item }">
-          <div
-            :style="'color: ' + (item.status === '10' ? '#04cb04;' : 'red;')"
-          >
+          <div :style="'color: ' + (item.status === '10' ? '#04cb04;' : 'red;')">
             <span style="padding-right: 4px">{{ item.currency }}</span>
             <span v-if="item.status === '20'">-</span>
             <span>{{ moneyFormat(item.amount, 2) }}</span>
@@ -28,28 +29,11 @@
       </byTable>
     </div>
 
-    <el-dialog
-      :title="modalType == 'add' ? '添加流水' : '编辑流水'"
-      v-if="dialogVisible"
-      v-model="dialogVisible"
-      width="600"
-      v-loading="loadingDialog"
-    >
-      <byForm
-        :formConfig="formConfig"
-        :formOption="formOption"
-        v-model="formData.data"
-        :rules="rules"
-        ref="submit"
-      >
+    <el-dialog :title="modalType == 'add' ? '添加流水' : '编辑流水'" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loadingDialog">
+      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
         <template #transactionTime>
           <div>
-            <el-date-picker
-              v-model="formData.data.transactionTime"
-              type="datetime"
-              placeholder="请选择交易时间"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
+            <el-date-picker v-model="formData.data.transactionTime" type="datetime" placeholder="请选择交易时间" value-format="YYYY-MM-DD HH:mm:ss" />
           </div>
         </template>
         <template #money>
@@ -57,47 +41,21 @@
             <el-row :gutter="10">
               <el-col :span="6">
                 <el-form-item prop="status">
-                  <el-select
-                    v-model="formData.data.status"
-                    placeholder="请选择收支类型"
-                    style="width: 100%"
-                    @change="changeStatus()"
-                  >
-                    <el-option
-                      v-for="item in status"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                  <el-select v-model="formData.data.status" placeholder="请选择收支类型" style="width: 100%" @change="changeStatus()">
+                    <el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item prop="currency">
-                  <el-select
-                    v-model="formData.data.currency"
-                    placeholder="请选择币种"
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="item in accountCurrency"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                  <el-select v-model="formData.data.currency" placeholder="请选择币种" style="width: 100%">
+                    <el-option v-for="item in accountCurrency" :key="item.value" :label="item.label" :value="item.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item prop="amount">
-                  <el-input-number
-                    v-model="formData.data.amount"
-                    placeholder="请输入金额"
-                    style="width: 100%"
-                    :precision="2"
-                    :controls="false"
-                    :min="0"
-                  />
+                  <el-input-number v-model="formData.data.amount" placeholder="请输入金额" style="width: 100%" :precision="2" :controls="false" :min="0" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -107,13 +65,7 @@
           <div>
             <el-form-item prop="received">
               <el-radio-group v-model="formData.data.received">
-                <el-radio
-                  v-for="item in received"
-                  :key="item.value"
-                  :label="item.value"
-                  border
-                  >{{ item.label }}</el-radio
-                >
+                <el-radio v-for="item in received" :key="item.value" :label="item.value" border>{{ item.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </div>
@@ -121,9 +73,7 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitForm()" size="large">确 定</el-button>
       </template>
     </el-dialog>
   </div>
@@ -269,15 +219,11 @@ const config = computed(() => {
             },
             el: "button",
             click() {
-              ElMessageBox.confirm(
-                "此操作将永久删除该数据, 是否继续?",
-                "提示",
-                {
-                  confirmButtonText: "确定",
-                  cancelButtonText: "取消",
-                  type: "warning",
-                }
-              ).then(() => {
+              ElMessageBox.confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
                 proxy
                   .post("/accountRunningWater/delete", {
                     id: row.id,
@@ -315,31 +261,27 @@ const getDict = () => {
         });
       }
     });
-  proxy
-    .post("/accountManagement/page", { pageNum: 1, pageSize: 999 })
-    .then((res) => {
-      if (res.rows && res.rows.length > 0) {
-        accountList.value = res.rows.map((item) => {
-          return {
-            label: item.alias,
-            value: item.id,
-          };
-        });
-      }
-    });
+  proxy.post("/accountManagement/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      accountList.value = res.rows.map((item) => {
+        return {
+          label: item.alias,
+          value: item.id,
+        };
+      });
+    }
+  });
 };
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy
-    .post("/accountRunningWater/page", sourceList.value.pagination)
-    .then((res) => {
-      sourceList.value.data = res.rows;
-      sourceList.value.pagination.total = res.total;
-      setTimeout(() => {
-        loading.value = false;
-      }, 200);
-    });
+  proxy.post("/accountRunningWater/page", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
 };
 getDict();
 getList();
@@ -423,23 +365,15 @@ const formConfig = computed(() => {
   ];
 });
 const rules = ref({
-  accountManagementId: [
-    { required: true, message: "请选择账户", trigger: "change" },
-  ],
-  transactionTime: [
-    { required: true, message: "请选择交易时间", trigger: "change" },
-  ],
+  accountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
+  transactionTime: [{ required: true, message: "请选择交易时间", trigger: "change" }],
   status: [{ required: true, message: "请选择收支类型", trigger: "change" }],
   currency: [{ required: true, message: "请选择币种", trigger: "change" }],
-  received: [
-    { required: true, message: "请选择合同是否到账", trigger: "change" },
-  ],
+  received: [{ required: true, message: "请选择合同是否到账", trigger: "change" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   name: [{ required: true, message: "请输入账户名称", trigger: "blur" }],
   openingBank: [{ required: true, message: "请输入开户银行", trigger: "blur" }],
-  accountOpening: [
-    { required: true, message: "请输入银行账号", trigger: "blur" },
-  ],
+  accountOpening: [{ required: true, message: "请输入银行账号", trigger: "blur" }],
 });
 const openModal = (val) => {
   modalType.value = val;
@@ -480,6 +414,32 @@ const update = (row) => {
   });
   dialogVisible.value = true;
 };
+const deriveExcel = () => {
+  let queryParams = proxy.deepClone(sourceList.value.pagination);
+  queryParams.pageNum = 1;
+  queryParams.pageSize = 9999;
+  proxy.postTwo("/accountRunningWater/exportExcel", queryParams).then((res) => {
+    exportData(res, "资金流水.xlsx")
+  });
+};
+const exportData = (res, name) => {
+  const content = res;
+  const blob = new Blob([content], { type: "application/ms-excel" });
+  const fileName = name;
+  if ("download" in document.createElement("a")) {
+    // 非IE下载
+    const elink = document.createElement("a");
+    elink.download = fileName;
+    elink.style.display = "none";
+    elink.href = URL.createObjectURL(blob);
+    document.body.appendChild(elink);
+    elink.click();
+    URL.revokeObjectURL(elink.href); // 释放URL 对象
+    document.body.removeChild(elink);
+  } else {
+    navigator.msSaveBlob(blob, fileName);
+  }
+};
 </script>
 
 <style lang="scss" scoped>