Merge pull request '修改预约模块bug' (#21) from sjy into master
Reviewed-on: #21
This commit is contained in:
commit
3b70742285
@ -12,12 +12,11 @@ export interface StaffVO {
|
||||
photo: string // 照片
|
||||
phone: string // 手机号
|
||||
serviceTime: string // 服务时间段
|
||||
serviceStartTime: string
|
||||
serviceEndTime: string
|
||||
serviceScope: string // 服务范围
|
||||
sign: number // 约满标记
|
||||
status: number // 状态
|
||||
content: string // 介绍
|
||||
serviceTimeArray: string
|
||||
}
|
||||
|
||||
// 预约人员 API
|
||||
@ -54,4 +53,4 @@ export const StaffApi = {
|
||||
|
||||
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
@ -113,6 +113,21 @@ export enum DICT_TYPE {
|
||||
TERMINAL = 'terminal', // 终端
|
||||
DATE_INTERVAL = 'date_interval', // 数据间隔
|
||||
|
||||
|
||||
//预约：人员管理
|
||||
STALL_SEX = 'stall_sex',
|
||||
STAFF_STATUS = 'staff_status',
|
||||
STAFF_FULL = 'staff_full',
|
||||
STAFF_TYPE = 'staff_type',
|
||||
|
||||
//预约：预约管理
|
||||
SUBSCRIBE_TYPE = 'subscribe_type',
|
||||
SUBSCRIBE_CHECK_STATUS = 'subscribe_check_status',
|
||||
SUBSCRIBE_STATUS = 'subscribe_status',
|
||||
|
||||
//预约：机构管理
|
||||
ORGANIZATION_STATUS = 'organization_status',
|
||||
|
||||
// ========== SYSTEM 模块 ==========
|
||||
SYSTEM_USER_SEX = 'system_user_sex',
|
||||
SYSTEM_MENU_TYPE = 'system_menu_type',
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="800">
|
||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
@ -68,6 +68,13 @@ const formData = ref({
|
||||
status: undefined,
|
||||
})
|
||||
const formRules = reactive({
|
||||
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
|
||||
phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
|
||||
email: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }],
|
||||
picturre: [{ required: true, message: '图片不能为空', trigger: 'blur' }],
|
||||
address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
|
||||
depict: [{ required: true, message: '简介不能为空', trigger: 'blur' }],
|
||||
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
|
||||
@ -1,28 +1,13 @@
|
||||
<template>
|
||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="90px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<!-- <el-form-item label="所属机构" prop="organizationId">
|
||||
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="90px" v-loading="formLoading">
|
||||
<!-- <el-form-item label="所属机构" prop="organizationId">
|
||||
<el-input v-model="formData.organizationId" placeholder="请输入机构id" />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="所属机构" prop="organizationId">
|
||||
<el-select
|
||||
v-model="formData.organizationId"
|
||||
placeholder="请选择机构"
|
||||
clearable
|
||||
class="!w-240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="organizationNameOptions in option"
|
||||
:key="organizationNameOptions.id"
|
||||
:label="organizationNameOptions.name"
|
||||
:value="organizationNameOptions.id"
|
||||
/>
|
||||
<el-select v-model="formData.organizationId" placeholder="请选择机构" clearable class="!w-240px">
|
||||
<el-option v-for="organizationNameOptions in option" :key="organizationNameOptions.id"
|
||||
:label="organizationNameOptions.name" :value="organizationNameOptions.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="编号" prop="serialNumber">
|
||||
@ -30,12 +15,8 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="类型" prop="type">
|
||||
<el-select v-model="formData.type" placeholder="请选择类型">
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.STAFF_TYPE)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.STAFF_TYPE)" :key="dict.value"
|
||||
:label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="名称" prop="name">
|
||||
@ -43,12 +24,8 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="性别" prop="sex">
|
||||
<el-select v-model="formData.sex" placeholder="请选择性别">
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.STALL_SEX)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.STALL_SEX)" :key="dict.value"
|
||||
:label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="照片" prop="photo">
|
||||
@ -59,59 +36,51 @@
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="服务时间段" prop="serviceTime">
|
||||
<!-- <el-date-picker
|
||||
v-model="formData.serviceTime"
|
||||
type="date"
|
||||
value-format="x"
|
||||
placeholder="选择服务时间段"
|
||||
/> -->
|
||||
<el-col :span="11">
|
||||
<div v-for="(item, index) in timeRanges" :key="index" class="time-range">
|
||||
<div class="left">
|
||||
<el-time-select
|
||||
placeholder="起始时间"
|
||||
v-model="formData.serviceStartTime"
|
||||
:picker-options="{
|
||||
start: '08:30',
|
||||
step: '00:15',
|
||||
end: '18:30'
|
||||
}"/>
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
<div style="text-align: center;">-</div>
|
||||
</el-col>
|
||||
<el-col :span="11">
|
||||
v-model="item.start"
|
||||
:max-time="item.end"
|
||||
class="mr-4"
|
||||
placeholder="开始时间"
|
||||
start="07:00"
|
||||
step="00:05"
|
||||
end="23:30"
|
||||
/>
|
||||
</div>
|
||||
<div class="center">
|
||||
-
|
||||
</div>
|
||||
<div class="right">
|
||||
<el-time-select
|
||||
v-model="item.end"
|
||||
:min-time="item.start"
|
||||
placeholder="结束时间"
|
||||
v-model="formData.serviceEndTime"
|
||||
:picker-options="{
|
||||
start: '08:30',
|
||||
step: '00:15',
|
||||
end: '18:30',
|
||||
minTime: formData.serviceStartTime
|
||||
}"/>
|
||||
</el-col>
|
||||
start="07:00"
|
||||
step="00:05"
|
||||
end="23:30"
|
||||
/>
|
||||
</div>
|
||||
<el-button @click="removeTime(index)" type="danger" size="mini">移除</el-button>
|
||||
</div>
|
||||
|
||||
<el-button @click="addTime" type="primary" size="small">添加时间段</el-button>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="服务范围" prop="serviceScope">
|
||||
<el-input v-model="formData.serviceScope" placeholder="请输入服务范围" />
|
||||
</el-form-item>
|
||||
<el-form-item label="约满标记" prop="sign">
|
||||
<el-select v-model="formData.sign" placeholder="请选择约满标记">
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.STAFF_FULL)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.STAFF_FULL)" :key="dict.value"
|
||||
:label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-select v-model="formData.status" placeholder="请选择状态">
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.STAFF_STATUS)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.STAFF_STATUS)" :key="dict.value"
|
||||
:label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="介绍" prop="content">
|
||||
@ -125,21 +94,22 @@
|
||||
</Dialog>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||
import { StaffApi, StaffVO } from '@/api/subscribe/staff'
|
||||
import { OrganizationApi, OrganizationVO } from '@/api/subscribe/organization'
|
||||
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||
import { StaffApi, StaffVO } from '@/api/subscribe/staff'
|
||||
import { OrganizationApi, OrganizationVO } from '@/api/subscribe/organization'
|
||||
|
||||
/** 预约人员 表单 */
|
||||
defineOptions({ name: 'StaffForm' })
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
const option = ref<OrganizationVO[]>([]);
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
||||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
||||
const formData = ref({
|
||||
/** 预约人员 表单 */
|
||||
defineOptions({ name: 'StaffForm' })
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
const option = ref<OrganizationVO[]>([]);
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
||||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
organizationId: undefined,
|
||||
serialNumber: undefined,
|
||||
@ -148,54 +118,88 @@ const formData = ref({
|
||||
sex: undefined,
|
||||
photo: undefined,
|
||||
phone: undefined,
|
||||
serviceTime: undefined,
|
||||
serviceStartTime: undefined,
|
||||
serviceEndTime: undefined,
|
||||
serviceTime: '',
|
||||
serviceTimeArray: [{}],
|
||||
serviceScope: undefined,
|
||||
sign: undefined,
|
||||
status: undefined,
|
||||
content: undefined,
|
||||
})
|
||||
const formRules = reactive({
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
})
|
||||
const formRules = reactive({
|
||||
organizationId: [{ required: true, message: '所属机构不能为空', trigger: 'blur' }],
|
||||
serialNumber: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
|
||||
type: [{ required: true, message: '类型不能为空', trigger: 'blur' }],
|
||||
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
|
||||
sex: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
|
||||
photo: [{ required: true, message: '照片不能为空', trigger: 'blur' }],
|
||||
phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
|
||||
// serviceTime: [{ required: true, message: '服务时间段不能为空', trigger: 'blur' }],
|
||||
serviceScope: [{ required: true, message: '服务范围不能为空', trigger: 'blur' }],
|
||||
sign: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
|
||||
content: [{ required: true, message: '介绍不能为空', trigger: 'blur' }]
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
//初始化机构名称下拉框
|
||||
const getOrganizations = async () => {
|
||||
|
||||
const timeRanges = ref([{ start: '', end: '' }]);
|
||||
|
||||
const addTime = () => {
|
||||
timeRanges.value.push({ start: '', end: '' });
|
||||
};
|
||||
|
||||
const removeTime = (index : number) => {
|
||||
if (timeRanges.value.length > 1) {
|
||||
timeRanges.value.splice(index, 1);
|
||||
}
|
||||
};
|
||||
|
||||
//初始化机构名称下拉框
|
||||
const getOrganizations = async () => {
|
||||
try {
|
||||
option.value = await OrganizationApi.getOrganizations()
|
||||
} finally {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (type: string, id?: number) => {
|
||||
/** 打开弹窗 */
|
||||
const open = async (type : string, id ?: number) => {
|
||||
dialogVisible.value = true
|
||||
dialogTitle.value = t('action.' + type)
|
||||
timeRanges.value = ([]) //清空timeRanges的数据
|
||||
timeRanges.value.push({ start: '', end: '' }); //再将timeRaanges设置为{ start: '', end: '' }
|
||||
formType.value = type
|
||||
resetForm()
|
||||
// 修改时，设置数据
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
timeRanges.value = ([]); //修改页面：组件设置为空
|
||||
formData.value = await StaffApi.getStaff(id)
|
||||
const timeRange = JSON.parse(formData.value.serviceTime)
|
||||
for (var i = 0; i < timeRange.length; i++) {
|
||||
timeRanges.value.push(timeRange[i]); //原有的时间段push上去
|
||||
}
|
||||
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
|
||||
|
||||
/** 提交表单 */
|
||||
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
|
||||
const submitForm = async () => {
|
||||
}
|
||||
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
|
||||
|
||||
/** 提交表单 */
|
||||
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
|
||||
const submitForm = async () => {
|
||||
|
||||
// 校验表单
|
||||
await formRef.value.validate()
|
||||
// 提交请求
|
||||
formLoading.value = true
|
||||
try {
|
||||
formData.value.serviceTime = JSON.stringify(timeRanges.value);
|
||||
const data = formData.value as unknown as StaffVO
|
||||
if (formType.value === 'create') {
|
||||
await StaffApi.createStaff(data)
|
||||
@ -210,10 +214,10 @@ const submitForm = async () => {
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
organizationId: undefined,
|
||||
@ -223,20 +227,51 @@ const resetForm = () => {
|
||||
sex: undefined,
|
||||
photo: undefined,
|
||||
phone: undefined,
|
||||
serviceTime: undefined,
|
||||
serviceStartTime: undefined,
|
||||
serviceEndTime: undefined,
|
||||
serviceTime: '',
|
||||
serviceTimeArray: [{}],
|
||||
serviceScope: undefined,
|
||||
sign: undefined,
|
||||
status: undefined,
|
||||
content: undefined,
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
getOrganizations()
|
||||
})
|
||||
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.time-range {
|
||||
margin-bottom: 10px;
|
||||
margin-right: 40px;
|
||||
/* width: 300px;
|
||||
height: 150px; */
|
||||
display: flex;
|
||||
/* justify-content: space-between; */
|
||||
}
|
||||
|
||||
.left {
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
.center {
|
||||
width: 20px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.right {
|
||||
width: 150px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
/* .separator {
|
||||
text-align: center;
|
||||
}
|
||||
.remove-btn {
|
||||
text-align: right;
|
||||
margin-top: 5px;
|
||||
} */
|
||||
</style>
|
||||
@ -80,7 +80,7 @@
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="服务时间段" prop="serviceTime">
|
||||
<!-- <el-form-item label="服务时间段" prop="serviceTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.serviceTime"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
@ -99,7 +99,7 @@
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="约满标记" prop="sign">
|
||||
<el-select
|
||||
v-model="queryParams.sign"
|
||||
@ -197,8 +197,8 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="手机号" align="center" prop="phone" />
|
||||
<el-table-column label="服务时间段" align="center" prop="serviceTime" width="100" />
|
||||
<el-table-column label="服务范围" align="center" prop="serviceScope" :formatter="dateFormatter"/>
|
||||
<el-table-column label="服务时间段" align="center" prop="serviceTimeArray" width="200" />
|
||||
<el-table-column label="服务范围" align="center" prop="serviceScope" />
|
||||
<el-table-column label="约满标记" align="center" prop="sign" width="100">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.STAFF_FULL" :value="scope.row.sign" />
|
||||
@ -209,7 +209,11 @@
|
||||
<dict-tag :type="DICT_TYPE.STAFF_STATUS" :value="scope.row.status" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="介绍" align="center" prop="content" />
|
||||
<el-table-column label="介绍" align="center" prop="content" >
|
||||
<template #default="scope">
|
||||
<div v-html="scope.row.content"></div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
align="center"
|
||||
@ -280,7 +284,7 @@ const queryParams = reactive({
|
||||
sex: undefined,
|
||||
photo: undefined,
|
||||
phone: undefined,
|
||||
serviceTime: [],
|
||||
serviceTime: undefined,
|
||||
serviceScope: undefined,
|
||||
sign: undefined,
|
||||
status: undefined,
|
||||
|
||||
@ -20,6 +20,12 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属机构" prop="organizationId">
|
||||
<el-select v-model="formData.organizationId" placeholder="请选择机构" clearable class="!w-240px">
|
||||
<el-option v-for="organizationNameOptions in option" :key="organizationNameOptions.id"
|
||||
:label="organizationNameOptions.name" :value="organizationNameOptions.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="预约人员id" prop="staffId">
|
||||
<el-input v-model="formData.staffId" placeholder="请输入预约人员id" />
|
||||
</el-form-item>
|
||||
@ -31,10 +37,20 @@
|
||||
placeholder="选择预约时间"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="预约状态" prop="subscribeStatus">
|
||||
<!-- <el-form-item label="预约状态" prop="subscribeStatus">
|
||||
<el-radio-group v-model="formData.subscribeStatus">
|
||||
<el-radio label="1">请选择字典生成</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="预约状态" prop="subscribeStatus">
|
||||
<el-select v-model="formData.subscribeStatus" placeholder="请选择预约状态">
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.SUBSCRIBE_STATUS)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="审核状态" prop="checkStatus">
|
||||
<el-select v-model="formData.checkStatus" placeholder="请选择审核状态">
|
||||
@ -56,6 +72,7 @@
|
||||
<script setup lang="ts">
|
||||
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||
import { ManageApi, ManageVO } from '@/api/subscribe/subscribemanage'
|
||||
import { OrganizationApi, OrganizationVO } from '@/api/subscribe/organization'
|
||||
|
||||
/** 预约 表单 */
|
||||
defineOptions({ name: 'ManageForm' })
|
||||
@ -65,6 +82,7 @@ const message = useMessage() // 消息弹窗
|
||||
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const option = ref<OrganizationVO[]>([]);
|
||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
||||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
||||
const formData = ref({
|
||||
@ -77,9 +95,23 @@ const formData = ref({
|
||||
checkStatus: undefined,
|
||||
})
|
||||
const formRules = reactive({
|
||||
userId: [{ required: true, message: '用户不能为空', trigger: 'blur' }],
|
||||
type: [{ required: true, message: '预约类型不能为空', trigger: 'blur' }],
|
||||
staffId: [{ required: true, message: '预约人员不能为空', trigger: 'blur' }],
|
||||
subscribeTime: [{ required: true, message: '预约时间不能为空', trigger: 'blur' }],
|
||||
subscribeStatus: [{ required: true, message: '预约状态不能为空', trigger: 'blur' }],
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
//初始化机构名称下拉框
|
||||
const getOrganizations = async () => {
|
||||
try {
|
||||
option.value = await OrganizationApi.getOrganizations()
|
||||
} finally {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (type: string, id?: number) => {
|
||||
dialogVisible.value = true
|
||||
@ -122,6 +154,10 @@ const submitForm = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
getOrganizations()
|
||||
})
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
:inline="true"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item label="用户" prop="userId">
|
||||
<!-- <el-form-item label="用户" prop="userId">
|
||||
<el-input
|
||||
v-model="queryParams.userId"
|
||||
placeholder="请输入用户"
|
||||
@ -16,7 +16,7 @@
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="预约类型" prop="type">
|
||||
<el-select
|
||||
v-model="queryParams.type"
|
||||
@ -32,7 +32,7 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="预约人员" prop="staffName">
|
||||
<!-- <el-form-item label="预约人员" prop="staffName">
|
||||
<el-input
|
||||
v-model="queryParams.staffName"
|
||||
placeholder="请输入预约人员"
|
||||
@ -40,8 +40,8 @@
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="预约时间" prop="subscribeTime">
|
||||
</el-form-item> -->
|
||||
<!-- <el-form-item label="预约时间" prop="subscribeTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.subscribeTime"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
@ -51,7 +51,7 @@
|
||||
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="预约状态" prop="subscribeStatus">
|
||||
<el-select
|
||||
v-model="queryParams.subscribeStatus"
|
||||
@ -59,7 +59,12 @@
|
||||
clearable
|
||||
class="!w-240px"
|
||||
>
|
||||
<el-option label="请选择字典生成" value="" />
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.SUBSCRIBE_STATUS)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="审核状态" prop="checkStatus">
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ServiceTimeVO {
|
||||
private String start;
|
||||
private String end;
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
package cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@ -37,14 +38,12 @@ public class StaffPageReqVO extends PageParam {
|
||||
private String phone;
|
||||
|
||||
@Schema(description = "服务时间段")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private String[] serviceTime;
|
||||
private String serviceTime;
|
||||
|
||||
// @Schema(description = "服务开始时间")
|
||||
// private String serviceStartTime;
|
||||
|
||||
@Schema(description = "服务开始时间")
|
||||
private String serviceStartTime;
|
||||
|
||||
@Schema(description = "服务结束时间")
|
||||
private String serviceEndTime;
|
||||
|
||||
@Schema(description = "服务范围")
|
||||
private String serviceScope;
|
||||
|
||||
@ -52,11 +52,10 @@ public class StaffRespVO {
|
||||
@ExcelProperty("服务时间段")
|
||||
private String serviceTime;
|
||||
|
||||
@Schema(description = "服务开始时间")
|
||||
private String serviceStartTime;
|
||||
|
||||
@Schema(description = "服务结束时间")
|
||||
private String serviceEndTime;
|
||||
// @Schema(description = "服务开始时间")
|
||||
// private String serviceStartTime;
|
||||
//
|
||||
private String serviceTimeArray;
|
||||
|
||||
@Schema(description = "服务范围")
|
||||
@ExcelProperty("服务范围")
|
||||
|
||||
@ -36,12 +36,6 @@ public class StaffSaveReqVO {
|
||||
@Schema(description = "服务时间段")
|
||||
private String serviceTime;
|
||||
|
||||
@Schema(description = "服务开始时间")
|
||||
private String serviceStartTime;
|
||||
|
||||
@Schema(description = "服务结束时间")
|
||||
private String serviceEndTime;
|
||||
|
||||
@Schema(description = "服务范围")
|
||||
private String serviceScope;
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package cn.iocoder.yudao.module.srbscribe.controller.admin.subscribemanage.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
@ -22,6 +23,10 @@ public class SubscribeManageRespVO {
|
||||
@ExcelProperty("用户id")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "用户姓名")
|
||||
@ExcelProperty("用户姓名")
|
||||
private String userName;
|
||||
|
||||
@Schema(description = "预约类型", example = "2")
|
||||
@ExcelProperty(value = "预约类型", converter = DictConvert.class)
|
||||
@DictFormat("subscribe_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
|
||||
@ -31,6 +36,10 @@ public class SubscribeManageRespVO {
|
||||
@ExcelProperty("预约人员id")
|
||||
private Long staffId;
|
||||
|
||||
@Schema(description = "预约人员")
|
||||
@ExcelProperty("预约人员")
|
||||
private String staffName;
|
||||
|
||||
@Schema(description = "预约时间")
|
||||
@ExcelProperty("预约时间")
|
||||
private LocalDateTime subscribeTime;
|
||||
@ -48,8 +57,6 @@ public class SubscribeManageRespVO {
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "预约人员")
|
||||
@ExcelProperty("预约人员")
|
||||
private String staffName;
|
||||
|
||||
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
package cn.iocoder.yudao.module.srbscribe.dal.dataobject.staff;
|
||||
|
||||
import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.ServiceTimeVO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
@ -64,14 +65,6 @@ public class StaffDO extends BaseDO {
|
||||
* 服务时间段
|
||||
*/
|
||||
private String serviceTime;
|
||||
/**
|
||||
* 服务开始时间
|
||||
*/
|
||||
private String serviceStartTime;
|
||||
/**
|
||||
* 服务结束时间
|
||||
*/
|
||||
private String serviceEndTime;
|
||||
/**
|
||||
* 服务范围
|
||||
*/
|
||||
@ -97,4 +90,7 @@ public class StaffDO extends BaseDO {
|
||||
@TableField(exist = false)
|
||||
private String organizationName;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String serviceTimeArray ;
|
||||
|
||||
}
|
||||
@ -23,9 +23,7 @@ public interface OrganizationMapper extends BaseMapperX<OrganizationDO> {
|
||||
.likeIfPresent(OrganizationDO::getName, reqVO.getName())
|
||||
.eqIfPresent(OrganizationDO::getPhone, reqVO.getPhone())
|
||||
.eqIfPresent(OrganizationDO::getEmail, reqVO.getEmail())
|
||||
.eqIfPresent(OrganizationDO::getPicture, reqVO.getPicture())
|
||||
.eqIfPresent(OrganizationDO::getAddress, reqVO.getAddress())
|
||||
.eqIfPresent(OrganizationDO::getDepict, reqVO.getDepict())
|
||||
.likeIfPresent(OrganizationDO::getAddress, reqVO.getAddress())
|
||||
.eqIfPresent(OrganizationDO::getStatus, reqVO.getStatus())
|
||||
.betweenIfPresent(OrganizationDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(OrganizationDO::getId));
|
||||
|
||||
@ -24,7 +24,7 @@ public interface StaffMapper extends BaseMapperX<StaffDO> {
|
||||
.eqIfPresent(StaffDO::getSex, reqVO.getSex())
|
||||
.eqIfPresent(StaffDO::getPhoto, reqVO.getPhoto())
|
||||
.eqIfPresent(StaffDO::getPhone, reqVO.getPhone())
|
||||
.betweenIfPresent(StaffDO::getServiceTime, reqVO.getServiceTime())
|
||||
// .betweenIfPresent(StaffDO::getServiceTime, reqVO.getServiceTime())
|
||||
.eqIfPresent(StaffDO::getServiceScope, reqVO.getServiceScope())
|
||||
.eqIfPresent(StaffDO::getSign, reqVO.getSign())
|
||||
.eqIfPresent(StaffDO::getStatus, reqVO.getStatus())
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
package cn.iocoder.yudao.module.srbscribe.service.staff;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.ServiceTimeVO;
|
||||
import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.StaffPageReqVO;
|
||||
import cn.iocoder.yudao.module.srbscribe.controller.admin.staff.vo.StaffSaveReqVO;
|
||||
import cn.iocoder.yudao.module.srbscribe.dal.dataobject.organization.OrganizationDO;
|
||||
import cn.iocoder.yudao.module.srbscribe.dal.dataobject.staff.StaffDO;
|
||||
import cn.iocoder.yudao.module.srbscribe.dal.mysql.organization.OrganizationMapper;
|
||||
import cn.iocoder.yudao.module.srbscribe.dal.mysql.staff.StaffMapper;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.alibaba.fastjson.TypeReference;
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static cn.iocoder.yudao.module.subscribe.enums.ErrorCodeConstants.*;
|
||||
|
||||
@ -40,6 +47,7 @@ public class StaffServiceImpl implements StaffService {
|
||||
|
||||
@Override
|
||||
public void updateStaff(StaffSaveReqVO updateReqVO) {
|
||||
JSON.toJSONString(updateReqVO.getServiceTime());
|
||||
// 校验存在
|
||||
validateStaffExists(updateReqVO.getId());
|
||||
// 更新
|
||||
@ -69,11 +77,24 @@ public class StaffServiceImpl implements StaffService {
|
||||
@Override
|
||||
public PageResult<StaffDO> getStaffPage(StaffPageReqVO pageReqVO) {
|
||||
PageResult<StaffDO> staffDOPageResult = staffMapper.selectPage(pageReqVO);
|
||||
|
||||
String serviceTime = "";
|
||||
for (int i = 0; i < staffDOPageResult.getList().size(); i++) {
|
||||
StaffDO staffDO = staffDOPageResult.getList().get(i);
|
||||
OrganizationDO organizationDO = organizationMapper.selectOne("id", staffDO.getOrganizationId());
|
||||
staffDO.setOrganizationName(organizationDO.getName());
|
||||
|
||||
//把StringJSON格式serviceTime转成对象
|
||||
List<ServiceTimeVO> serviceTimeVOS = JSON.parseObject(staffDO.getServiceTime(), new TypeReference<List<ServiceTimeVO>>() {});
|
||||
for (int j = 0; j < serviceTimeVOS.size(); j++) {
|
||||
ServiceTimeVO serviceTimeVO = serviceTimeVOS.get(j);
|
||||
serviceTime = serviceTime + serviceTimeVO.getStart() + " - " + serviceTimeVO.getEnd() + " , ";
|
||||
}
|
||||
String replaceAll = serviceTime.replaceAll(",\\s*$", "");
|
||||
staffDO.setServiceTimeArray(replaceAll);
|
||||
serviceTime = "";
|
||||
}
|
||||
|
||||
return staffDOPageResult;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user