diff --git a/src/views/wallet/wallet-recharge-invoice/index.vue b/src/views/wallet/wallet-recharge-invoice/index.vue index ba72c10..1819661 100644 --- a/src/views/wallet/wallet-recharge-invoice/index.vue +++ b/src/views/wallet/wallet-recharge-invoice/index.vue @@ -82,7 +82,7 @@ :loading="getReceiptDataLoading" @click="previewInvoice(row)" > - 开发票 + 查看发票 删除 diff --git a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue index 5a3208e..cd7dba5 100644 --- a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue +++ b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue @@ -62,7 +62,7 @@ - 收款人
(签名) + 开票人
(签名) {{ receiptData.payeeUser }} @@ -97,8 +97,8 @@
关闭 - 盖章保存 + 盖章 保存 打印 @@ -148,9 +148,8 @@ const visible = ref(false) const loading = ref(false) const receiptRef = ref(null) const deptOrUserInput = ref(null) -const timer = ref(null) -const isStamping = ref(false) -const isShowStamp = ref(false) +let timer = null +const isStamping = ref(false) // 盖章动画开关 const receiptData = ref({ itemJson: "", // 款项json code: "", // 发票代码(七位数) @@ -159,12 +158,12 @@ const receiptData = ref({ totalPrice: "", // 合计人民币 totalPriceCnStr: "", // 合计人民币大写 payeeDept: "", // 收款单位 - payeeUser: "", // 收款人 + payeeUser: "", // 开票人 remark: "", // 备注 picUrl: "", // 发票图片地址 }) -const applyId = ref() -const saveProgress = ref(10) +const applyId = ref() +const progressPercent = ref(30) const receiptDataItems = computed(() => { try { const itemJson = JSON.parse(receiptData.value.itemJson) @@ -178,22 +177,19 @@ const receiptDataItems = computed(() => { }) const totalPrice = computed(() => displayPrice(receiptData.value.totalPrice)) -const openDialog = (data: ReceiptData, id: any) => { - isShowStamp.value = false - if (data.picUrl) isShowStamp.value = true - +const openDialog = (data: ReceiptData, id: string) => { visible.value = true receiptData.value = data applyId.value = id isStamping.value = false - setTimeout(() => { + timer = setTimeout(() => { deptOrUserInput.value?.focus() }, 50) } const handleClose = () => { visible.value = false - timer.value = null + timer = null } // 生成图片并上传 @@ -219,17 +215,21 @@ const genImageUpload = async (): Promise => { data: formData, onUploadProgress: (progressEvent: any) => { if (progressEvent.lengthComputable) { - saveProgress.value = Math.round((progressEvent.loaded * 100) / progressEvent.total) + progressPercent.value = Math.round((progressEvent.loaded * 100) / progressEvent.total) } }, }) - if (code == 0) return data.url + if (code == 0) { + useMessage().success("盖章成功") + return data.url + } useMessage().error(data.msg || "上传失败") } catch (error) { useMessage().error(error as string) } finally { loading.value = false - saveProgress.value = 10 + progressPercent.value = 30 + isStamping.value = false } } } @@ -238,10 +238,9 @@ const genImageUpload = async (): Promise => { // 盖章并上传发票图片并保存 const stampReceipt = () => { loading.value = true - isShowStamp.value = true isStamping.value = true - setTimeout(async () => { + timer = setTimeout(async () => { const url = await genImageUpload() if (url) { receiptData.value.picUrl = url @@ -269,7 +268,6 @@ const saveReceipt = async () => { useMessage().error(err as string) } finally { loading.value = false - isStamping.value = false } }