From 5454132f16f1881e6bec37e3aadb2f00161d93f7 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 1 Aug 2025 14:40:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A5=A8=E5=8F=B7=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/other.ts | 24 ++++++++++---------
.../wallet/wallet-recharge-invoice/index.vue | 8 +++++--
.../wallet-recharge-invoice/print-dialog.vue | 3 +++
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/utils/other.ts b/src/utils/other.ts
index 9cb39be..d020cf7 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -167,13 +167,13 @@ export const openWindow = (url: string, title: string, w: number, h: number) =>
const width = window.innerWidth
? window.innerWidth
: document.documentElement.clientWidth
- ? document.documentElement.clientWidth
- : screen.width
+ ? document.documentElement.clientWidth
+ : screen.width
const height = window.innerHeight
? window.innerHeight
: document.documentElement.clientHeight
- ? document.documentElement.clientHeight
- : screen.height
+ ? document.documentElement.clientHeight
+ : screen.height
const left = width / 2 - w / 2 + dualScreenLeft
const top = height / 2 - h / 2 + dualScreenTop
@@ -181,13 +181,13 @@ export const openWindow = (url: string, title: string, w: number, h: number) =>
url,
title,
"toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=" +
- w +
- ", height=" +
- h +
- ", top=" +
- top +
- ", left=" +
- left,
+ w +
+ ", height=" +
+ h +
+ ", top=" +
+ top +
+ ", left=" +
+ left,
)
}
@@ -274,6 +274,8 @@ export function postDownBlobFile(url: any, data: any, fileName: string) {
params: {
current: data?.current ?? 1,
size: data?.size ?? 99999,
+ ascs: data?.ascs ?? [],
+ descs: data?.descs ?? [],
},
data,
}).then((response) => {
diff --git a/src/views/wallet/wallet-recharge-invoice/index.vue b/src/views/wallet/wallet-recharge-invoice/index.vue
index 2e264c2..7645947 100644
--- a/src/views/wallet/wallet-recharge-invoice/index.vue
+++ b/src/views/wallet/wallet-recharge-invoice/index.vue
@@ -52,7 +52,7 @@
@sort-change="sortChangeHandle">
-
+
{{ parseTime(row.time, "{y}-{m}-{d}") }}
@@ -202,7 +202,11 @@ const doInfo = (row: any) => {
// 导出excel
const exportExcel = () => {
- postDownBlobFile("/wallet/walletRechargeInvoice/export", Object.assign(state.queryForm), "充值扣款发票申请.xlsx")
+ postDownBlobFile("/wallet/walletRechargeInvoice/export", {
+ ...state.queryForm,
+ ascs: state.ascs,
+ descs: state.descs,
+ }, "充值扣款发票申请.xlsx")
}
// 多选事件
diff --git a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue
index e6302fd..9135ac6 100644
--- a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue
+++ b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue
@@ -118,6 +118,7 @@ import printJS from "print-js"
import * as WalletRechargeInvoiceApi from "/@/api/wallet/wallet-recharge-invoice"
import { useDict } from "/@/hooks/dict"
+
interface ReceiptData {
id: string
itemJson: string
@@ -207,6 +208,8 @@ const refreshInvoice = async () => {
}
await WalletRechargeInvoiceApi.refreshInvoice(_data)
useMessage().success("重新生成发票成功")
+ emit("refresh")
+ visible.value = false
} catch (err: any) {
console.error(err);
useMessage().error(err.msg)