From b8304e13e487da02e2772b9ec446b748b87e3a50 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 19 Feb 2025 10:04:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=83=A8=E9=97=A8=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/hard-dept-total/index.vue |   4 +-
 src/views/hard/hard-order/index.vue      | 476 +++++++++++------------
 2 files changed, 231 insertions(+), 249 deletions(-)

diff --git a/src/views/hard/hard-dept-total/index.vue b/src/views/hard/hard-dept-total/index.vue
index 836451f..1acc356 100644
--- a/src/views/hard/hard-dept-total/index.vue
+++ b/src/views/hard/hard-dept-total/index.vue
@@ -53,12 +53,12 @@
 						<el-table-column type="selection" width="40" align="center" />
 						<el-table-column type="index" label="#" width="80" />
 						<el-table-column prop="deptName" min-width="150" label="部门" />
-						<el-table-column prop="walletPrice" label="充值金额" align="center">
+						<el-table-column prop="walletPrice" label="批量充值金额" align="center">
 							<template #default="{ row }">
 								<div :class="{ 'color-success': row.walletPrice != 0 }">{{ displayPrice(row.walletPrice) }}</div>
 							</template>
 						</el-table-column>
-						<el-table-column prop="walletCount" label="充值次数" align="center">
+						<el-table-column prop="walletCount" label="批量充值次数" align="center">
 							<template #default="{ row }">
 								<div :class="{ 'color-success': row.walletCount != 0 }">{{ row.walletCount }}次</div>
 							</template>
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index af4cf12..621e599 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -1,254 +1,236 @@
 <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"
-			>
-				<template #default>
-					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
-						<el-row :gutter="24">
-							<el-col :span="4">
-								<el-form-item class="w100" label="用户" prop="userIds">
-									<select-user v-model="state.queryForm.userIds" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="商户" prop="mchIds">
-									<select-mch v-model="state.queryForm.mchIds" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="用户部门" prop="deptIdIdDeepen">
-									<select-dept v-model="state.queryForm.deptIdIdDeepen" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="用餐时间段" prop="hourType">
-									<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="5">
-								<el-form-item class="w100" label="创建时间" prop="payTimeList">
-									<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
-								</el-form-item>
-							</el-col>
-							<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>
-					<div class="flex justify-between items-center">
-						<el-tabs class="flex-1" v-if="tabList && tabList.length" v-model="activeName" @tab-click="handleClick">
-							<div v-for="v in tabList" :key="v.value">
-								<el-tab-pane :label="v.label" :name="v.value">
-									<div></div>
-								</el-tab-pane>
-							</div>
-						</el-tabs>
-						<right-toolbar
-							v-model:showSearch="showSearch"
-							:export="'sys_audit_export'"
-							@exportExcel="exportExcel"
-							class="ml10"
-							style="float: right; margin-right: 20px"
-							@queryTable="getDataList"
-						/>
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row :gutter="24">
+					<el-col :span="4">
+						<el-form-item class="w100" label="用户" prop="userIds">
+							<select-user v-model="state.queryForm.userIds" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="4">
+						<el-form-item class="w100" label="商户" prop="mchIds">
+							<select-mch v-model="state.queryForm.mchIds" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="4">
+						<el-form-item class="w100" label="用户部门" prop="deptIdIdDeepen">
+							<select-dept v-model="state.queryForm.deptIdIdDeepen" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="4">
+						<el-form-item class="w100" label="用餐时间段" prop="hourType">
+							<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="5">
+						<el-form-item class="w100" label="创建时间" prop="payTimeList">
+							<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+						</el-form-item>
+					</el-col>
+					<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>
+			<div class="flex justify-between items-center">
+				<el-tabs class="flex-1" v-if="tabList && tabList.length" v-model="activeName" @tab-click="handleClick">
+					<div v-for="v in tabList" :key="v.value">
+						<el-tab-pane :label="v.label" :name="v.value">
+							<div></div>
+						</el-tab-pane>
 					</div>
