Merge remote-tracking branch 'origin/master'

src/api/hard/hard-total.ts

@@ -20,6 +20,18 @@ export function pageListSb(query?: any) {
 	})
 }
 
+export function pagePayType(query?: any) {
+	return request({
+		url: "/hard/hard-total/page-list-payType",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}
+
 export function pageListCs(query?: any) {
 	return request({
 		url: "/hard/hard-total/page-list-cs",

src/api/wallet/mch-manage.ts

@@ -1,5 +1,14 @@
 import request from "/@/utils/request"
 
+// 刷新商户二维码
+export function refreshQrcode(query?: Object) {
+	return request({
+		url: "/wallet/mch-manage/refresh-qrcode",
+		method: "get",
+		params: query,
+	})
+}
+
 export function select(query?: Object) {
 	return request({
 		url: "/wallet/mch-manage/select",

src/api/wallet/wallet-transaction.ts

@@ -12,6 +12,18 @@ export function pageCz(query?: any) {
 	})
 }
 
+export function pageJz(query?: any) {
+	return request({
+		url: "/wallet/wallet-transaction/page-jz",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}
+
 export function pageXf(query?: any) {
 	return request({
 		url: "/wallet/wallet-transaction/page-xf",

src/views/hard/hard-payType-total/index.vue

@@ -52,7 +52,7 @@
 					>
 						<el-table-column type="selection" width="80" align="center" />
 						<el-table-column type="index" label="#" width="50" />
-						<el-table-column label="设备" align="center">
+						<el-table-column label="支付方式" align="center">
 							<template #default="{ row }">
 								<div class="flex flex-row items-center justify-center">
 									<div class="mr-2">{{ row.hardName }}</div>
@@ -60,7 +60,6 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column label="商户" align="center" prop="merchantName" />
 						<el-table-column label="流水金额" align="center" prop="totalPayPrice">
 							<template #default="{ row }">
 								<span class="color-primary">
@@ -131,7 +130,7 @@ const { hard_type } = useDict("hard_type")
 const state: BasicTableProps = reactive<BasicTableProps>({
 	isPage: false,
 	queryForm: {},
-	pageList: hardTotalApi.pageListSb,
+	pageList: hardTotalApi.pagePayType,
 })
 
 //  table hook
@@ -139,7 +138,7 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, do
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/hard/hard-total/export-sb", Object.assign(state.queryForm), "设备交易记录.xlsx")
+	downBlobFile("/hard/hard-total/export-payType", Object.assign(state.queryForm), "设备交易记录.xlsx")
 }
 
 const getSummaries = (param: any) => {

src/views/wallet/mch-manage/index.vue

@@ -77,23 +77,18 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" />
-				<el-table-column label="操作" width="200">
-					<template #default="scope">
-						<el-button
-							icon="setting"
-							text
-							type="primary"
-							v-auth="'wallet_mchManage_setting'"
-							@click="settingDialogRef.openDialog(scope.row.id)"
-						>
+				<el-table-column label="操作" min-width="300">
+					<template #default="{ row }">
+						<el-button icon="RefreshRight" text type="primary" v-auth="'wallet_mchManage_refresh_qrcode'" @click="refreshQrcode(row)">
+							刷新二维码
+						</el-button>
+						<el-button icon="setting" text type="primary" v-auth="'wallet_mchManage_setting'" @click="settingDialogRef.openDialog(row.id)">
 							配置
 						</el-button>
-						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'" @click="formDialogRef.openDialog(row.id)">
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'" @click="handleDelete([scope.row.id])">
-							删除
-						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'" @click="handleDelete([row.id])"> 删除 </el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -110,7 +105,7 @@
 
 <script setup lang="ts" name="MchManage">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { pageJoin, delObjs } from "/@/api/wallet/mch-manage"
+import * as mchManangeApi from "/@/api/wallet/mch-manage"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import FormDialog from "./form.vue"
@@ -129,7 +124,7 @@ const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
-	pageList: pageJoin,
+	pageList: mchManangeApi.pageJoin,
 })
 
 //  table hook
@@ -144,6 +139,19 @@ const resetQuery = () => {
 	getDataList()
 }
 
+// 重新生成正元二位啊吗
+const refreshQrcode = async (row: any) => {
+	try {
+		await useMessageBox().confirm("是否重新生成正元二维码")
+		await mchManangeApi.refreshQrcode({ mchId: row.id })
+		getDataList()
+		useMessage().success("生成成功")
+	} catch (e) {
+		useMessage().error("生成失败")
+		return
+	}
+}
+
 // 导出excel
 const exportExcel = () => {
 	downBlobFile("/canteen/merchantInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "商户管理.xlsx")

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

@@ -0,0 +1,174 @@
+<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"
+			>
+				<template #default>
+					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+						<el-row>
+							<el-form-item style="width: 300px" label="用户" prop="userId">
+								<select-user v-model="state.queryForm.userId" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="充值方式" prop="bizType">
+								<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
+							</el-form-item>
+							<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
+								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+							</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%">
+							<right-toolbar
+								:search="false"
+								v-model:showSearch="showSearch"
+								:export="'wallet_walletTransaction_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
+						:summary-method="getSummaries"
+						show-summary
+						: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="username" label="用户" show-overflow-tooltip />
+						<el-table-column prop="userAvatar" label="头像" show-overflow-tooltip>
+							<template #default="{ row }">
+								<preview-image :src="row.userAvatar" />
+							</template>
+						</el-table-column>
+						<el-table-column prop="userMobile" width="120" label="手机号" show-overflow-tooltip />
+						<el-table-column prop="walletTypeUniqueCode" width="200" label="饭卡类型">
+							<template #default="{ row }">
+								<div class="flex items-center justify-center">
+									<div class="color-primary">{{ row.walletTypeName }}</div>
+									<div class="flex items-center just ml5">
+										<dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+									</div>
+								</div>
+							</template>
+						</el-table-column>
+						<el-table-column prop="wallet_biz" width="200" label="交易类型">
+							<template #default="{ row }">
+								<dict-tag :options="wallet_biz" :value="row.bizType" />
+							</template>
+						</el-table-column>
+						<el-table-column prop="price" align="center" width="200" label="记账扣款金额">
+							<template #default="{ row }">
+								<div class="color-danger">{{ displayPrice(row.price) }}</div>
+							</template>
+						</el-table-column>
+						<el-table-column prop="createTime" width="200" label="记账扣款时间" />
+					</el-table>
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+				</template>
+			</DraggableDepTree>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="systemWalletRecharge">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { pageJz } from "/@/api/wallet/wallet-transaction"
+import { useDict } from "/@/hooks/dict"
+import { displayPrice } from "/@/utils/formatMoney"
+
+const { push } = useRouter()
+
+// 定义查询字典
+const { wallet_type, wallet_biz } = useDict("wallet_type", "wallet_biz")
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+const draggableDepTreeRef = ref()
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: pageJz,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	state.queryForm.deptId = ""
+	state.queryForm.deptIds = []
+	draggableDepTreeRef.value.resetData()
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	postDownBlobFile(
+		"/wallet/wallet-transaction/export-jz",
+		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
+		"消费记录.xlsx",
+	)
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+const getSummaries = (param: any) => {
+	const { columns, data } = param
+	const totalColumns = ["price"]
+	const totalRow = Array.from({ length: columns.length })
+	columns.forEach((i: any, index: number) => {
+		if (totalColumns.includes(i.property)) {
+			const total = data
+				.filter((v: any) => v[i.property] != null)
+				.map((v: any) => v[i.property])
+				.reduce((pren: number, next: number) => pren + next, 0)
+			totalRow[index] = displayPrice(total)
+		}
+	})
+	return totalRow
+}
+
+// 树节点选择时
+const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
+	state.queryForm.deptId = curClickedNode.id
+	state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id)
+	state.queryForm.isInclude = !isDeepTree
+	getDataList()
+}
+</script>