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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zjf committed 2025-09-03 19:22:15 +08:00
2 parents 2d9d60cd0a d94dcdcac6
commit 153e40bb37
2 files changed
+12 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/hard/hard-order/components/admin-refund-dialog/table.vue
+1
View File
@@ -201,6 +201,7 @@ const getCarList = async (orderId: string) => {
} catch (error: any) {
state.dataList = []
disposeDataList.value = []
refundSuccessList.value = []
}
}
src/views/hard/hard-order/index.vue
+11 -7
View File
@@ -12,28 +12,32 @@
<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">
<el-form-item style="width: 250px" label="用户" prop="userId">
<select-user v-model="state.queryForm.userId" />
</el-form-item>
<el-form-item style="width: 300px" label="商户类型" prop="merchantType">
<el-form-item style="width: 250px" label="商户类型" prop="merchantType">
<dict-select v-model="state.queryForm.merchantType" dict-code="merchant_type" />
</el-form-item>
<el-form-item style="width: 300px" label="商户" prop="merchantId">
<el-form-item style="width: 250px" label="商户" prop="merchantId">
<select-mch v-model="state.queryForm.merchantId" :apiParams="{ parentIsNull: false }" />
</el-form-item>
<el-form-item style="width: 300px" label="设备类型" prop="hardTypeCode">
<el-form-item style="width: 250px" label="设备类型" prop="hardTypeCode">
<dict-select v-model="state.queryForm.hardTypeCode" dict-code="hard_type" />
</el-form-item>
<el-form-item style="width: 300px" label="用户部门" prop="userDeptId">
<el-form-item style="width: 250px" label="用户部门" prop="userDeptId">
<select-dept v-model="state.queryForm.userDeptId" />
</el-form-item>
<el-form-item style="width: 300px" label="用餐时间段" prop="hourType">
<el-form-item style="width: 250px" label="用餐时间段" prop="hourType">
<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
</el-form-item>
<el-form-item style="width: 300px" label="订单状态" prop="orderStatus">
<dict-select v-model="state.queryForm.orderStatus" dict-code="hard_order_status" />
</el-form-item>
<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
<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 style="width: 450px" label="支付时间" prop="payTimeList">
<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" />
</el-form-item>