-					<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"
-						show-summary
-						:summary-method="getSummaries"
-					>
-						<el-table-column type="selection" width="60" align="center" />
-						<el-table-column type="index" label="#" width="50" />
-						<el-table-column width="200" label="用户">
-							<template #default="{ row }">
-								<div class="flex flex-row items-center justify-center">
-									<preview-image width="50px" height="50px" :src="row.userAvatar" />
-									<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
-										<span> {{ row.username }}</span>
-										<span> {{ row.userMobile }}</span>
-									</div>
-								</div>
-							</template>
-						</el-table-column>
-						<el-table-column width="200px" label="商品">
-							<template #default="{ row }">
-								<div class="desc">
-									<span>商品</span>
-									<el-tooltip :content="row.productDesc" placement="top-start">
-										<span class="text-line">{{ row.productDesc }}</span>
-									</el-tooltip>
-								</div>
-								<div class="status" v-if="row.hourType">
-									<span>用餐时间段</span>
-									<span>
-										<dict-tag :options="daily_menu" :value="row.hourType" />
-									</span>
-								</div>
-							</template>
-						</el-table-column>
-						<el-table-column width="250px" label="设备信息">
-							<template #default="{ row }">
-								<div class="status">
-									<span>商户</span>
-									<span>
-										{{ row.merchantName }}
-									</span>
-								</div>
-								<div class="status">
-									<span>设备名</span>
-									<span>
-										{{ row.hardName }}
-									</span>
-								</div>
-								<div class="status">
-									<span>设备类型</span>
-									<span>
-										<dict-tag :options="hard_type" :value="row.hardType" />
-									</span>
-								</div>
-							</template>
-						</el-table-column>
-						<el-table-column width="250px" label="订单信息">
-							<template #default="{ row }">
-								<div class="status">
-									<span>订单类型</span>
-									<span>
-										<dict-tag :options="hard_order_type" :value="row.orderType" />
-									</span>
-								</div>
-								<div class="status">
-									<span>支付方式</span>
-									<span>
-										<dict-tag :options="hard_pay_type" :value="row.payType" />
-									</span>
-								</div>
-								<div class="status">
-									<span>订单状态</span>
-									<span>
-										<dict-tag :options="hard_order_status" :value="row.orderStatus" />
-									</span>
-								</div>
-							</template>
-						</el-table-column>
-						<el-table-column width="200px" prop="paymentInformation" label="付款信息">
-							<template #default="{ row }">
-								<div class="status">
-									<span>商品总价</span>
-									<span class="color-success">
-										{{ displayPrice(row.totalPrice) }}
-									</span>
-								</div>
-								<div class="status">
-									<span>额外支付</span>
-									<span class="color-danger">
-										{{ displayPrice(row.extraPrice) }}
-									</span>
-								</div>
-								<div class="status">
-									<span>实际支付</span>
-									<span class="color-primary">
-										{{ displayPrice(row.payPrice) }}
-									</span>
-								</div>
-							</template>
-						</el-table-column>
-						<el-table-column width="270px" label="退款信息">
-							<template #default="{ row }">
-								<div v-if="row.payRefundId">
-									<div class="status">
-										<span>退款金额</span>
-										<span class="color-success">
-											{{ displayPrice(row.refundPrice) }}
-										</span>
-									</div>
-									<div class="status">
-										<span>退款状态</span>
-										<span class="color-success">
-											<dict-tag :options="hard_refund_status" :value="row.refundStatus" />
-										</span>
-									</div>
-									<div class="status">
-										<span>退款时间</span>
-										<span>
-											{{ row.refundTime }}
-										</span>
-									</div>
-								</div>
-							</template>
-						</el-table-column>
-						<el-table-column label="支付时间" align="center" prop="payTime" width="250px">
-							<template #default="{ row }">
-								<div class="status">
-									<span>创建时间</span>
-									<span>{{ row.createTime }} </span>
-								</div>
-								<div class="status">
-									<span>支付时间</span>
-									<span>{{ row.payTime }} </span>
-								</div>
-							</template>
-						</el-table-column>
-						<el-table-column fixed="right" label="操作" width="200">
-							<template #default="{ row }">
-								<div class="grid grid-cols-2 justify-between">
-									<el-button icon="Printer" text type="primary" @click="print(row)" v-auth="'hard_hardInvoice_admin_print'">
-										打印发票
-									</el-button>
-									<el-button icon="ShoppingCartFull" text type="primary" @click="shopCarDialogRef.openDialog(row.id)"> 购物车 </el-button>
-									<el-button icon="Money" link type="primary" @click="transactionListRef.openDialog(row.walletId)"> 钱包明细 </el-button>
-									<el-button
-										icon="InfoFilled"
-										link
-										type="primary"
-										v-auth="'wallet_walletTransaction_update_balance'"
-										@click="doRefund(row)"
-									>
-										订单详情
-									</el-button>
-								</div>
-								<el-button
-									v-if="false"
-									icon="edit-pen"
-									text
-									type="primary"
-									v-auth="'hard_hardwareOrder_edit'"
-									@click="formDialogRef.openDialog(row.id)"
-									>编辑
-								</el-button>
-								<el-button
-									v-if="!row.payRefundId"
-									icon="stamp"
-									text
-									type="primary"
-									v-auth="'hard_hardAfterSale_adminRefund'"
-									@click="adminRefundDailogRef.openDialog(row.id)"
-								>
-									退款
-								</el-button>
-								<el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardwareOrder_del'" @click="handleDelete([row.id])"
-									>删除</el-button
-								>
-							</template>
-						</el-table-column>
-					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-				</template>
-			</DraggableDepTree>
+				</el-tabs>
+				<right-toolbar
+					v-model:showSearch="showSearch"
+					:export="'sys_audit_export'"
+					@exportExcel="exportExcel"
+					class="ml10"
+					style="float: right; margin-right: 20px"
+					@queryTable="getDataList"
+				/>
+			</div>
+			<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"
+				:show-summary="false"
+				:summary-method="getSummaries"
+			>
+				<el-table-column type="selection" width="60" align="center" />
+				<el-table-column type="index" label="#" width="50" />
+				<el-table-column width="200" label="用户">
+					<template #default="{ row }">
+						<div class="flex flex-row items-center justify-center">
+							<preview-image width="50px" height="50px" :src="row.userAvatar" />
+							<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
+								<span> {{ row.username }}</span>
+								<span> {{ row.userMobile }}</span>
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="200px" label="商品">
+					<template #default="{ row }">
+						<div class="desc">
+							<span>商品</span>
+							<el-tooltip :content="row.productDesc" placement="top-start">
+								<span class="text-line">{{ row.productDesc }}</span>
+							</el-tooltip>
+						</div>
+						<div class="status" v-if="row.hourType">
+							<span>用餐时间段</span>
+							<span>
+								<dict-tag :options="daily_menu" :value="row.hourType" />
+							</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="250px" label="设备信息">
+					<template #default="{ row }">
+						<div class="status">
+							<span>商户</span>
+							<span>
+								{{ row.merchantName }}
+							</span>
+						</div>
+						<div class="status">
+							<span>设备名</span>
+							<span>
+								{{ row.hardName }}
+							</span>
+						</div>
+						<div class="status">
+							<span>设备类型</span>
+							<span>
+								<dict-tag :options="hard_type" :value="row.hardType" />
+							</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="250px" label="订单信息">
+					<template #default="{ row }">
+						<div class="status">
+							<span>订单类型</span>
+							<span>
+								<dict-tag :options="hard_order_type" :value="row.orderType" />
+							</span>
+						</div>
+						<div class="status">
+							<span>支付方式</span>
+							<span>
+								<dict-tag :options="hard_pay_type" :value="row.payType" />
+							</span>
+						</div>
+						<div class="status">
+							<span>订单状态</span>
+							<span>
+								<dict-tag :options="hard_order_status" :value="row.orderStatus" />
+							</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="200px" prop="paymentInformation" label="付款信息">
+					<template #default="{ row }">
+						<div class="status">
+							<span>商品总价</span>
+							<span class="color-success">
+								{{ displayPrice(row.totalPrice) }}
+							</span>
+						</div>
+						<div class="status">
+							<span>额外支付</span>
+							<span class="color-danger">
+								{{ displayPrice(row.extraPrice) }}
+							</span>
+						</div>
+						<div class="status">
+							<span>实际支付</span>
+							<span class="color-primary">
+								{{ displayPrice(row.payPrice) }}
+							</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="270px" label="退款信息">
+					<template #default="{ row }">
+						<div v-if="row.payRefundId">
+							<div class="status">
+								<span>退款金额</span>
+								<span class="color-success">
+									{{ displayPrice(row.refundPrice) }}
+								</span>
+							</div>
+							<div class="status">
+								<span>退款状态</span>
+								<span class="color-success">
+									<dict-tag :options="hard_refund_status" :value="row.refundStatus" />
+								</span>
+							</div>
+							<div class="status">
+								<span>退款时间</span>
+								<span>
+									{{ row.refundTime }}
+								</span>
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="支付时间" align="center" prop="payTime" width="250px">
+					<template #default="{ row }">
+						<div class="status">
+							<span>创建时间</span>
+							<span>{{ row.createTime }} </span>
+						</div>
+						<div class="status">
+							<span>支付时间</span>
+							<span>{{ row.payTime }} </span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column fixed="right" label="操作" width="200">
+					<template #default="{ row }">
+						<div class="grid grid-cols-2 justify-between">
+							<el-button icon="Printer" text type="primary" @click="print(row)" v-auth="'hard_hardInvoice_admin_print'">
+								打印发票
+							</el-button>
+							<el-button icon="ShoppingCartFull" text type="primary" @click="shopCarDialogRef.openDialog(row.id)"> 购物车 </el-button>
+							<el-button icon="Money" link type="primary" @click="transactionListRef.openDialog(row.walletId)"> 钱包明细 </el-button>
+							<el-button icon="InfoFilled" link type="primary" v-auth="'wallet_walletTransaction_update_balance'" @click="doRefund(row)">
+								订单详情
+							</el-button>
+						</div>
+						<el-button
+							v-if="false"
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'hard_hardwareOrder_edit'"
+							@click="formDialogRef.openDialog(row.id)"
+							>编辑
+						</el-button>
+						<el-button
+							v-if="!row.payRefundId"
+							icon="stamp"
+							text
+							type="primary"
+							v-auth="'hard_hardAfterSale_adminRefund'"
+							@click="adminRefundDailogRef.openDialog(row.id)"
+						>
+							退款
+						</el-button>
+						<el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardwareOrder_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>
 
 		<!-- 编辑、新增  -->