完善功能

This commit is contained in:
wangxiaowei
2026-03-02 10:58:31 +08:00
parent 6731c05e3e
commit 1552642e38
19 changed files with 720 additions and 116 deletions

View File

@ -5,16 +5,25 @@
<el-form-item label="订单编号" prop="order_sn">
<el-input class="w-[280px]" v-model="queryParams.order_sn" clearable placeholder="请输入订单编号" />
</el-form-item>
<el-form-item label="茶艺师手机号" prop="mobile">
<el-form-item label="用户手机号" prop="order_sn">
<el-input class="w-[280px]" v-model="queryParams.mobile" clearable placeholder="请输入用户手机号" />
</el-form-item>
<el-form-item label="茶艺师昵称" prop="nickname">
<el-input class="w-[280px]" v-model="queryParams.nickname" clearable placeholder="请输入茶艺师昵称" />
</el-form-item>
<!--
<el-form-item class="w-[280px]" label="服务日期" prop="day_time">
<el-date-picker v-model="queryParams.day_time" type="date" placeholder="请选择服务日期"
value-format="YYYY-MM-DD" clearable />
</el-form-item> -->
<el-form-item label="服务日期" prop="day_time">
<daterange-picker v-model:startTime="queryParams.day_time" v-model:endTime="queryParams.day_time"
value-format="YYYY-MM-DD" clearable />
</el-form-item>
<el-form-item class="w-[280px]" label="服务方式" prop="server_type">
<el-select v-model="queryParams.server_type" clearable placeholder="请选择服务方式">
<el-option label="全部" :value="3"></el-option>
@ -22,13 +31,15 @@
<el-option label="上门服务" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item class="w-[280px]" label="是否使用茶具" prop="is_teacup">
<!-- <el-form-item class="w-[280px]" label="是否使用茶具" prop="is_teacup">
<el-select v-model="queryParams.is_teacup" clearable placeholder="请选择是否使用茶具">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in dictData.is_teacup" :key="index" :label="item.name"
:value="item.value" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item class="w-[280px]" label="支付方式" prop="pay_way">
<el-select v-model="queryParams.pay_way" clearable placeholder="请选择支付方式">
<el-option label="全部" value=""></el-option>
@ -36,6 +47,7 @@
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item class="w-[280px]" label="订单状态" prop="order_status">
<el-select v-model="queryParams.order_status" clearable placeholder="请选择订单状态">
<el-option label="全部" value=""></el-option>
@ -43,6 +55,7 @@
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item class="w-[280px]" label="支付状态" prop="pay_status">
<el-select v-model="queryParams.pay_status" clearable placeholder="请选择支付状态">
<el-option label="全部" value=""></el-option>
@ -50,6 +63,7 @@
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@ -57,99 +71,126 @@
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button v-perms="['order_teamaster/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['order_teamaster/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button> -->
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="订单编号" prop="order_sn" show-overflow-tooltip />
<el-table-column label="第三方平台交易流水号" prop="transaction_id" show-overflow-tooltip />
<el-table-column label="茶艺师手机号" prop="mobile" show-overflow-tooltip />
<el-table-column label="用户手机号" prop="user_mobile" show-overflow-tooltip />
<el-table-column label="茶艺师昵称" prop="nickname" show-overflow-tooltip />
<el-table-column label="服务日期" prop="day_time" show-overflow-tooltip />
<el-table-column label="服务开始时间" prop="start_time" show-overflow-tooltip />
<el-table-column label="服务时间" prop="end_time" show-overflow-tooltip />
<el-table-column label="服务方式" prop="server_type" show-overflow-tooltip>
<!-- <el-table-column label="订单编号" prop="order_sn" show-overflow-tooltip width="180" /> -->
<el-table-column label="茶艺师信息" prop="mobile" show-overflow-tooltip>
<template #default="{ row }">
<span>{{ getServerTypeLabel(row.server_type) }}</span>
<div>茶艺师手机号: {{ row.mobile }}</div>
<div>茶艺师昵称: {{ row.nickname }}</div>
</template>
</el-table-column>
<el-table-column label="地址" prop="address" show-overflow-tooltip />
<el-table-column label="是否使用茶具" prop="is_teacup">
<!-- <el-table-column label="服务" prop="mobile" show-overflow-tooltip width="400">
<template #default="{ row }">
<dict-value :options="dictData.is_teacup" :value="row.is_teacup" />
<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 />
<el-table-column label="服务单价" prop="server_price" show-overflow-tooltip />
<el-table-column label="车马费单价" prop="mileage_price" show-overflow-tooltip />
<el-table-column label="服务总价" prop="server_all_price" show-overflow-tooltip />
<el-table-column label="车马费总价" prop="mileage_server_price" show-overflow-tooltip />
<el-table-column label="优惠券金额" prop="coupon_price" show-overflow-tooltip />
<el-table-column label="茶叶金额" prop="tea_price" show-overflow-tooltip />
<el-table-column label="实付金额" prop="order_amount" show-overflow-tooltip />
<el-table-column label="茶艺师收入" prop="team_income_price" show-overflow-tooltip />
<el-table-column label="续费时长" prop="renew_hour" show-overflow-tooltip />
<el-table-column label="续费金额" prop="renew_price" show-overflow-tooltip />
<el-table-column label="续单茶叶金额" prop="renew_tea_price" show-overflow-tooltip />
<el-table-column label="支付方式" prop="pay_way">
<!-- <el-table-column label="服务价格" prop="teacup_price" show-overflow-tooltip width="200">
<template #default="{ row }">
<dict-value :options="dictData.pay_way" :value="row.pay_way" />
<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> -->
<!-- <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_status">
<template #default="{ row }">
<dict-value :options="dictData.order_status" :value="row.order_status" />
</template>
</el-table-column>
<el-table-column label="支付状态" prop="pay_status">
<el-table-column label="服务方式" prop="server_type">
<template #default="{ row }">
<dict-value :options="dictData.pay_status" :value="row.pay_status" />
<div>服务方式: {{ getServerTypeLabel(row.server_type) }}</div>
</template>
</el-table-column>
<el-table-column label="支付时间" prop="pay_time" show-overflow-tooltip />
<el-table-column label="退款时间" prop="refund_time" show-overflow-tooltip />
<el-table-column label="退款金额" prop="refund_price" show-overflow-tooltip />
<el-table-column label="接单时间" prop="take_order_time" show-overflow-tooltip />
<el-table-column label="出发时间" prop="travel_time" show-overflow-tooltip />
<el-table-column label="到达时间" prop="arrival_time" show-overflow-tooltip />
<el-table-column label="是否打卡" prop="is_img" show-overflow-tooltip />
<el-table-column label="打卡时间" prop="img_time" show-overflow-tooltip />
<el-table-column label="打卡照片" prop="img">
<!-- <el-table-column label="出行状态" prop="take_order_time" show-overflow-tooltip width="200">
<template #default="{ row }">
<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 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">
</el-table-column> -->
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['order_teamaster/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
<el-button v-perms="['order_teamaster/details']" type="primary" link>
<router-link :to="{
path: getRoutePath('order_teamaster/details'),
query: {
id: row.id
}
}">
查看
</router-link>
</el-button>
<el-button
<!-- <el-button v-perms="['order_teamaster/edit']" type="primary" link @click="handleEdit(row)">
编辑
</el-button> -->
<!-- <el-button
v-perms="['order_teamaster/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</el-button> -->
</template>
</el-table-column> -->
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
@ -167,6 +208,7 @@ import { apiOrderTeamasterLists, apiOrderTeamasterDelete } from '@/api/order_tea
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import { getRoutePath } from '@/router'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框
@ -237,4 +279,4 @@ const getServerTypeLabel = (value: number | string) => {
}
getLists()
</script>
</script>