Merge remote-tracking branch 'origin/master'

.env.development

@@ -12,7 +12,7 @@ ENV = 'development'
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-VITE_ADMIN_PROXY_PATH = http://192.168.101.139:9999/ # 邓-本地
+VITE_ADMIN_PROXY_PATH = http://192.168.101.150:9999/ # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
 
 # 图片访问基础地址
@@ -20,7 +20,7 @@ VITE_ADMIN_PROXY_PATH = http://192.168.101.139:9999/ # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 # VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://192.168.101.139:9999 # 邓-本地
+VITE_IMAGE_BASE_PATH = http://192.168.101.150:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
 
 # 代码生成服务地址

package.json

@@ -34,6 +34,7 @@
 		"element-plus": "2.5.5",
 		"form-designer-plus": "^0.1.5",
 		"highlight.js": "^11.7.0",
+		"html-to-image": "^1.11.13",
 		"js-base64": "^3.7.7",
 		"js-cookie": "^3.0.1",
 		"json-editor-vue3": "^1.1.1",
@@ -43,6 +44,7 @@
 		"nprogress": "^0.2.0",
 		"pinia": "2.0.32",
 		"postcss": "8.4.40",
+		"print-js": "^1.6.0",
 		"qrcode": "1.5.1",
 		"qs": "^6.11.0",
 		"screenfull": "^6.0.2",
@@ -116,4 +118,4 @@
 		"type": "git",
 		"url": "https://gitee.com/log4j/pig"
 	}
-}
+}

src/api/admin/dept.ts

@@ -8,6 +8,14 @@ export const deptTree = (params?: Object) => {
 	})
 }
 
