完善列表

This commit is contained in:
wangxiaowei
2026-02-02 02:38:39 +08:00
parent 8bfe58eaac
commit 36cbd04de7
8 changed files with 379 additions and 302 deletions

View File

@ -1,21 +1,10 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="头像" prop="avatar">
<div>
<div>
<material-picker v-model="formData.avatar" :limit="1" />
</div>
<div class="form-tips">建议尺寸100*100px支持jpgjpegpng格式</div>
</div>
<material-picker v-model="formData.avatar" :limit="1" />
</el-form-item>
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="formData.nickname" clearable placeholder="请输入用户昵称" />
@ -28,31 +17,23 @@
</el-form-item>
<el-form-item label="茶艺师等级" prop="level">
<el-select class="flex-1" v-model="formData.level" clearable placeholder="请选择茶艺师等级">
<el-option
v-for="(item, index) in dictData.level"
:key="index"
:label="item.name"
:value="parseInt(item.value)"
/>
<el-option v-for="(item, index) in dictData.level" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item label="星级" prop="star">
<el-input v-model="formData.star" clearable placeholder="请输入星级" />
</el-form-item>
<el-form-item label="茶艺服务单价" prop="price">
<el-form-item label="服务单价" prop="price">
<el-input v-model="formData.price" clearable placeholder="请输入茶艺服务单价" />
</el-form-item>
<el-form-item label="车马费/每公里" prop="mileage_price">
<el-form-item label="车马费" prop="mileage_price">
<el-input v-model="formData.mileage_price" clearable placeholder="请输入车马费/每公里" />
</el-form-item>
<el-form-item label="是否免费出行0免费" prop="is_mileage">
<el-select class="flex-1" v-model="formData.is_mileage" clearable placeholder="请选择是否免费出行0免费">
<el-option
v-for="(item, index) in dictData.is_mileage"
:key="index"
:label="item.name"
:value="parseInt(item.value)"
/>
<el-form-item label="是否免费出行" prop="is_mileage">
<el-select class="flex-1" v-model="formData.is_mileage" clearable placeholder="请选择">
<el-option label="免费" value="0"></el-option>
<el-option label="收费" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="服务次数" prop="sold">
@ -60,38 +41,38 @@
</el-form-item>
<el-form-item label="服务方式" prop="server_type">
<el-select class="flex-1" v-model="formData.server_type" clearable placeholder="请选择服务方式">
<el-option label="全部" :value="3"></el-option>
<el-option
v-for="(item, index) in dictData.server_type"
:key="index"
:label="item.name"
:value="parseInt(item.value)"
/>
<el-option v-for="(item, index) in dictData.server_type" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item label="地址位置" prop="address_id">
<el-input v-model="formData.address_id" clearable placeholder="请输入地址位置" />
<!-- <el-form-item label="服务区域" prop="address_id">
<el-input v-model="formData.address_id" clearable placeholder="请输入服务区域" />
</el-form-item> -->
<el-form-item label="所属城市" prop="city_id">
<el-select v-model="formData.city_id" clearable placeholder="请选择">
<el-option :label="item.name" :value="item.id" v-for="item in cityList"
:key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否禁用: [0=否, 1=是]" prop="disable">
<el-input v-model="formData.disable" clearable placeholder="请输入是否禁用: [0=否, 1=是]" />
<el-form-item label="地址" prop="longitude">
<el-input v-model="formData.address" clearable placeholder="请输入经度" />
</el-form-item>
<el-form-item label="不可提现金额" prop="no_reflect_amount">
<el-input v-model="formData.no_reflect_amount" clearable placeholder="请输入不可提现金额" />
<el-form-item label="经度" prop="longitude">
<el-input v-model="formData.longitude" clearable placeholder="请输入经度" />
</el-form-item>
<el-form-item label="累计额度" prop="total_amount">
<el-input v-model="formData.total_amount" clearable placeholder="请输入累计额度" />
</el-form-item>
<el-form-item label="累计提现" prop="total_reflect_amount">
<el-input v-model="formData.total_reflect_amount" clearable placeholder="请输入累计提现" />
<el-form-item label="纬度" prop="latitude">
<el-input v-model="formData.latitude" clearable placeholder="请输入纬度" />
</el-form-item>
<el-form-item label="状态" prop="state">
<el-select class="flex-1" v-model="formData.state" clearable placeholder="请选择状态">
<el-option
v-for="(item, index) in dictData.state"
:key="index"
:label="item.name"
:value="parseInt(item.value)"
/>
<el-select class="flex-1" v-model="formData.state" clearable placeholder="请选择">
<el-option label="可约" :value="0"></el-option>
<el-option label="不可约" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否禁用" prop="is_disable">
<el-select class="flex-1" v-model="formData.is_disable" clearable placeholder="请选择">
<el-option label="否" :value="0"></el-option>
<el-option label="是" :value="1"></el-option>
</el-select>
</el-form-item>
</el-form>
@ -100,11 +81,14 @@
</template>
<script lang="ts" setup name="teamasterUserEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiTeamasterUserAdd, apiTeamasterUserEdit, apiTeamasterUserDetail } from '@/api/teamaster_user'
import { timeFormat } from '@/utils/util'
import { timeFormat, removeImageUrlPrefix, normalizeImageUrl } from '@/utils/util'
import type { PropType } from 'vue'
import { apiTeaStoreCityLists } from '@/api/tea_store'
import type { FormInstance } from 'element-plus'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
@ -119,7 +103,7 @@ const mode = ref('add')
// 弹窗标题
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑用户表' : '新增用户表'
return mode.value == 'edit' ? '编辑茶艺师' : '新增茶艺师'
})
// 表单数据
@ -136,14 +120,28 @@ const formData = reactive({
is_mileage: '',
sold: '',
server_type: '',
address_id: '',
disable: '',
no_reflect_amount: '',
total_amount: '',
total_reflect_amount: '',
address_id: 0,
city_id: '',
address: '',
longitude: '',
latitude: '',
is_disable: '',
state: '',
})
// 城市列表
const cityList = ref<any[]>([])
onMounted(async () => {
try {
const res = await apiTeaStoreCityLists()
cityList.value = res || []
} catch (e) {
cityList.value = []
}
})
// 表单验证
const formRules = reactive<any>({
@ -159,8 +157,9 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key]
}
}
//@ts-ignore
// formData.avatar = normalizeImageUrl(formData.avatar)
}
const getDetail = async (row: Record<string, any>) => {
@ -171,32 +170,14 @@ const getDetail = async (row: Record<string, any>) => {
}
// 将完整URL转换为相对路径
const getRelativePath = (url: string) => {
if (!url) return url
// 如果是完整URL提取相对路径
if (url.startsWith('http://') || url.startsWith('https://')) {
try {
const urlObj = new URL(url)
return urlObj.pathname
} catch {
// 如果URL解析失败尝试手动提取
const match = url.match(/https?:\/\/[^\/]+(\/.*)/)
return match ? match[1] : url
}
}
return url
}
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
const data = {
...formData,
avatar: getRelativePath(formData.avatar)
}
mode.value == 'edit'
? await apiTeamasterUserEdit(data)
let data = { ...formData, }
data.avatar = removeImageUrlPrefix(data.avatar)
mode.value == 'edit'
? await apiTeamasterUserEdit(data)
: await apiTeamasterUserAdd(data)
popupRef.value?.close()
emit('success')

View File

@ -1,72 +1,48 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="用户昵称" prop="nickname">
<el-input class="w-[280px]" v-model="queryParams.nickname" clearable placeholder="请输入用户昵称" />
</el-form-item>
<el-form-item label="用户电话" prop="mobile">
<el-input class="w-[280px]" v-model="queryParams.mobile" clearable placeholder="请输入用户电话" />
</el-form-item>
<el-form-item label="茶艺师等级" prop="level">
<el-select class="w-[280px]" v-model="queryParams.level" clearable placeholder="请选择茶艺师等级">
<el-form-item class="w-[280px]" label="茶艺师等级" prop="level">
<el-select v-model="queryParams.level" clearable placeholder="请选择茶艺师等级">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in dictData.level"
:key="index"
:label="item.name"
:value="item.value"
/>
<el-option v-for="(item, index) in dictData.level" :key="index" :label="item.name"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="是否免费出行0免费" prop="is_mileage">
<el-select class="w-[280px]" v-model="queryParams.is_mileage" clearable placeholder="请选择是否免费出行0免费">
<el-form-item class="w-[280px]" label="是否免费出行" prop="is_mileage">
<el-select v-model="queryParams.is_mileage" clearable placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in dictData.is_mileage"
:key="index"
:label="item.name"
:value="item.value"
/>
<el-option label="免费" value="0"></el-option>
<el-option label="收费" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="服务方式" prop="server_type">
<el-select class="w-[280px]" v-model="queryParams.server_type" clearable placeholder="请选择服务方式">
<el-form-item class="w-[280px]" label="服务方式" prop="server_type">
<el-select v-model="queryParams.server_type" clearable placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in dictData.server_type"
:key="index"
:label="item.name"
:value="item.value"
/>
<el-option label="上门服务" value="0"></el-option>
<el-option label="到店服务" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否禁用0-否1-是;" prop="disable">
<el-select class="w-[280px]" v-model="queryParams.disable" clearable placeholder="请选择是否禁用0-否1-是;">
<el-form-item class="w-[280px]" label="是否禁用" prop="disable">
<el-select v-model="queryParams.disable" clearable placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in dictData.disable"
:key="index"
:label="item.name"
:value="item.value"
/>
<el-option label="否" value="0"></el-option>
<el-option label="是" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="state">
<!-- <el-form-item label="状态" prop="state">
<el-select class="w-[280px]" v-model="queryParams.state" clearable placeholder="请选择状态">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in dictData.state"
:key="index"
:label="item.name"
:value="item.value"
/>
<el-option v-for="(item, index) in dictData.state" :key="index" :label="item.name"
:value="item.value" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@ -74,32 +50,23 @@
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button v-perms="['teamaster_user/add']" type="primary" @click="handleAdd">
<el-button v-perms="['teamaster_user/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button> -->
<!-- <el-button
v-perms="['teamaster_user/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
</el-button>
<el-button v-perms="['teamaster_user/delete']" :disabled="!selectData.length"
@click="handleDelete(selectData)">
删除
</el-button> -->
</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="avatar" ><template #default="{ row }">
<el-image
v-if="row.avatar"
style="width: 60px; height: 60px"
:src="row.avatar"
:preview-src-list="[row.avatar]"
fit="cover"
/>
<span v-else class="text-gray-400">无图片</span>
</template>
<el-table-column label="头像" prop="avatar" show-overflow-tooltip>
<template #default="{ row }">
<el-image style="width:50px;height:50px;" :src="row.avatar" />
</template>
</el-table-column>
<el-table-column label="用户昵称" prop="nickname" show-overflow-tooltip />
<el-table-column label="用户账号" prop="account" show-overflow-tooltip />
@ -112,11 +79,11 @@
<el-table-column label="星级" prop="star" show-overflow-tooltip />
<el-table-column label="茶艺服务单价" prop="price" show-overflow-tooltip />
<el-table-column label="车马费/每公里" prop="mileage_price" show-overflow-tooltip />
<el-table-column label="是否免费出行0免费" prop="is_mileage">
<!-- <el-table-column label="是否免费出行0免费" prop="is_mileage">
<template #default="{ row }">
<dict-value :options="dictData.is_mileage" :value="row.is_mileage" />
<dict-value :options="dictData." :value="row.is_mileage" />
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="服务次数" prop="sold" show-overflow-tooltip />
<el-table-column label="服务方式" prop="server_type">
<template #default="{ row }">
@ -124,13 +91,13 @@
</template>
</el-table-column>
<el-table-column label="地址位置" prop="address_id" show-overflow-tooltip />
<el-table-column label="是否禁用: [0=否, 1=是]" prop="is_disable" show-overflow-tooltip />
<el-table-column label="不可提现金额" prop="no_reflect_amount" show-overflow-tooltip />
<el-table-column label="累计额度" prop="total_amount" show-overflow-tooltip />
<el-table-column label="累计提现" prop="total_reflect_amount" show-overflow-tooltip />
<el-table-column label="是否禁用0-否1-是;" prop="disable">
<el-table-column label="是否禁用" prop="disable">
<template #default="{ row }">
<dict-value :options="dictData.disable" :value="row.disable" />
<span v-if="row.disable == 0"></span>
<span v-if="row.disable == 1"></span>
</template>
</el-table-column>
<el-table-column label="状态" prop="state">
@ -140,22 +107,13 @@
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['teamaster_user/edit']"
type="primary"
link
@click="handleEdit(row)"
>
<el-button v-perms="['teamaster_user/edit']" type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<!-- <el-button
v-perms="['teamaster_user/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
<el-button v-perms="['teamaster_user/delete']" type="danger" link
@click="handleDelete(row.id)">
删除
</el-button> -->
</el-button>
</template>
</el-table-column>
</el-table>
@ -201,7 +159,7 @@ const handleSelectionChange = (val: any[]) => {
}
// 获取字典数据
const { dictData } = useDictData('level,is_mileage,server_type,disable,state')
const { dictData } = useDictData('level,server_type,state')
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
@ -233,4 +191,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>