完善功能

This commit is contained in:
wangxiaowei
2026-03-13 16:00:38 +08:00
parent 1552642e38
commit 2af8b24b50
17 changed files with 1091 additions and 197 deletions

View File

@ -20,7 +20,7 @@
</el-form-item> -->
<el-form-item label="服务日期" prop="day_time">
<daterange-picker v-model:startTime="queryParams.day_time" v-model:endTime="queryParams.day_time"
<daterange-picker v-model:startTime="queryParams.start" v-model:endTime="queryParams.end"
value-format="YYYY-MM-DD" clearable />
</el-form-item>
@ -82,62 +82,14 @@
</template>
</el-table-column>
<!-- <el-table-column label="服务" prop="mobile" show-overflow-tooltip width="400">
<template #default="{ row }">
<div>服务日期: {{ row.day_time }}</div>
<div>服务时间: {{ row.start_time }} - {{ row.end_time }}</div>
<div>服务方式: {{ getServerTypeLabel(row.server_type) }}</div>
<div>服务地址: {{ row.address }}</div>
<div class="flex items-center">使用茶具: <dict-value :options="dictData.is_teacup"
:value="row.is_teacup" />
</div>
</template>
</el-table-column> -->
<el-table-column label="用户信息" prop="mobile" show-overflow-tooltip>
<template #default="{ row }">
<div>用户手机号: {{ row.user_mobile }}</div>
<div>用户昵称: {{ row.user_nickname }}</div>
</template>
</el-table-column>
<!-- <el-table-column label="服务价格" prop="teacup_price" show-overflow-tooltip width="200">
<template #default="{ row }">
<div>茶具价格: {{ row.teacup_price }}</div>
<div>服务单价: {{ row.server_price }}</div>
<div>服务总价: {{ row.server_all_price }}</div>
<div>车马费单价: {{ row.mileage_price }}</div>
<div>车马费总价: {{ row.server_all_price }}</div>
<div>优惠券金额: {{ row.coupon_price }}</div>
<div>茶叶金额: {{ row.tea_price }}</div>
<div>实付金额: {{ row.order_amount }}</div>
</template>
</el-table-column> -->
<!-- <el-table-column label="续费信息" prop="renew_hour" show-overflow-tooltip width="200">
<template #default="{ row }">
<div>续费时长: {{ row.renew_hour || '一' }}</div>
<div>续费金额: {{ row.renew_price || '一' }}</div>
<div>续单茶叶金额: {{ row.renew_tea_price || '一' }}</div>
</template>
</el-table-column> -->
<!-- <el-table-column label="支付内容" prop="pay_way" show-overflow-tooltip width="200">
<template #default="{ row }">
<div class="flex items-center">支付方式:
<dict-value :options="dictData.pay_way" :value="row.pay_way" />
</div>
<div class="flex items-center">支付状态:
<dict-value :options="dictData.pay_status" :value="row.pay_status" />
</div>
<div class="flex items-center">支付时间: {{ row.pay_time }}</div>
</template>
</el-table-column> -->
<!-- <el-table-column label="退款内容" prop="pay_way" show-overflow-tooltip width="200">
<template #default="{ row }">
<div class="flex items-center">退款时间: {{ row.refund_time || '一' }}</div>
<div class="flex items-center">退款金额: {{ row.refund_price || '一' }}</div>
</template>
</el-table-column> -->
<!-- <el-table-column label="茶艺师收入" prop="team_income_price" show-overflow-tooltip width="100" /> -->
<el-table-column label="实付价格" prop="order_amount" show-overflow-tooltip />
<el-table-column label="订单状态" prop="order_status">
<template #default="{ row }">
@ -150,28 +102,13 @@
<div>服务方式: {{ getServerTypeLabel(row.server_type) }}</div>
</template>
</el-table-column>
<!-- <el-table-column label="出行状态" prop="take_order_time" show-overflow-tooltip width="200">
<template #default="{ row }">
<div class="flex items-center">接单时间: {{ row.take_order_time }}</div>
<div class="flex items-center">出发时间: {{ row.travel_time }}</div>
<div class="flex items-center">到达时间: {{ row.arrival_time }}</div>
<div class="flex items-center">是否打卡: {{ row.is_img > 0 ? '已打卡' : '未打卡' }}</div>
<div class="flex items-center">打开时间: {{ row.img_time }}</div>
<div class="flex items-center">打卡照片:
<el-image v-if="row.img" style="width: 60px; height: 60px;" :src="row.img"
:preview-src-list="[row.img]" fit="cover" preview-teleported />
<span v-else class="text-gray-400">无图片</span>
</div>
</template>
</el-table-column> -->
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['order_teamaster/details']" type="primary" link>
<router-link :to="{
path: getRoutePath('order_teamaster/details'),
query: {
id: row.id
params: JSON.stringify(row)
}
}">
查看
@ -222,6 +159,8 @@ const queryParams = reactive({
nickname: '',
img: '',
day_time: '',
start: '',
end: '',
server_type: '',
is_teacup: '',
pay_way: '',