From ff7a5085ddcc8d29a981af4a167c13bf4393c302 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 9 May 2025 09:49:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=91=98=E5=B7=A5=E8=B0=83=E5=B2=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/sys-user-transaction/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/admin/system/sys-user-transaction/index.vue b/src/views/admin/system/sys-user-transaction/index.vue
index 778ad30..27e4c74 100644
--- a/src/views/admin/system/sys-user-transaction/index.vue
+++ b/src/views/admin/system/sys-user-transaction/index.vue
@@ -68,7 +68,7 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
+				<el-table-column type="index" label="#" width="80" />
 				<el-table-column prop="applyUsername" label="申请人" />
 				<el-table-column prop="username" label="调动人" />
 				<el-table-column prop="userMobile" label="调动人手机号" width="120" />

From 284d5a7b9c9a7938c923697847f855a44480ae4a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 9 May 2025 10:18:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E7=BB=93=E8=B4=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wallet/mch-checkout.ts       |  40 ++++++++
 src/views/mch/mch-checkout/form.vue  | 126 +++++++++++++++++++++++++
 src/views/mch/mch-checkout/index.vue | 133 +++++++++++++++++++++++++++
 3 files changed, 299 insertions(+)
 create mode 100644 src/api/wallet/mch-checkout.ts
 create mode 100644 src/views/mch/mch-checkout/form.vue
 create mode 100644 src/views/mch/mch-checkout/index.vue

diff --git a/src/api/wallet/mch-checkout.ts b/src/api/wallet/mch-checkout.ts
new file mode 100644
index 0000000..3446676
--- /dev/null
+++ b/src/api/wallet/mch-checkout.ts
@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/mch-checkout/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/mch-checkout",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/mch-checkout/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/mch-checkout",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/mch-checkout",
+		method: "put",
+		data: obj,
+	})
+}
diff --git a/src/views/mch/mch-checkout/form.vue b/src/views/mch/mch-checkout/form.vue
new file mode 100644
index 0000000..44d7811
--- /dev/null
+++ b/src/views/mch/mch-checkout/form.vue
@@ -0,0 +1,126 @@
+<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="24" class="mb20">
+					<el-form-item label="结账年月日(存入年月就行)" prop="checkoutTime">
+						<el-input v-model="form.checkoutTime" placeholder="请输入结账年月日(存入年月就行)" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="结账人" prop="checkoutUserId">
+						<el-input v-model="form.checkoutUserId" placeholder="请输入结账人" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="商户id" prop="merchantId">
+						<el-input v-model="form.merchantId" placeholder="请输入商户id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="结账价格" prop="price">
+						<el-input v-model="form.price" placeholder="请输入结账价格" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="结账凭证图片" prop="pic">
+						<el-input v-model="form.pic" placeholder="请输入结账凭证图片" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="结账备注" prop="remark">
+						<el-input v-model="form.remark" 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="MchCheckoutDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import * as mchCheckoutApi from "/@/api/wallet/mch-checkout"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+	id: "",
+	checkoutTime: "",
+	checkoutUserId: "",
+	merchantId: "",
+	price: "",
+	pic: "",
+	remark: "",
+})
+
+// 定义校验规则
+const dataRules = ref({})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.id = ""
+
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+
+	// 获取mchCheckout信息
+	if (id) {
+		form.id = id
+		getmchCheckoutData(id)
+	}
+}
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+
+	try {
+		loading.value = true
+		form.id ? await mchCheckoutApi.putObj(form) : await mchCheckoutApi.addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 初始化表单数据
+const getmchCheckoutData = (id: string) => {
+	// 获取数据
+	loading.value = true
+	mchCheckoutApi
+		.getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>
diff --git a/src/views/mch/mch-checkout/index.vue b/src/views/mch/mch-checkout/index.vue
new file mode 100644
index 0000000..2a490fe
--- /dev/null
+++ b/src/views/mch/mch-checkout/index.vue
@@ -0,0 +1,133 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchCheckout_add'">
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'wallet_mchCheckout_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'wallet_mchCheckout_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="checkoutTime" label="结账年月日(存入年月就行)" show-overflow-tooltip />
+				<el-table-column prop="checkoutUserId" label="结账人" show-overflow-tooltip />
+				<el-table-column prop="merchantId" label="商户id" show-overflow-tooltip />
+				<el-table-column prop="price" label="结账价格" show-overflow-tooltip />
+				<el-table-column prop="pic" label="结账凭证图片" show-overflow-tooltip />
+				<el-table-column prop="remark" label="结账备注" show-overflow-tooltip />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'wallet_mchCheckout_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_mchCheckout_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemMchCheckout">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as mchCheckoutApi from "/@/api/wallet/mch-checkout"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: mchCheckoutApi.fetchList,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/wallet/mchCheckout/export", Object.assign(state.queryForm, { ids: selectObjs }), "mchCheckout.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 mchCheckoutApi.delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+</script>