zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

Browse Source
This commit is contained in:
zjf committed 2025-08-04 11:53:12 +08:00
2 parents 8e3ef9ffd7 f2a8ec0d10
commit 40c305069d
2 files changed
+72 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/supermarketerp/supermarketSpu/index.vue
+5
View File
@@ -11,6 +11,11 @@
<el-option v-for="item in supermarketCategory" :key="item?.id" :label="item?.name" :value="item?.id" />
</el-select>
</el-form-item>
<el-form-item label="商品性质" prop="productNature">
<el-select v-model="state.queryForm.productNature" placeholder="请选择商品性质">
<el-option v-for="item in supermarket_nature" :key="item?.id" :label="item?.label" :value="item?.value" />
</el-select>
</el-form-item>
<el-form-item label="货号" prop="productCode">
<el-input placeholder="请输入货号" v-model="state.queryForm.productCode" />
</el-form-item>
src/views/wallet/wallet-recharge-invoice/print-dialog.vue
+67 -29
View File
@@ -1,14 +1,12 @@
<template>
<el-dialog v-model="visible" title="预览" width="800px" :close-on-click-modal="false" draggable destroy-on-close>
<div v-loading="loading" id="receiptRef" ref="receiptRef"
class="w-[17.5cm] h-[9.5cm] border border-gray-400 p-6 bg-[#EBE1C622]">
<div v-loading="loading" id="receiptRef" ref="receiptRef" class="w-[17.5cm] h-[9.5cm] border border-gray-400 p-6 bg-[#EBE1C622]">
<div class="text-center mx-auto w-[10cm] text-3xl font-bold">浦江县行政事业单位食堂统一收款收据</div>
<div class="flex justify-between items-end mb-1">
<div></div>
<div>
{{ formatDate(new Date(receiptData.time), "YYYY年 mm月 dd日") || " 年 月 日".replace(/ /g, "&nbsp;&nbsp;")
}}
{{ formatDate(new Date(receiptData.time), "YYYY年 mm月 dd日") || " 年 月 日".replace(/ /g, "&nbsp;&nbsp;") }}
</div>
<span>
<span>No. </span>
@@ -21,9 +19,13 @@
<tr>
<td class="border border-gray-600 px-2 w-3/12 h-[0.75cm]">交款单位（或个人）</td>
<td class="border border-gray-600 px-2 w-9/12 h-[0.75cm] text-sm text-blue-800" colspan="4">
<input type="text" v-model="receiptData.deptOrUser"
class="caret-red-600 w-full h-full bg-transparent text-center" ref="deptOrUserInput"
maxlength="30" />
<input
type="text"
v-model="receiptData.deptOrUser"
class="caret-red-600 w-full h-full bg-transparent text-center"
ref="deptOrUserInput"
maxlength="30"
/>
</td>
</tr>
<tr>
@@ -60,10 +62,14 @@
<td class="border border-gray-600 px-2 w-1/6 h-[0.75cm]">收款单位<br />（盖章）</td>
<td class="border border-gray-600 px-2 text-left w-1/6 h-[0.75cm] text-sm text-blue-800">
<!-- <input type="text" v-model="receiptData.payeeDept" class="w-full h-full bg-transparent" /> -->
<img v-if="receiptData.stampPicUrl && visibleStampPic"
class="w-[2.5cm] h-[2.5cm] absolute -top-2 left-[140px]" draggable="false"
<img
v-if="receiptData.stampPicUrl && visibleStampPic"
class="w-[2.5cm] h-[2.5cm] absolute -top-2 left-[140px]"
draggable="false"
style="-webkit-user-drag: none; user-select: none; pointer-events: none"
oncontextmenu="return false" src="/@/assets/receiptStamp.png" />
oncontextmenu="return false"
src="/@/assets/receiptStamp.png"
/>
</td>
<td class="border border-gray-600 px-2 w-1/6 h-[0.75cm]">开票人<br />（签名）</td>
<td class="border border-gray-600 px-2 text-left w-1/6 h-[0.75cm] text-sm text-blue-800">
@@ -73,8 +79,11 @@
<td class="border border-gray-600 px-2 text-left align-text-top w-1/3 h-[0.75cm]">
<div class="flex">
<span class="whitespace-nowrap">备注：</span>
<textarea v-model="receiptData.remark" maxlength="12"
class="flex-1 text-sm text-blue-800 w-full h-full bg-transparent resize-none overflow-y-hidden" />
<textarea
v-model="receiptData.remark"
maxlength="12"
class="flex-1 text-sm text-blue-800 w-full h-full bg-transparent resize-none overflow-y-hidden"
/>
</div>
</td>
</tr>
@@ -90,20 +99,48 @@
<template #footer>
<el-button @click="handleClose" :disabled="loading">关闭</el-button>
<!-- ['2', '3'].includes(receiptData.processStatus!) && !['6'].includes(receiptData.status!) -->
<el-button v-if="['2', '3'].includes(receiptData.processStatus!)" v-auth="'wallet_walletRechargeApply_back'"
type="primary" plain @click="backInvoice" :disabled="loading">
<el-button
v-if="['2', '3'].includes(receiptData.processStatus!)"
v-auth="'wallet_walletRechargeApply_back'"
type="primary"
plain
@click="backInvoice"
:disabled="loading"
>
作废
</el-button>
<el-button v-if="!receiptData.processStatus && !['6'].includes(receiptData.status!)" type="primary"
:disabled="loading" @click="applyStamp">申请审批</el-button>
<el-button v-if="receiptData.processStatus == undefined && !['6'].includes(receiptData.status!)"
v-auth="'wallet_walletRechargeApply_receiptSave'" type="primary" @click="saveReceipt"
:disabled="loading">保存</el-button>
<el-button v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)" type="warning"
@click="handlePrint" :disabled="loading">打印</el-button>
<el-button v-auth="'wallet_invoice_refresh'"
v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)" type="primary" plain
icon="RefreshRight" @click="refreshInvoice" :disabled="refreshLoading">重新生成发票</el-button>
<el-button
v-if="!receiptData.processStatus && !['6'].includes(receiptData.status!)"
type="primary"
:disabled="loading"
@click="applyStamp"
>申请审批</el-button
>
<el-button
v-if="receiptData.processStatus == undefined && !['6'].includes(receiptData.status!)"
v-auth="'wallet_walletRechargeApply_receiptSave'"
type="primary"
@click="saveReceipt"
:disabled="loading"
>保存</el-button
>
<el-button
v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)"
type="warning"
@click="handlePrint"
:disabled="loading"
>打印</el-button
>
<el-button
v-auth="'wallet_invoice_refresh'"
v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)"
type="primary"
plain
icon="RefreshRight"
@click="refreshInvoice"
:disabled="refreshLoading"
>重新生成发票</el-button
>
</template>
</el-dialog>
</template>
@@ -116,10 +153,9 @@ import request from "/@/utils/request"
import { formatDate } from "/@/utils/formatTime"
import { displayPrice } from "/@/utils/formatMoney"
import printJS from "print-js"
import * as WalletRechargeInvoiceApi from "/@/api/wallet/wallet-recharge-invoice"
import * as WalletRechargeInvoiceApi from "/@/api/wallet/wallet-recharge-invoice"
import { useDict } from "/@/hooks/dict"
interface ReceiptData {
id: string
itemJson: string
@@ -202,20 +238,21 @@ const refreshInvoice = async () => {
visibleStampPic.value = false
// 申请审批
const blob = await genImage()
await new Promise((resolve) => setTimeout(resolve, 1000))
if (!blob) return useMessage().error("图片生成失败")
const picUrl = await uploadImage(blob)
if (!picUrl) return useMessage().error("图片上传失败")
const _data = {
id: receiptData.value.id,
picUrl: picUrl
picUrl: picUrl,
}
await WalletRechargeInvoiceApi.refreshInvoice(_data)
useMessage().success("重新生成发票成功")
emit("refresh")
visible.value = false
} catch (err: any) {
console.error(err);
console.error(err)
useMessage().error(err.msg)
} finally {
refreshLoading.value = false
@@ -251,7 +288,7 @@ const genImage = async (): Promise<Blob | void | null> => {
pixelRatio: 6,
})
.catch((error) => {
console.error(error);
console.error(error)
return useMessage().error("图片生成错误")
})
return blob
@@ -315,6 +352,7 @@ const applyStamp = async () => {
// 申请审批
const blob = await genImage()
if (!blob) return useMessage().error("图片生成失败")
await new Promise((resolve) => setTimeout(resolve, 1000))
const picUrl = await uploadImage(blob)
if (!picUrl) return useMessage().error("图片上传失败")