+export const deptTreeSelect = (params?: Object) => {
+	return request({
+		url: "/admin/dept/tree-select",
+		method: "get",
+		params,
+	})
+}
+
 export const addObj = (obj: Object) => {
 	return request({
 		url: "/admin/dept",

src/api/wallet/wallet-recharge-apply.ts

@@ -1,5 +1,13 @@
 import request from "/@/utils/request"
 
+export function saveTopup(data?: Object) {
+	return request({
+		url: "/wallet/wallet-recharge-apply/save-topup",
+		method: "post",
+		data: data,
+	})
+}
+
 export function apply(query?: Object) {
 	return request({
 		url: "/wallet/wallet-recharge-apply/apply",

src/api/wallet/wallet-recharge-invoice.ts

@@ -0,0 +1,75 @@
+import request from "/@/utils/request"
+
+/**
+ * 根据申请id获取发票详情
+ * @param id 申请id
+ */
+export function invoiceSelect(query: any) {
+	return request({
+		url: "/wallet/walletRechargeInvoice/select",
+		method: "get",
+		params: query,
+	})
+}
+
+/**
+ * 根据申请id获取发票详情
+ * @param id 申请id
+ */
+export function getInvoice(query: any) {
+	return request({
+		url: "/wallet/walletRechargeInvoice/get-invoice",
+		method: "get",
+		params: query,
+	})
+}
+
+/**
+ * 绑定发票
+ */
+export function bindInvoice(data: any) {
+	return request({
+		url: "/wallet/walletRechargeInvoice/bind-invoice",
+		method: "post",
+		data: data,
+	})
+}
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/walletRechargeInvoice/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/walletRechargeInvoice",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/walletRechargeInvoice/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/walletRechargeInvoice",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/walletRechargeInvoice",
+		method: "put",
+		data: obj,
+	})
+}

src/components/Select/SelectDept.vue

@@ -1,30 +1,28 @@
 <template>
-	<el-tree-select
-		v-model="selectId"
-		:data="deptOptions"
-		:props="{ value: 'id', label: 'name', children: 'children' }"
-		class="w100"
-		filterable
-		clearable
-		check-strictly
-		:render-after-expand="false"
-		:placeholder="placeholder"
-		@change="handleChange"
-	/>
+	<el-tree-select v-model="selectId" :data="deptOptions" :props="{ value: 'id', label: 'name', children: 'children' }"
+		class="w100" filterable clearable check-strictly :render-after-expand="false" :placeholder="placeholder"
+		@change="handleChange" />
 </template>
 
 <script setup lang="ts" name="SelectDept">
 import { ref, onMounted } from "vue"
-import { deptTree } from "/@/api/admin/dept"
+import { deptTree, deptTreeSelect } from "/@/api/admin/dept"
 import { useMessage } from "/@/hooks/message"
 
 const selectId = defineModel()
 
-defineProps({
+const props = defineProps({
 	placeholder: {
 		type: String,
 		default: "请选择部门",
 	},
+	/**
+	 * "all" | "scope"
+	 */
+	dataScope: {
+		type: String,
+		default: "scope",
+	}
 })
 
 const emit = defineEmits(["update:modelValue", "change"])
@@ -34,13 +32,14 @@ const deptOptions = ref<any[]>([])
 // 加载部门树数据
 const loadDeptTree = async () => {
 	try {
-		const res = await deptTree()
+		const res: any = props.dataScope == "scope" ? await deptTree() : await deptTreeSelect()
 		if (res.code == 0) {
 			deptOptions.value = res.data || []
 		} else {
 			useMessage().error(res.msg || "获取部门数据失败")
 		}
 	} catch (error: any) {
+		console.error(error);
 		useMessage().error(error.msg || "获取部门数据失败")
 	}
 }

src/components/Select/SelectWalletInvoice.vue

@@ -0,0 +1,112 @@
+<template>
+    <el-select style="width: 100%" v-model="state.selectId" :placeholder="props.placeholder"
+        :clearable="props.clearable" remote-show-suffix filterable remote :disabled="props.disabled"
+        :remote-method="remoteSearch" :loading="state.loading" @visible-change="(e: boolean) => e && getOptions()"
+        @change="change">
+        <el-option v-for="v in state.options" :key="v.id"
+            :label="`向${v.payeeDept}汇款${displayPrice(v.totalPrice)}用于充值-创建于${v.createTime}`" :value="v.id">
+            <div class="flex items-center">
+                向
+                <span class="color-danger">{{ v.payeeDept }}</span>
+                汇款
+                <span class="color-danger">{{ displayPrice(v.totalPrice) }}</span>
+                用于充值
+                <span>-创建于{{ v.createTime }}</span>
+            </div>
+        </el-option>
+    </el-select>
+</template>
+
+<script setup lang="ts" name="select-wallet-invoice">
+import { reactive } from "vue"
+import { useDict } from "/@/hooks/dict"
+import { displayPrice } from "/@/utils/formatMoney"
+
+import * as invoiceManager from "/@/api/wallet/wallet-recharge-invoice"
+
+const emit = defineEmits(["change"])
+
+const selectId = defineModel()
+
+const props = withDefaults(
+    defineProps<{
+        placeholder?: string
+        disabled?: boolean
+        clearable?: boolean
+        autoFirst?: boolean
+        apiParams?: any
+    }>(),
+    {
+        placeholder: "请选择",
+        disabled: false,
+        clearable: true,
+        autoFirst: false,
+        apiParams: {
+            status: "1"
+        },
+    },
+)
+
+const queryForm = reactive<any>({
+    name: "",
+    current: 1,
+    size: 10,
+})
+
+const state = reactive<any>({
+    loading: true,
+    selectId: selectId,
+    options: [],
+    hardType: [],
+})
+
+watch(
+    selectId,
+    (newVal, oldValue) => {
+        if (newVal == oldValue) return
+        state.selectId = newVal
+        getOptions()
+    },
+    { immediate: true },
+)
+
+async function getOptions() {
+    try {
+        state.loading = true
+        const _pa = {
+            ...queryForm,
+            ...props.apiParams,
+        }
+        const { data } = await invoiceManager.invoiceSelect(_pa)
+        state.options = data.records ?? []
+        if (props.autoFirst && state.options.length != 0) {
+            state.selectId = state.options[0].id
+            emit("change", state.selectId)
+        }
+        const { hard_type } = useDict("hard_type")
+        state.hardType = hard_type
+    } finally {
+        setTimeout(() => (state.loading = false), 500)
+    }
+}
+
+function remoteSearch(params: string) {
+    if (params != queryForm.name) {
+        queryForm.name = params
+        getOptions()
+    }
+}
+
+function clear() {
+    state.selectId = null
+    getOptions()
+}
+
+function change() {
+    emit("change", selectId)
+}
+
+onMounted(() => {
+    props.autoFirst && getOptions()
+})
+</script>

src/components/index.ts

@@ -35,6 +35,7 @@ import SelectRole from "/@/components/Select/SelectRole.vue"
 import SelectCabinet from "/@/components/Select/SelectCabinet.vue"
 import SelectMchCatory from "/@/components/Select/SelectMchCatory.vue"
 import SelectCanteenSupplier from "/@/components/Select/SelectCanteenSupplier.vue"
+import SelectWalletInvoice from "/@/components/Select/SelectWalletInvoice.vue"
 
 // 第三方组件
 import ElementPlus from "element-plus"
@@ -91,6 +92,7 @@ export default {
 		app.component("SelectRole", SelectRole)
 		app.component("SelectCabinet", SelectCabinet)
 		app.component("SelectCanteenSupplier", SelectCanteenSupplier)
+		app.component("SelectWalletInvoice", SelectWalletInvoice)
 
 		// 导入全部的elmenet-plus的图标
 		for (const [key, component] of Object.entries(ElementPlusIconsVue)) {

src/views/admin/system/dept/form.vue

@@ -1,17 +1,10 @@
 <template>
 	<el-dialog :title="dataForm.deptId ? $t('common.editBtn') : $t('common.addBtn')" v-model="visible" width="600">
 		<el-form ref="deptDialogFormRef" :model="dataForm" label-width="110px" :rules="dataRules" v-loading="loading">
-			<el-form-item :label="$t('sysdept.parentId')" prop="parentId">
-				<el-tree-select
-					v-model="dataForm.parentId"
-					:data="parentData"
-					:props="{ value: 'id', label: 'name', children: 'children' }"
-					class="w100"
-					clearable
-					check-strictly
-					:render-after-expand="false"
-					:placeholder="$t('sysdept.inputparentIdTip')"
-				/>
+			<el-form-item v-if="auths(['sys_dept_other'])" :label="$t('sysdept.parentId')" prop="parentId">
+				<el-tree-select v-model="dataForm.parentId" :data="parentData"
+					:props="{ value: 'id', label: 'name', children: 'children' }" class="w100" clearable check-strictly
+					:render-after-expand="false" :placeholder="$t('sysdept.inputparentIdTip')" />
 			</el-form-item>
 			<el-form-item :label="$t('sysdept.name')" prop="name">
 				<el-input v-model="dataForm.name" :placeholder="$t('sysdept.inputnameTip')" clearable />
@@ -21,17 +14,21 @@
 					<select-hard-group v-model="dataForm.hardGroupId" />
 				</el-form-item>
 			</el-col>
-			<el-form-item v-if="useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')" label="是否同步到正元" prop="isSyncZy">
+			<el-form-item v-if="useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')" label="是否同步到正元"
+				prop="isSyncZy">
 				<el-switch v-model="dataForm.isSyncZy" />
 			</el-form-item>
-			<el-form-item :label="$t('sysdept.sortOrder')" prop="sortOrder">
-				<el-input-number v-model="dataForm.sortOrder" :placeholder="$t('sysdept.inputsortOrderTip')" clearable />
+			<el-form-item v-if="auths(['sys_dept_other'])" :label="$t('sysdept.sortOrder')" prop="sortOrder">
+				<el-input-number v-model="dataForm.sortOrder" :placeholder="$t('sysdept.inputsortOrderTip')"
+					clearable />
 			</el-form-item>
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
 				<el-button @click="visible = false">{{ $t("common.cancelButtonText") }}</el-button>
-				<el-button type="primary" @click="onSubmit" :disabled="loading">{{ $t("common.confirmButtonText") }}</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">
+					{{ $t("common.confirmButtonText") }}
+				</el-button>
 			</span>
 		</template>
 	</el-dialog>
@@ -43,6 +40,7 @@ import { getObj, deptTree, addObj, putObj } from "/@/api/admin/dept"
 import { useMessage } from "/@/hooks/message"
 import { rule } from "/@/utils/validate"
 import { useUserInfo } from "/@/stores/userInfo"
+import { auths } from "/@/utils/authFunction"
 
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(["refresh"])
@@ -95,7 +93,7 @@ const openDialog = (type: string, id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await deptDialogFormRef.value.validate().catch(() => {})
+	const valid = await deptDialogFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 
 	try {

src/views/admin/system/dept/index.vue

@@ -4,7 +4,8 @@
 			<el-row shadow="hover" v-show="showSearch" class="ml10">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="filter">
 					<el-form-item prop="deptName" :label="$t('sysdept.name')">
-						<el-input :placeholder="$t('sysdept.inputdeptNameTip')" style="max-width: 180px" v-model="state.queryForm.deptName"></el-input>
+						<el-input :placeholder="$t('sysdept.inputdeptNameTip')" style="max-width: 180px"
+							v-model="state.queryForm.deptName"></el-input>
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="filter">
@@ -16,28 +17,17 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="top-right-btn"
-						v-if="!defaultTreeViewRef"
-						v-auth="'sys_dept_add'"
-						@click="handleAdd"
-					>
+					<el-button icon="folder-add" type="primary" class="top-right-btn" v-if="!defaultTreeViewRef"
+						v-auth="'sys_dept_add'" @click="handleAdd">
 						{{ $t("common.addBtn") }}
 					</el-button>
-					<el-button plain icon="upload-filled" type="primary" class="ml10" @click="excelUploadRef.show()">
+					<el-button v-if="false" plain icon="upload-filled" type="primary" class="ml10"
+						@click="excelUploadRef.show()">
 						{{ $t("common.importBtn") }}
 					</el-button>
 					<el-button @click="handleExpand"> {{ $t("common.expandBtn") }}</el-button>
-					<right-toolbar
-						v-model:showSearch="showSearch"
-						:export="'sys_dept_add'"
-						@exportExcel="exportExcel"
-						class="ml10"
-						style="float: right; margin-right: 20px"
-						@queryTable="getDataList"
-					>
+					<right-toolbar v-model:showSearch="showSearch" :export="'sys_dept_add'" @exportExcel="exportExcel"
+						class="ml10" style="float: right; margin-right: 20px" @queryTable="getDataList">
 						<el-tooltip class="item" effect="dark" :content="$t('queryTree.view')" placement="top">
 							<el-button circle icon="Grid" @click="handleView"></el-button>
 						</el-tooltip>
@@ -48,13 +38,8 @@
 			<tree-view ref="treeViewRef" v-if="defaultTreeViewRef" />
 			<table-view ref="tableViewRef" v-if="!defaultTreeViewRef" />
 
-			<upload-excel
-				ref="excelUploadRef"
-				:title="$t('sysdept.importTip')"
-				url="/admin/dept/import"
-				temp-url="/admin/sys-file/local/file/dept.xlsx"
-				@refreshDataList="getDataList"
-			/>
+			<upload-excel ref="excelUploadRef" :title="$t('sysdept.importTip')" url="/admin/dept/import"
+				temp-url="/admin/sys-file/local/file/dept.xlsx" @refreshDataList="getDataList" />
 		</div>
 	</div>
 </template>

src/views/admin/system/dept/tree-view.vue

@@ -1,23 +1,9 @@
 <template>
 	<div style="height: 100%">
-		<vue3-tree-org
-			ref="treeOrgRef"
-			:props="props"
-			:data="data"
-			:label-style="style"
-			:define-menus="getMenus()"
-			:default-expand-level="expandLevel"
-			center
-			:horizontal="horizontal"
-			:collapsable="collapsable"
-			:only-one-node="onlyOneNode"
-			:filter-node-method="filterNodeMethod"
-			:clone-node-drag="cloneNodeDrag"
-			:node-add="addNode"
-			:node-delete="delNode"
-			:node-edit="editNode"
-			@on-node-click="onNodeClick"
-		/>
+		<vue3-tree-org ref="treeOrgRef" :props="props" :data="data" :label-style="style" :define-menus="getMenus()"
+			:default-expand-level="expandLevel" center :horizontal="horizontal" :collapsable="collapsable"
+			:only-one-node="onlyOneNode" :filter-node-method="filterNodeMethod" :clone-node-drag="cloneNodeDrag"
+			:node-add="addNode" :node-delete="delNode" :node-edit="editNode" @on-node-click="onNodeClick" />
 	</div>
 	<dept-form ref="deptDialogRef" @refresh="getOrgData()" />
 </template>

src/views/admin/system/role/form.vue

@@ -1,20 +1,18 @@
 <template>
-	<el-dialog :close-on-click-modal="false" :title="form.roleId ? $t('common.editBtn') : $t('common.addBtn')" width="600" draggable v-model="visible">
+	<el-dialog :close-on-click-modal="false" :title="form.roleId ? $t('common.editBtn') : $t('common.addBtn')"
+		width="600" draggable v-model="visible">
 		<el-form :model="form" :rules="dataRules" label-width="90px" ref="dataFormRef" v-loading="loading">
 			<el-form-item :label="$t('sysrole.roleName')" prop="roleName">
-				<el-input :placeholder="$t('sysrole.please_enter_a_role_name')" clearable v-model="form.roleName"></el-input>
+				<el-input :placeholder="$t('sysrole.please_enter_a_role_name')" clearable
+					v-model="form.roleName"></el-input>
 			</el-form-item>
 			<el-form-item :label="$t('sysrole.roleCode')" prop="roleCode">
-				<el-input :placeholder="$t('sysrole.please_enter_the_role_Code')" :disabled="form.roleId !== ''" clearable v-model="form.roleCode"></el-input>
+				<el-input :placeholder="$t('sysrole.please_enter_the_role_Code')" :disabled="form.roleId !== ''"
+					clearable v-model="form.roleCode"></el-input>
 			</el-form-item>
 			<el-form-item :label="$t('sysrole.roleDesc')" prop="roleDesc">
-				<el-input
-					maxlength="100"
-					:rows="3"
-					:placeholder="$t('sysrole.please_enter_the_role_description')"
-					type="textarea"
-					v-model="form.roleDesc"
-				></el-input>
+				<el-input maxlength="100" :rows="3" :placeholder="$t('sysrole.please_enter_the_role_description')"
+					type="textarea" v-model="form.roleDesc"></el-input>
 			</el-form-item>
 			<el-form-item :label="$t('sysrole.menu_authority')" prop="dsType">
 				<el-select :placeholder="$t('sysrole.please_select')" clearable v-model="form.dsType">
@@ -22,23 +20,16 @@
 				</el-select>
 			</el-form-item>
 			<el-form-item v-if="form.dsType === 1">
-				<el-tree
-					:check-strictly="true"
-					:data="dataForm.deptData"
-					:default-checked-keys="dataForm.checkedDsScope"
-					:props="dataForm.deptProps"
-					default-expand-all
-					highlight-current
-					node-key="id"
-					ref="deptTreeRef"
-					show-checkbox
-				/>
+				<el-tree :check-strictly="true" :data="dataForm.deptData"
+					:default-checked-keys="dataForm.checkedDsScope" :props="dataForm.deptProps" default-expand-all
+					highlight-current node-key="id" ref="deptTreeRef" show-checkbox />
 			</el-form-item>
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
 				<el-button @click="visible = false">{{ $t('common.cancelButtonText') }}</el-button>
-				<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t('common.confirmButtonText') }}</el-button>
+				<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t('common.confirmButtonText')
+				}}</el-button>
 			</span>
 		</template>
 	</el-dialog>
@@ -160,7 +151,7 @@ const onSubmit = async () => {
 		form.dsScope = '';
 	}
 
-	const valid = await dataFormRef.value.validate().catch(() => {});
+	const valid = await dataFormRef.value.validate().catch(() => { });
 	if (!valid) return false;
 
 	try {

src/views/admin/system/sys-user-transaction/form.vue

@@ -1,10 +1,12 @@
 <template>
 	<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px"
+			v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="调动用户" prop="userId">
-						<select-user v-model="form.userId" @change="(v: any) => { form.sourceDeptId = v?.deptId ?? null}" />
+						<select-user v-model="form.userId"
+							@change="(v: any) => { form.sourceDeptId = v?.deptId ?? null }" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
@@ -19,12 +21,13 @@
 				</el-col>
 				<el-col :span="24" class="mb20" v-if="form.bizType == '30'">
 					<el-form-item label="目标部门" prop="targetDeptId">
-						<select-dept v-model="form.targetDeptId" clearable />
+						<select-dept v-model="form.targetDeptId" dataScope="all" clearable />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="备注" prop="remark">
-						<el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :autosize="{ minRows: 6 }" />
+						<el-input v-model="form.remark" placeholder="请输入备注" type="textarea"
+							:autosize="{ minRows: 6 }" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -94,7 +97,7 @@ const openDialog = (id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 
 	try {

src/views/admin/system/user/form.vue

@@ -1,21 +1,19 @@
 <template>
 	<div class="system-user-dialog-container">
-		<el-dialog
-			:close-on-click-modal="false"
-			:title="dataForm.userId ? $t('common.editBtn') : $t('common.addBtn')"
-			draggable
-			v-model="visible"
-		>
+		<el-dialog :close-on-click-modal="false" :title="dataForm.userId ? $t('common.editBtn') : $t('common.addBtn')"
+			draggable v-model="visible">
 			<el-form :model="dataForm" :rules="dataRules" label-width="90px" ref="dataFormRef" v-loading="loading">
 				<el-row :gutter="20">
 					<el-col :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.username')" prop="username">
-							<el-input :disabled="dataForm.userId !== ''" placeholder="请输入用户名" v-model.trim="dataForm.username" />
+							<el-input :disabled="dataForm.userId !== '' && !auth('user_sysUser_editUsername')"
+								placeholder="请输入用户名" v-model.trim="dataForm.username" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.password')" prop="password">
-							<el-input clearable placeholder="请输入密码" type="password" v-model="dataForm.password"></el-input>
+							<el-input clearable placeholder="请输入密码" type="password"
+								v-model="dataForm.password"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12" class="mb20">
@@ -31,29 +29,25 @@
 					<el-col :span="12" v-if="!roleCodes.includes('DEPT_ADMIN')" class="mb20">
 						<el-form-item :label="$t('sysuser.role')" prop="role">
 							<el-select clearable multiple placeholder="请选择角色" v-model="dataForm.role">
-								<el-option :key="item.roleId" :label="item.roleName" :value="item.roleId" v-for="item in roleData" />
+								<el-option :key="item.roleId" :label="item.roleName" :value="item.roleId"
+									v-for="item in roleData" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12" v-if="!roleCodes.includes('DEPT_ADMIN')" class="mb20">
 						<el-form-item :label="$t('sysuser.post')" prop="post">
 							<el-select clearable multiple placeholder="请选择岗位" v-model="dataForm.post">
-								<el-option :key="item.postId" :label="item.postName" :value="item.postId" v-for="item in postData" />
+								<el-option :key="item.postId" :label="item.postName" :value="item.postId"
+									v-for="item in postData" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col v-if="!dataForm.userId" :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.dept')" prop="deptId">
-							<el-tree-select
-								:data="deptData"
+							<el-tree-select :data="deptData"
 								:props="{ value: 'id', label: 'name', children: 'children', disabled: 'isLock' }"
-								filterable
-								check-strictly
-								class="w100"
-								clearable
-								placeholder="请选择所属部门"
-								v-model="dataForm.deptId"
-							>
+								filterable check-strictly class="w100" clearable placeholder="请选择所属部门"
+								v-model="dataForm.deptId">
 								<template #default="{ node, data }">
 									<el-tooltip v-if="data.isLock" effect="dark" content="无数据权限" placement="right">
 										<span>
@@ -79,7 +73,9 @@
 					<el-col :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.lockFlag')" prop="lockFlag">
 							<el-radio-group v-model="dataForm.lockFlag">
-								<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag">{{ item.label }} </el-radio>
+								<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag">{{
+									item.label }}
+								</el-radio>
 							</el-radio-group>
 						</el-form-item>
 					</el-col>
@@ -88,7 +84,8 @@
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="visible = false">{{ $t("common.cancelButtonText") }}</el-button>
-					<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t("common.confirmButtonText") }}</el-button>
+					<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t("common.confirmButtonText")
+					}}</el-button>
 				</span>
 			</template>
 		</el-dialog>
@@ -105,6 +102,7 @@ import { useI18n } from "vue-i18n"
 import { useMessage } from "/@/hooks/message"
 import { rule } from "/@/utils/validate"
 import { useUserInfo } from "/@/stores/userInfo"
+import { auth } from "/@/utils/authFunction"
 
 const { t } = useI18n()
 
@@ -222,7 +220,7 @@ const openDialog = async (id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 
 	try {

src/views/admin/system/user/index.vue

@@ -1,16 +1,9 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree
-				ref="draggableDepTreeRef"
-				placeholder="请输入部门名称"
-				:show-expand="true"
-				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="包含"
-				switch-active-text="不包含"
-				:defaultTreeWidth="20"
-				:nodeClickable="false"
-			>
+			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
+				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
+				:defaultTreeWidth="20" :nodeClickable="false">
 				<template #default>
 					<el-row v-show="showSearch">
 						<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
@@ -37,31 +30,18 @@
 					</el-row>
 					<el-row>
 						<div class="mb8" style="width: 100%">
-							<el-button v-auth="'sys_user_add'" icon="folder-add" type="primary" @click="userDialogRef.openDialog()">新增</el-button>
-							<el-button plain v-auth="'sys_user_export'" class="ml10" icon="upload-filled" type="primary" @click="excelUploadRef.show()">
+							<el-button v-auth="'sys_user_add'" icon="folder-add" type="primary"
+								@click="userDialogRef.openDialog()">新增</el-button>
+							<el-button plain v-auth="'sys_user_export'" class="ml10" icon="upload-filled" type="primary"
+								@click="excelUploadRef.show()">
 								导入
 							</el-button>
-							<el-button
-								plain
-								v-auth="'sys_user_del'"
-								:disabled="multiple"
-								class="ml10"
-								icon="Delete"
-								type="primary"
-								@click="handleDelete(selectObjs)"
-							>
+							<el-button plain v-auth="'sys_user_del'" :disabled="multiple" class="ml10" icon="Delete"
+								type="primary" @click="handleDelete(selectObjs)">
 								删除
 							</el-button>
-							<el-button
-								plain
-								v-auth="'sys_user_del'"
-								v-if="activeName == '1'"
-								:disabled="multiple"
-								class="ml10"
-								icon="VideoPlay"
-								type="primary"
-								@click="doBatchDeal"
-							>
+							<el-button plain v-auth="'sys_user_del'" v-if="activeName == '1'" :disabled="multiple"
+								class="ml10" icon="VideoPlay" type="primary" @click="doBatchDeal">
 								审批
 							</el-button>
 							<div class="flex justify-between items-center">
@@ -69,26 +49,15 @@
 									<el-tab-pane v-for="v in tabItems" :key="v.id" :label="v.label" :name="v.value" />
 								</el-tabs>
 
-								<right-toolbar
-									v-model:showSearch="showSearch"
-									:export="'sys_user_export'"
-									@exportExcel="exportExcel"
-									@queryTable="getDataList"
-									class="ml10"
-									style="float: right"
-								/>
+								<right-toolbar v-model:showSearch="showSearch" :export="'sys_user_export'"
+									@exportExcel="exportExcel" @queryTable="getDataList" class="ml10"
+									style="float: right" />
 							</div>
 						</div>
 					</el-row>
-					<el-table
-						v-loading="state.loading"
-						:data="state.dataList"
-						@selection-change="handleSelectionChange"
-						row-key="userId"
-						border
-						:cell-style="tableStyle.cellStyle"
-						:header-cell-style="tableStyle.headerCellStyle"
-					>
+					<el-table v-loading="state.loading" :data="state.dataList" @selection-change="handleSelectionChange"
+						row-key="userId" border :cell-style="tableStyle.cellStyle"
+						:header-cell-style="tableStyle.headerCellStyle">
 						<el-table-column :selectable="handleSelectable" type="selection" width="40" />
 						<el-table-column label="#" type="index" width="60" fixed="left" />
 						<el-table-column label="用户名" prop="username" fixed="left" show-overflow-tooltip />
@@ -97,18 +66,15 @@
 						<el-table-column label="部门" prop="deptName" show-overflow-tooltip min-width="150" />
 						<el-table-column label="角色" show-overflow-tooltip min-width="150">
 							<template #default="scope">
-								<el-tag v-for="(item, index) in scope.row.roleList" :key="index">{{ item.roleName }}</el-tag>
+								<el-tag v-for="(item, index) in scope.row.roleList" :key="index">{{ item.roleName
+								}}</el-tag>
 							</template>
 						</el-table-column>
 						<el-table-column label="启用" show-overflow-tooltip min-width="150">
 							<template #default="{ row }">
-								<el-switch
-									:disabled="!auth('sys_user_edit') || row.processStatus != '2'"
-									v-model="row.lockFlag"
-									@change="changeSwitch(row)"
-									active-value="0"
-									inactive-value="9"
-								></el-switch>
+								<el-switch :disabled="!auth('sys_user_edit') || row.processStatus != '2'"
+									v-model="row.lockFlag" @change="changeSwitch(row)" active-value="0"
+									inactive-value="9"></el-switch>
 							</template>
 						</el-table-column>
 						<el-table-column label="人脸">
@@ -118,68 +84,44 @@
 						</el-table-column>
 						<el-table-column v-if="false" label="全局人脸" show-overflow-tooltip>
 							<template #default="{ row }">
-								<el-switch
-									:disabled="!auth('userFace_sysUserFace_global_face')"
-									v-if="row.isGlobalFace"
-									v-model="row.isGlobalFace"
-									@change="changeGlobalFaceSwitch(row)"
-									active-value="1"
-									inactive-value="0"
-								/>
+								<el-switch :disabled="!auth('userFace_sysUserFace_global_face')" v-if="row.isGlobalFace"
+									v-model="row.isGlobalFace" @change="changeGlobalFaceSwitch(row)" active-value="1"
+									inactive-value="0" />
 							</template>
 						</el-table-column>
 						<el-table-column label="所属商户" prop="merchantName" show-overflow-tooltip min-width="150" />
-						<el-table-column
-							v-auths="['sys_user_edit', 'userFace_sysUserFace_view', 'sys_user_del']"
-							label="操作"
-							min-width="300"
-							width="300"
-							fixed="right"
-						>
+						<el-table-column v-auths="['sys_user_edit', 'userFace_sysUserFace_view', 'sys_user_del']"
+							label="操作" min-width="300" width="300" fixed="right">
 							<template #default="{ row }">
 								<div style="display: flex; justify-content: center">
 									<!-- 重置密码 -->
-									<popover-input v-if="row.processStatus == '2'" v-model="inputPassword" @confirm="changePassword(row)">
+									<popover-input v-if="row.processStatus == '2'" v-model="inputPassword"
+										@confirm="changePassword(row)">
 										<template #default>
-											<el-button v-auth="'sys_user_edit'" icon="RefreshLeft" text type="primary" class="mr-4">密码</el-button>
+											<el-button v-auth="'sys_user_edit'" icon="RefreshLeft" text type="primary"
+												class="mr-4">密码</el-button>
 										</template>
 									</popover-input>
 									<!-- 修改信息 -->
-									<el-button
-										v-if="row.processStatus == '2'"
-										v-auth="'sys_user_edit'"
-										icon="edit-pen"
-										text
-										type="primary"
-										@click="userDialogRef.openDialog(row.userId)"
-									>
+									<el-button v-if="row.processStatus == '2'" v-auth="'sys_user_edit'" icon="edit-pen"
+										text type="primary" @click="userDialogRef.openDialog(row.userId)">
 										修改
 									</el-button>
 									<!-- 人脸管理 -->
-									<el-button
-										v-if="row.processStatus == '2'"
-										v-auth="'userFace_sysUserFace_view'"
-										icon="User"
-										text
-										type="primary"
-										@click="faceManageRef.openDialog(row.userId)"
-									>
+									<el-button v-if="row.processStatus == '2'" v-auth="'userFace_sysUserFace_view'"
+										icon="User" text type="primary" @click="faceManageRef.openDialog(row.userId)">
 										人脸管理
 									</el-button>
-									<el-button v-if="row.processStatus == 1" type="primary" size="small" link icon="VideoPlay" @click="deal(row)">
+									<el-button v-if="row.processStatus == 1" type="primary" size="small" link
+										icon="VideoPlay" @click="deal(row)">
 										开始处理
 									</el-button>
 									<!-- 删除用户 -->
 									<el-tooltip content="admin 不允许被删除" :disabled="row.userId !== '1'" placement="top">
 										<span style="margin-left: 12px">
-											<el-button
-												icon="delete"
-												v-auth="'sys_user_del'"
-												:disabled="row.username === 'admin'"
-												text
-												type="primary"
-												@click="handleDelete([row.userId])"
-											>
+											<el-button icon="delete" v-auth="'sys_user_del'"
+												:disabled="row.username === 'admin'" text type="primary"
+												@click="handleDelete([row.userId])">
 												删除
 											</el-button>
 										</span>
@@ -188,20 +130,16 @@
 							</template>
 						</el-table-column>
 					</el-table>
-					<pagination v-bind="state.pagination" @current-change="currentChangeHandle" @size-change="sizeChangeHandle" />
+					<pagination v-bind="state.pagination" @current-change="currentChangeHandle"
+						@size-change="sizeChangeHandle" />
 				</template>
 			</DraggableDepTree>
 		</div>
 
 		<user-form ref="userDialogRef" @refresh="getDataList(false)" :deptId="state.queryForm.deptId" />
 		<face-manage ref="faceManageRef" @refresh="getDataList(false)" />
-		<upload-excel
-			ref="excelUploadRef"
-			title="用户导入"
-			temp-url="/admin/sys-file/local/file/user.xlsx"
-			url="/admin/user/import-face"
-			@refreshDataList="getDataList"
-		/>
+		<upload-excel ref="excelUploadRef" title="用户导入" temp-url="/admin/sys-file/local/file/user.xlsx"
+			url="/admin/user/import-face" @refreshDataList="getDataList" />
 
 		<!-- 审批抽屉 -->
 		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
@@ -307,7 +245,13 @@ const taskSubmitEvent = () => {
 
 // 导出excel
 const exportExcel = () => {
-	postDownBlobFile("/admin/user/export", Object.assign(state.queryForm, { ids: selectObjs }), "用户管理.xlsx")
+	const _data = { ...state.queryForm }
+	if (_data.role) {
+		_data.role = [_data.role]
+	} else {
+		_data.role = []
+	}
+	postDownBlobFile("/admin/user/export", Object.assign(_data, { ids: selectObjs }), "用户管理.xlsx")
 }
 
 // 是否可以多选

src/views/wallet/wallet-recharge-apply/form.vue

@@ -12,8 +12,10 @@
 
 				<el-col :span="24" class="mb20">
 					<el-form-item label="充值类型" prop="bizType">
-						<dict-select v-model="form.bizType" dict-code="wallet_biz_recharge"
-							:hide-ids="[roleCodes.includes('RETURN_CANTEEN') ? '' : '3']" placeholder="请选择饭卡类型" />
+						<!-- :hide-ids="[(roleCodes.includes('RETURN_CANTEEN') || auths(['wallet_walletRechargeApply_refund'])) ? '' : '3', auths(['wallet_walletRechargeApply_select_jz']) ? '' : '2', '1']" -->
+						<dict-select v-model="form.bizType" :disabled="form.invoiceId" dict-code="wallet_biz_recharge"
+							:hide-ids="[(roleCodes.includes('RETURN_CANTEEN') || auths(['wallet_walletRechargeApply_refund'])) ? '' : '3', auths(['wallet_walletRechargeApply_select_jz']) ? '' : '2']"
+							placeholder="请选择饭卡类型" />
 					</el-form-item>
 				</el-col>
 
@@ -27,7 +29,9 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col v-if="roleCodes.includes('RETURN_CANTEEN') && form.bizType == 3" :span="24" class="mb20">
+				<el-col
+					v-if="(roleCodes.includes('RETURN_CANTEEN') || auths(['wallet_walletRechargeApply_refund'])) && form.bizType == 3"
+					:span="24" class="mb20">
 					<el-form-item prop="isAuthorization">
 						<template #label>
 							<span>授权</span>
@@ -66,6 +70,7 @@ const emit = defineEmits(["refresh"])
 import { getWalletTypeSimple } from "/@/api/wallet/wallet-type"
 import { useUserInfo } from "/@/stores/userInfo"
 import { formatDate } from "/@/utils/formatTime"
+import { auths } from "/@/utils/authFunction"
 
 // 定义查询字典
 const { yes_no_type } = useDict("yes_no_type")

src/views/wallet/wallet-recharge-apply/index.vue

@@ -31,7 +31,11 @@
 			</el-form>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()"
+					<el-button v-if="false" icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()"
+						v-auth="'wallet_walletRechargeApply_add'">
+						导 入（发票）
+					</el-button>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef1.show()"
 						v-auth="'wallet_walletRechargeApply_add'">
 						导 入
 					</el-button>
@@ -39,7 +43,6 @@
 						v-auth="'wallet_walletRechargeApply_del'" @click="handleDelete(selectObjs)">
 						删除
 					</el-button>
-
 					<div class="flex justify-between items-center">
 						<el-tabs class="flex-1" v-model="activeName" @tab-click="handleClickTabItem">
 							<el-tab-pane v-for="v in tabItems" :key="v.id" :label="v.label" :name="v.value" />
@@ -72,6 +75,11 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="deptName" width="200" label="部门" />
+				<el-table-column prop="importTime" width="100" label="操作金额">
+					<template #default="{ row }">
+						{{ displayPrice(row.totalPrice) }}
+					</template>
+				</el-table-column>
 				<el-table-column prop="importTime" width="100" label="充值月">
 					<template #default="{ row }">
 						{{ row.importTime?.substring(0, 7) }}
@@ -139,7 +147,13 @@
 		<!-- 编辑、新增  -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 
-		<upload-excel ref="uploadExcelRef" title="用户信息导入" url="/wallet/wallet-recharge-apply/read-excel"
+		<upload-excel ref="uploadExcelRef" title="充值导入" url="/wallet/wallet-recharge-apply/read-excel"
+			temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx" @refreshDataList="getDataList(false)" />
+
+		<upload-excel ref="uploadExcelRef1" title="充值导入" url="/wallet/wallet-recharge-apply/read-excel"
+			temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx" @refreshDataList="getDataList(false)" />
+
+		<upload-excel1 ref="uploadExcelRef1" title="充值导入" url="/wallet/wallet-recharge-apply/read-excel"
 			temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx" @refreshDataList="getDataList(false)" />
 
 		<!-- 审批抽屉 -->
@@ -157,10 +171,17 @@ import ProcessDrawer from "/@/components/processDrawer/index.vue"
 import { getDicts } from "/@/api/admin/dict"
 import { useUserInfo } from "/@/stores/userInfo"
 
+// ----------------------------------------------------------------
+import UploadExcel1 from "/@/components/Upload/Excel.vue"
+import { displayPrice } from "/@/utils/formatMoney"
+const uploadExcelRef1 = ref()
+// ----------------------------------------------------------------
+
 const { push } = useRouter()
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const UploadExcel = defineAsyncComponent(() => import("./upload-excel.vue"))
 // 定义查询字典
 const { wallet_biz_recharge, wallet_type, check_status } = useDict("wallet_biz_recharge", "wallet_type", "check_status")
 // store

src/views/wallet/wallet-recharge-apply/preview-excel.vue

@@ -9,7 +9,7 @@
 			</el-row>
 			<el-table :data="data.list" v-loading="state.loading" border :header-cell-style="tableStyle.headerCellStyle"
 				show-summary :summary-method="getSummaries">
-				<el-table-column type="index" label="#" align="center" />
+				<el-table-column type="index" label="#" width="250" align="center" />
 				<el-table-column prop="username" label="用户" align="center" />
 				<el-table-column prop="userMobile" label="手机号" align="center" />
 				<el-table-column prop="bizType" label="充值类型" align="center">
@@ -24,39 +24,6 @@
 						<div v-if="row.afterBalance < 0" class="color-danger">(余额不足记账扣款)</div>
 					</template>
 				</el-table-column>
-				<!-- <slot>
-					<el-table-column v-if="data.tableList && data.tableList.length" :prop="v"
-						v-for="(v, i) in data.tableList" :key="i" align="center" min-width="250">
-						<template #header>
-							<div>
-								{{ data.tableListStr[i] }}
-							</div>
-						</template>
-						<template #default="{ row }">
-							<div class="change">
-								<div v-if="row[`${v}_price`] >= 0" class="change_price">{{
-									displayPrice(row[`${v}_price`]) }}</div>
-								<div v-else class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div>
-								<div class="change_text">
-									<div v-if="row[`${v}_transaction_price`]">
-										<span>对比上月</span>
-										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']"
-											style="margin-left: 5px">
-											{{ displayPrice(row[`${v}_transaction_price`]) }}
-										</span>
-									</div>
-									<div v-if="row[`${v}_transaction_percent`]">
-										<span>对比上月</span>
-										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']"
-											style="margin-left: 5px">
-											{{ row[`${v}_transaction_percent`] }}%
-										</span>
-									</div>
-								</div>
-							</div>
-						</template>
-					</el-table-column>
-				</slot> -->
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
 				v-bind="state.pagination" />

src/views/wallet/wallet-recharge-apply/upload-excel.vue

@@ -0,0 +1,207 @@
+<!-- excel 导入组件 -->
+<template>
+	<el-dialog :title="prop.title" v-model="state.upload.open" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px">
+			<el-form-item label="充值类型" prop="bizType" class="mb20">
+				<dict-select v-model="form.bizType" dict-code="wallet_biz_recharge" :hide-ids="[
+					roleCodes.includes('RETURN_CANTEEN') || auths(['wallet_walletRechargeApply_refund']) ? '' : '3',
+					auths(['wallet_walletRechargeApply_select_jz']) ? '' : '2',
+				]" placeholder="请选择充值类型" />
+			</el-form-item>
+
+			<el-form-item v-if="form.bizType == '1'" label="发票" prop="invoiceId" class="mb20">
+				<select-wallet-invoice v-model="form.invoiceId" />
+			</el-form-item>
+			<el-upload v-else v-loading="state.upload.isUploading" ref="uploadRef" :limit="1" accept=".xlsx, .xls"
+				:data="{ bizType: form.bizType }" :headers="headers" :action="baseURL + other.adaptationUrl(url)"
+				:disabled="state.upload.isUploading" :on-progress="handleFileUploadProgress"
+				:on-success="handleFileSuccess" :on-error="handleFileError" :auto-upload="false" drag>
+				<i class="el-icon-upload"></i>
+				<div class="el-upload__text">
+					{{ $t("excel.operationNotice") }}
+					<em>{{ $t("excel.clickUpload") }}</em>
+				</div>
+				<template #tip>
+					<div class="el-upload__tip text-center">
+						<span>{{ $t("excel.fileFormat") }}</span>
+						<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+							@click="downExcelTemp" v-if="tempUrl">{{ $t("excel.downloadTemplate") }}
+						</el-link>
+					</div>
+				</template>
+			</el-upload>
+		</el-form>
+
+		<template #footer>
+			<el-button type="primary" @click="submitFileForm" :disabled="state.upload.isUploading">
+				{{ $t("common.confirmButtonText") }}
+			</el-button>
+			<el-button @click="state.upload.open = false">{{ $t("common.cancelButtonText") }}</el-button>
+		</template>
+	</el-dialog>
+
+	<!--校验失败错误数据-->
+	<el-dialog :title="$t('excel.validationFailureData')" v-model="state.errorVisible" :close-on-click-modal="false"
+		draggable>
+		<el-table :data="state.errorData">
+			<el-table-column property="lineNum" align="center" :label="$t('excel.lineNumbers')" width="100" />
+			<el-table-column property="errors" align="center" :label="$t('excel.misDescription')" show-overflow-tooltip>
+				<template v-slot="scope">
+					<el-tag type="danger" v-for="error in scope.row.errors" :key="error">{{ error }}</el-tag>
+				</template>
+			</el-table-column>
+		</el-table>
+	</el-dialog>
+</template>
+
+<script setup lang="ts" name="upload-excel">
+import { useMessage } from "/@/hooks/message"
+import { useUserInfo } from "/@/stores/userInfo"
+import other from "/@/utils/other"
+import { Session } from "/@/utils/storage"
+import { auths } from "/@/utils/authFunction"
+import * as walletRechargeApplyApi from "/@/api/wallet/wallet-recharge-apply"
+
+const {
+	userInfos: { roleCodes },
+} = useUserInfo()
+
+const emit = defineEmits(["sizeChange", "refreshDataList"])
+const prop = defineProps({
+	url: {
+		type: String,
+	},
+	title: {
+		type: String,
+	},
+	tempUrl: {
+		type: String,
+	},
+})
+
+const uploadRef = ref()
+const dataFormRef = ref()
+const form = reactive({
+	bizType: "1",
+	invoiceId: "",
+})
+const dataRules = ref({
+	bizType: [{ required: true, message: "请选择充值类型", trigger: "change" }],
+	invoiceId: [{ required: true, message: "请选择发票", trigger: "change" }],
+})
+
+const state = reactive({
+	errorVisible: false,
+	errorData: [],
+	dialog: {
+		title: "",
+		isShowDialog: false,
+	},
+	upload: {
+		open: false,
+		isUploading: false,
+	},
+})
+
+/**
+ * 下载模板文件
+ */
+const downExcelTemp = async () => {
+	try {
+		await other.downBlobFile(other.adaptationUrl(prop.tempUrl), {}, "temp.xlsx")
+	} catch (error) {
+		useMessage().error("模板下载失败，请先维护模板文件")
+	}
+}
+
+/**
+ * 上传进度条变化事件
+ */
+const handleFileUploadProgress = () => {
+	state.upload.isUploading = true
+}
+
+/**
+ * 上传失败事件处理
+ */
+const handleFileError = () => {
+	useMessage().error("上传失败,数据格式不合法!")
+	state.upload.open = false
+}
+
+/**
+ * 上传成功事件处理
+ * @param {any} response - 上传成功的响应结果
+ */
+const handleFileSuccess = (response: any) => {
+	state.upload.isUploading = false
+	state.upload.open = false
+	uploadRef.value.clearFiles()
+
+	// 校验失败
+	if (response.code === 1) {
+		useMessage().error(response.msg ? response.msg : "导入失败，以下数据不合法")
+		state.errorVisible = true
+		state.errorData = response.data?.errors
+		if (!state.errorData && response.data) {
+			state.errorData = response.data
+		}
+		uploadRef.value.clearFiles()
+		// 刷新表格
+		emit?.("refreshDataList")
+	} else {
+		useMessage().success(response.msg ? response.msg : "导入成功")
+		// 刷新表格
+		emit?.("refreshDataList")
+	}
+}
+
+/**
+ * 提交表单，触发上传
+ */
+const submitFileForm = async () => {
+	if (form.bizType != "1") {
+		uploadRef.value.submit()
+		return
+	}
+	const valid = await dataFormRef.value.validate().catch(() => { })
+	if (!valid) return
+	try {
+		state.upload.isUploading = true
+		await walletRechargeApplyApi.saveTopup({ ...form })
+		state.upload.open = false
+		useMessage().success("导入成功充值")
+		emit?.("refreshDataList")
+	} catch (error: any) {
+		console.error(error);
+		useMessage().error(error.msg || "新增充值数据错误")
+	} finally {
+		state.upload.isUploading = false
+	}
+}
+
+/**
+ * 显示上传文件对话框，并清除上传信息
+ */
+const show = () => {
+	form.bizType = "1"
+	form.invoiceId = ""
+	state.upload.isUploading = false
+	state.upload.open = true
+}
+
+/**
+ * 计算请求头部信息
+ */
+const headers = computed(() => {
+	return {
+		Authorization: "Bearer " + Session.getToken(),
+		"TENANT-ID": Session.getTenant(),
+	}
+})
+
+// 暴露变量
+defineExpose({
+	show,
+})
+</script>

src/views/wallet/wallet-recharge-invoice/form.vue

@@ -0,0 +1,152 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="12" class="mb20">
+          <el-form-item label="申请id" prop="applyId">
+            <el-input v-model="form.applyId" placeholder="请输入申请id" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="发票代码(七位数)" prop="code">
+            <el-input v-model="form.code" placeholder="请输入发票代码(七位数)" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="发票日期" prop="time">
+            <el-input v-model="form.time" placeholder="请输入发票日期" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="交款单位或个人" prop="deptOrUser">
+            <el-input v-model="form.deptOrUser" placeholder="请输入交款单位或个人" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="合计人民币" prop="totalPrice">
+            <el-input v-model="form.totalPrice" placeholder="请输入合计人民币" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="收款单位" prop="payeeDept">
+            <el-input v-model="form.payeeDept" placeholder="请输入收款单位" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="收款人" prop="payeeUser">
+            <el-input v-model="form.payeeUser" placeholder="请输入收款人" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="状态" prop="status">
+            <el-input v-model="form.status" placeholder="请输入状态" />
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="WalletRechargeInvoiceDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from "/@/api/wallet/wallet-recharge-invoice";
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  applyId: '',
+  code: '',
+  time: '',
+  deptOrUser: '',
+  totalPrice: '',
+  payeeDept: '',
+  payeeUser: '',
+  remark: '',
+  status: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取walletRechargeInvoice信息
+  if (id) {
+    form.id = id
+    getwalletRechargeInvoiceData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await putObj(form) : await addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getwalletRechargeInvoiceData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/wallet/wallet-recharge-invoice/index.vue

@@ -0,0 +1,197 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form v-show="showSearch" ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row>
+					<el-form-item style="width: 300px" label="申请用户" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" placeholder="申请用户" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="发票状态" prop="userIds">
+						<dict-select v-model="state.queryForm.status" dict-code="recharge_invoice_status" />
+					</el-form-item>
+					<el-form-item style="width: 450px" label="创建时间" prop="createTimeList">
+						<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-row>
+			</el-form>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()" v-auth="'wallet_walletRechargeApply_add'">
+						导 入
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'wallet_walletRechargeInvoice_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="code" label="发票编号" />
+				<el-table-column prop="time" label="发票日期">
+					<template #default="{ row }">
+						{{ parseTime(row.time, "{y}-{m}-{d}") }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="deptOrUser" label="交款单位或个人" />
+				<el-table-column prop="totalPrice" label="合计人民币">
+					<template #default="{ row }">
+						{{ displayPrice(row.totalPrice) }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="payeeUser" label="收款人" />
+				<el-table-column prop="payeeDept" label="收款单位" />
+				<el-table-column prop="status" label="发票状态">
+					<template #default="{ row }">
+						<dict-tag :options="recharge_invoice_status" :value="row.status" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="payeeDept" label="发票下载">
+					<template #default="{ row }">
+						<preview-image :src="row.picUrl" download :downloadName="`${row.deptOrUser}-${row.payeeDept}-发票-${row.updateTime}`" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="remark" label="备注" />
+				<el-table-column label="操作" width="200" fixed="right">
+					<template #default="{ row }">
+						<!-- <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletRechargeInvoice_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button> -->
+						<!-- v-if="['1'].includes(row.processStatus)" -->
+						<el-button
+							v-auth="'wallet_walletRechargeApply_print'"
+							icon="printer"
+							text
+							type="primary"
+							:loading="getReceiptDataLoading"
+							@click="previewInvoice(row)"
+						>
+							查看发票
+						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_walletRechargeInvoice_del'" @click="handleDelete([row.id])">
+							删除
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+
+		<upload-excel
+			ref="uploadExcelRef"
+			title="导入"
+			url="/wallet/wallet-recharge-apply/read-topup-excel"
+			temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx"
+			@refreshDataList="getDataList(false)"
+		/>
+
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+		<!-- 发票预览 -->
+		<print-dialog ref="printDialogRef" @refresh="getDataList(false)" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemWalletRechargeInvoice">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/wallet/wallet-recharge-invoice"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { displayPrice } from "/@/utils/formatMoney"
+import { parseTime } from "/@/utils/formatTime"
+import { useDict } from "/@/hooks/dict"
+import { getObj } from "/@/api/wallet/wallet-recharge-invoice"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const PrintDialog = defineAsyncComponent(() => import("./print-dialog.vue"))
+
+const { recharge_invoice_status } = useDict("recharge_invoice_status")
+// 定义变量内容
+const formDialogRef = ref()
+const uploadExcelRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: fetchList,
+})
+const printDialogRef = ref()
+const getReceiptDataLoading = ref(false)
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/wallet/walletRechargeInvoice/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargeInvoice.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+
+// 预览发票
+const previewInvoice = async (row: any) => {
+	try {
+		getReceiptDataLoading.value = true
+		if (!row.id) return useMessage().error("发票ID不存在")
+		const res = await getObj(row.id)
+		if (res.code == 0 && printDialogRef.value) return printDialogRef.value.openDialog(res.data, res.data.id)
+		return useMessage().error(res.data.msg || "获取发票信息失败")
+	} catch (error: any) {
+		useMessage().error(error.msg)
+	} finally {
+		getReceiptDataLoading.value = false
+	}
+}
+</script>

src/views/wallet/wallet-recharge-invoice/print-dialog.vue

@@ -0,0 +1,324 @@
+<template>
+	<el-dialog v-model="visible" title="预览" width="800px" :close-on-click-modal="false" draggable destroy-on-close>
+		<div 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;") }}
+				</div>
+				<span>
+					<span>No. </span>
+					<span class="text-xl text-red-500">{{ receiptData.code || "0000000" }}</span>
+				</span>
+			</div>
+
+			<div class="flex justify-center relative">
+				<table class="w-[15cm] h-[6cm] border-collapse text-center text-sm">
+					<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"
+							/>
+						</td>
+					</tr>
+					<tr>
+						<td class="border border-gray-600 px-2 h-[0.75cm]" colspan="4">款项内容</td>
+						<td class="border border-gray-600 px-2 h-[0.75cm]">金额</td>
+					</tr>
+					<tr v-for="(item, index) in 3" :key="index">
+						<td class="border border-gray-600 px-2 h-[0.75cm] text-sm text-blue-800" colspan="4">
+							<!-- <input type="text" v-model="receiptDataItems[index].name" class="w-full h-full bg-transparent" /> -->
+							{{ receiptDataItems[index].name }}
+						</td>
+						<td class="border border-gray-600 px-2 h-[0.75cm] text-sm text-blue-800">
+							<!-- <input type="text" v-model="receiptDataItems[index].price" class="w-full h-full bg-transparent" /> -->
+							{{ receiptDataItems[index].price }}
+						</td>
+					</tr>
+					<tr>
+						<td class="border border-gray-600 px-2 text-left h-[0.75cm]" colspan="4">
+							<div class="flex items-center">
+								<span class="whitespace-nowrap">合计人民币（大写）：</span>
+								<!-- <input type="text" v-model="receiptData.totalPriceCnStr" class="text-sm text-blue-800 w-full h-full bg-transparent" /> -->
+								<span class="text-sm text-blue-800">{{ receiptData.totalPriceCnStr }}</span>
+							</div>
+						</td>
+						<td class="border border-gray-600 px-2 text-left h-[0.75cm]">
+							<div class="flex items-center">
+								<span>￥：</span>
+								<!-- <input type="text" v-model="totalPrice" class="text-sm text-blue-800 w-full h-full bg-transparent" /> -->
+								<span class="text-sm text-blue-800">{{ totalPrice }}</span>
+							</div>
+						</td>
+					</tr>
+					<tr class="relative">
+						<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.picUrl"
+								class="w-[2.5cm] h-[2.5cm] absolute -top-2 left-[140px]"
+								:class="{ stamping: isStamping }"
+								draggable="false"
+								style="-webkit-user-drag: none; user-select: none; pointer-events: none"
+								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">
+							<!-- <input type="text" v-model="receiptData.payeeUser" class="w-full h-full bg-transparent" /> -->
+							{{ receiptData.payeeUser }}
+						</td>
+						<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"
+									class="flex-1 text-sm text-blue-800 w-full h-full my-1 bg-transparent resize-none overflow-y-hidden"
+								/>
+							</div>
+						</td>
+					</tr>
+				</table>
+				<div class="flex items-center absolute bottom-0 top-0 right-0">
+					<span class="text-gray-500 text-sm whitespace-nowrap" style="writing-mode: vertical-rl; letter-spacing: 0.2em">
+						{{ "第一联 存根联".replace(/ /g, "&nbsp;&nbsp;&nbsp;&nbsp;") }}
+					</span>
+				</div>
+			</div>
+		</div>
+
+		<div class="h-6">
+			<el-progress
+				:percentage="progressPercent"
+				v-if="progressPercent > 30"
+				:stroke-width="6"
+				status="success"
+				striped
+				striped-flow
+				:duration="20"
+			/>
+		</div>
+
+		<template #footer>
+			<el-button @click="handleClose" :disabled="loading">关闭</el-button>
+			<el-button v-auth="'wallet_walletRechargeApply_receiptStamp'" type="primary" @click="stampReceipt" :disabled="loading">
+				盖章
+			</el-button>
+			<el-button v-auth="'wallet_walletRechargeApply_receiptSave'" type="primary" @click="saveReceipt" :disabled="loading">保存</el-button>
+			<el-button v-if="receiptData.picUrl" type="primary" @click="handlePrint" :disabled="loading">打印</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from "vue"
+import * as htmlToImage from "html-to-image"
+// import { toPng, toJpeg, toBlob, toPixelData, toSvg } from "html-to-image"
+import { useMessage } from "/@/hooks/message"
+import request from "/@/utils/request"
+import { formatDate } from "/@/utils/formatTime"
+import { displayPrice } from "/@/utils/formatMoney"
+import printJS from "print-js"
+import { bindInvoice } from "/@/api/wallet/wallet-recharge-invoice"
+
+const emit = defineEmits(["refresh"])
+
+interface ReceiptData {
+	itemJson: string
+	code: string
+	time: string
+	deptOrUser: string
+	totalPrice: string
+	payeeDept: string
+	payeeUser: string
+	remark: string
+	totalPriceCnStr: string
+	picUrl: string
+}
+
+const visible = ref(false)
+const loading = ref(false)
+const receiptRef = ref<HTMLElement | null>(null)
+const deptOrUserInput = ref<HTMLInputElement | null>(null)
+let timer = null
+const isStamping = ref(false) // 盖章动画开关
+const receiptData = ref<ReceiptData>({
+	itemJson: "", // 款项json
+	code: "", // 发票代码(七位数)
+	time: "", // 发票日期
+	deptOrUser: "", // 交款单位或个人
+	totalPrice: "", // 合计人民币
+	totalPriceCnStr: "", // 合计人民币大写
+	payeeDept: "", // 收款单位
+	payeeUser: "", // 开票人
+	remark: "", // 备注
+	picUrl: "", // 发票图片地址
+})
+const applyId = ref<string>()
+const progressPercent = ref(30)
+const receiptDataItems = computed(() => {
+	try {
+		const itemJson = JSON.parse(receiptData.value.itemJson)
+		while (itemJson.length < 3) {
+			itemJson.push({ name: "", price: "" })
+		}
+		return itemJson
+	} catch (error) {
+		return new Array(3).fill({ name: "", price: "" })
+	}
+})
+const totalPrice = computed(() => displayPrice(receiptData.value.totalPrice))
+
+const openDialog = (data: ReceiptData, id: string) => {
+	visible.value = true
+	receiptData.value = data
+	applyId.value = id
+	isStamping.value = false
+	timer = setTimeout(() => {
+		deptOrUserInput.value?.focus()
+	}, 50)
+}
+
+const handleClose = () => {
+	visible.value = false
+	timer = null
+}
+
+// 生成图片并上传
+const genImageUpload = async (): Promise<string | void> => {
+	if (receiptRef.value) {
+		const blob = await htmlToImage.toBlob(receiptRef.value, {
+			canvasWidth: 661.5,
+			canvasHeight: 359.1,
+			backgroundColor: "#ffffff",
+			pixelRatio: 6,
+		})
+		if (blob) {
+			try {
+				loading.value = true
+				const formData = new FormData()
+				formData.append("file", blob, "receipt.png")
+				const { code, data } = await request({
+					url: "/admin/sys-file/upload",
+					method: "post",
+					headers: {
+						"Content-Type": "multipart/form-data",
+					},
+					data: formData,
+					onUploadProgress: (progressEvent: any) => {
+						if (progressEvent.lengthComputable) {
+							progressPercent.value = Math.round((progressEvent.loaded * 100) / progressEvent.total)
+						}
+					},
+				})
+				if (code == 0) {
+					useMessage().success("盖章成功")
+					return data.url
+				}
+				useMessage().error(data.msg || "上传失败")
+			} catch (error) {
+				useMessage().error(error as string)
+			} finally {
+				loading.value = false
+				progressPercent.value = 30
+				isStamping.value = false
+			}
+		}
+	}
+}
+
+// 盖章并上传发票图片并保存
+const stampReceipt = () => {
+	loading.value = true
+	isStamping.value = true
+
+	timer = setTimeout(async () => {
+		const url = await genImageUpload()
+		if (url) {
+			receiptData.value.picUrl = url
+			await saveReceipt()
+		}
+	}, 1010)
+}
+
+// 保存发票
+const saveReceipt = async () => {
+	try {
+		loading.value = true
+		const { code, data } = await bindInvoice({
+			...receiptData.value,
+			deptOrUser: receiptData.value.deptOrUser,
+			applyId: applyId.value,
+		})
+		if (code == 0) {
+			emit("refresh")
+			// visible.value = false
+			return useMessage().success("保存成功")
+		}
+		useMessage().error(data.msg || "保存失败")
+	} catch (err) {
+		useMessage().error(err as string)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 打印
+const handlePrint = async () => {
+	if (receiptRef.value) {
+		const pngBase64 = await htmlToImage.toPng(receiptRef.value, {
+			canvasWidth: 661.5,
+			canvasHeight: 359.1,
+			pixelRatio: 10,
+			backgroundColor: "#ffffff",
+		})
+		printJS({ printable: pngBase64, type: "image", targetStyles: ["*"], maxWidth: 661.5 })
+	}
+}
+
+defineExpose({
+	openDialog,
+})
+</script>
+
+<style scoped>
+@media print {
+	@page {
+		/* size: 210mm 297mm; */
+		/* size: A4 landscape; */
+		size: A4;
+	}
+
+	input {
+		border: none;
+		box-shadow: none;
+		outline: none;
+	}
+}
+
+.stamping {
+	animation: stamp-in 1s;
+}
+@keyframes stamp-in {
+	0% {
+		transform: translateY(-100px) scale(2) rotate(0);
+		opacity: 0.2;
+	}
+	60% {
+		transform: translateY(-10px) scale(1.5) rotate(0);
+		opacity: 1;
+	}
+	100% {
+		transform: translateY(0) scale(1) rotate(0);
+		opacity: 1;
+	}
+}
+</style>

src/views/wallet/wallet-setting/components/extra-price/index.vue

@@ -3,43 +3,28 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<div class="flex justify-center flex-col">
 				<div>
-					<el-form ref="dataFormRef" label-width="120px" :model="form" :rules="dataRules" formDialogRef v-loading="loading">
+					<el-form ref="dataFormRef" label-width="120px" :model="form" :rules="dataRules" formDialogRef
+						v-loading="loading">
 						<el-row :gutter="24">
 							<el-col :span="24" class="mb20">
 								<el-form-item label="每一餐的上限" prop="payAmountEnable">
-									<el-switch
-										:disabled="!auth('wallet_setting_edit')"
-										active-value="1"
-										inactive-value="0"
-										v-model="form.payAmountEnable"
-										active-text="开启"
-										inactive-text="关闭"
-										inline-prompt
-									/>
+									<el-switch :disabled="!auth('wallet_setting_edit')" active-value="1"
+										inactive-value="0" v-model="form.payAmountEnable" active-text="开启"
+										inactive-text="关闭" inline-prompt />
 								</el-form-item>
 							</el-col>
 							<el-col :span="24" class="mb20">
 								<el-form-item label="每一餐的上限" prop="payAmountMealLimit">
-									<el-input
-										:disabled="!auth('wallet_setting_edit')"
-										style="width: 300px"
-										type="number"
-										v-model="form.payAmountMealLimit"
-										placeholder="请输入上限金额"
-									>
+									<el-input :disabled="!auth('wallet_setting_edit')" style="width: 300px"
+										type="number" v-model="form.payAmountMealLimit" placeholder="请输入上限金额">
 										<template #append>元</template>
 									</el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="24" class="mb20">
 								<el-form-item label="倍数" prop="payAmountMealTimes">
-									<el-input
-										:disabled="!auth('wallet_setting_edit')"
-										style="width: 300px"
-										type="number"
-										v-model="form.payAmountMealTimes"
-										placeholder="请输入倍数"
-									>
+									<el-input :disabled="!auth('wallet_setting_edit')" style="width: 300px"
+										type="number" v-model="form.payAmountMealTimes" placeholder="请输入倍数">
 										<template #append>倍</template>
 									</el-input>
 								</el-form-item>
@@ -79,12 +64,12 @@ const dataRules = ref({
 })
 
 onMounted(() => {
-	getwalletRechargePackageData("1")
+	getwalletRechargePackageData()
 })
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 
 	try {
@@ -103,7 +88,7 @@ const onSubmit = async () => {
 }
 
 // 初始化表单数据
-const getwalletRechargePackageData = (id: string) => {
+const getwalletRechargePackageData = () => {
 	// 获取数据
 	loading.value = true
 	getObj()

src/views/wallet/wallet-setting/components/wallet-recharge/index.vue

@@ -0,0 +1,84 @@
+<template>
+	<div class="w-full">
+		<div class="layout-padding-auto layout-padding-view">
+			<div>
+				<el-form ref="dataFormRef" label-width="120px" :model="form" :rules="dataRules" formDialogRef
+					v-loading="loading">
+					<el-row :gutter="24">
+						<el-col :span="24" class="mb20">
+							<el-form-item label="充值收款单位" prop="topupDeptStr">
+								<el-input :disabled="!auth('wallet_setting_edit')" style="width: 300px"
+									v-model="form.topupDeptStr" placeholder="请输入充值收款单位">
+								</el-input>
+							</el-form-item>
+							<el-form-item label="充值收款人" prop="topupUserId">
+								<select-user :disabled="!auth('wallet_setting_edit')" style="width: 300px"
+									v-model="form.topupUserId" placeholder="请选择充值收款人">
+								</select-user>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</div>
+			<div class="flex items-center" v-auth="'wallet_setting_edit'">
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup lang="ts" name="WalletRecharge">
+import { useMessage } from "/@/hooks/message"
+import { auth } from "/@/utils/authFunction"
+import { getObj, putObj } from "/@/api/wallet/wallet-setting"
+
+onMounted(() => {
+	getwalletRechargeData()
+})
+
+// 定义变量内容
+const dataFormRef = ref()
+const loading = ref(false)
+
+// 提交表单数据
+const form = reactive({
+	id: undefined,
+	topupDeptStr: undefined,
+	topupUserId: undefined,
+})
+// 定义校验规则
+const dataRules = ref({
+	topupDeptStr: [{ required: true, message: "请输入充值收款单位", trigger: "blur" }],
+	topupUserId: [{ required: true, message: "请选择充值收款人", trigger: "change" }],
+})
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => { })
+	if (!valid) return false
+	try {
+		loading.value = true
+		const pa = {
+			...form,
+		}
+		await putObj(pa)
+		useMessage().success("修改成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 初始化表单数据
+const getwalletRechargeData = () => {
+	// 获取数据
+	loading.value = true
+	getObj()
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+</script>

src/views/wallet/wallet-setting/index.vue

@@ -16,6 +16,7 @@
 				<off-line v-if="activeName == 50" />
 				<third-zy v-if="activeName == 60" />
 				<user-setting v-if="activeName == 70" />
+				<wallet-recharge v-if="activeName == 80" />
 			</div>
 		</div>
 	</div>
@@ -29,6 +30,7 @@ const OffLine = defineAsyncComponent(() => import("./components/off-line/index.v
 const ExtraPrice = defineAsyncComponent(() => import("./components/extra-price/index.vue"))
 const ThirdZy = defineAsyncComponent(() => import("./components/third-zy/index.vue"))
 const UserSetting = defineAsyncComponent(() => import("./components/user/index.vue"))
+const WalletRecharge = defineAsyncComponent(() => import("./components/wallet-recharge/index.vue"))
 
 const data = {
 	tabList: [
@@ -39,6 +41,7 @@ const data = {
 		{ id: 50, label: "离线配置" },
 		{ id: 60, label: "正元同步配置" },
 		{ id: 70, label: "用户同步配置" },
+		{ id: 80, label: "批量申请/扣款发票配置" },
 	],
 }