Browse Source

1

yuhongzhe
于宏哲PHP 10 months ago
parent
commit
f33ba89f9f
  1. 23
      admin/src/app/api/service.ts
  2. 25
      admin/src/app/api/user_feedback.ts
  3. 52
      admin/src/app/lang/zh-cn/service.service.json
  4. 24
      admin/src/app/lang/zh-cn/user_feedback.user_feedback.json
  5. 31
      admin/src/app/views/customer_resources/components/customer-resources-edit.vue
  6. 48
      admin/src/app/views/customer_resources/customer_resources.vue
  7. 4
      admin/src/app/views/departments/departments.vue
  8. 3
      admin/src/app/views/member/components/edit-member.vue
  9. 40
      admin/src/app/views/order_table/components/order-table-edit.vue
  10. 251
      admin/src/app/views/service/components/service-edit.vue
  11. 263
      admin/src/app/views/service/service.vue
  12. 120
      admin/src/app/views/user_feedback/components/user-feedback-edit.vue
  13. 144
      admin/src/app/views/user_feedback/user_feedback.vue
  14. 4
      niucloud/app/adminapi/controller/customer_resources/CustomerResources.php
  15. 6
      niucloud/app/adminapi/controller/departments/Departments.php
  16. 7
      niucloud/app/adminapi/controller/order_table/OrderTable.php
  17. 7
      niucloud/app/adminapi/controller/service/Service.php
  18. 8
      niucloud/app/adminapi/controller/user_feedback/UserFeedback.php
  19. 1
      niucloud/app/adminapi/route/service.php
  20. 3
      niucloud/app/adminapi/route/user_feedback.php
  21. 13
      niucloud/app/model/customer_resources/CustomerResources.php
  22. 96
      niucloud/app/model/service/Service.php
  23. 42
      niucloud/app/model/user_feedback/UserFeedback.php
  24. 32
      niucloud/app/service/admin/customer_resources/CustomerResourcesService.php
  25. 13
      niucloud/app/service/admin/departments/DepartmentsService.php
  26. 12
      niucloud/app/service/admin/order_table/OrderTableService.php
  27. 2
      niucloud/app/service/admin/service/ServiceService.php
  28. 10
      niucloud/app/service/admin/user_feedback/UserFeedbackService.php
  29. 4
      niucloud/app/validate/order_table/OrderTable.php
  30. 6
      niucloud/app/validate/user_feedback/UserFeedback.php

23
admin/src/app/api/service.ts

@ -1,5 +1,7 @@
import request from '@/utils/request' import request from '@/utils/request'
// USER_CODE_BEGIN -- service // USER_CODE_BEGIN -- service
/** /**
* *
@ -7,7 +9,7 @@ import request from '@/utils/request'
* @returns * @returns
*/ */
export function getServiceList(params: Record<string, any>) { export function getServiceList(params: Record<string, any>) {
return request.get(`service/service`, { params }) return request.get(`service/service`, {params})
} }
/** /**
@ -16,7 +18,7 @@ export function getServiceList(params: Record<string, any>) {
* @returns * @returns
*/ */
export function getServiceInfo(id: number) { export function getServiceInfo(id: number) {
return request.get(`service/service/${id}`) return request.get(`service/service/${id}`);
} }
/** /**
@ -25,10 +27,7 @@ export function getServiceInfo(id: number) {
* @returns * @returns
*/ */
export function addService(params: Record<string, any>) { export function addService(params: Record<string, any>) {
return request.post('service/service', params, { return request.post('service/service', params, { showErrorMessage: true, showSuccessMessage: true })
showErrorMessage: true,
showSuccessMessage: true,
})
} }
/** /**
@ -38,10 +37,7 @@ export function addService(params: Record<string, any>) {
* @returns * @returns
*/ */
export function editService(params: Record<string, any>) { export function editService(params: Record<string, any>) {
return request.put(`service/service/${params.id}`, params, { return request.put(`service/service/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
showErrorMessage: true,
showSuccessMessage: true,
})
} }
/** /**
@ -50,10 +46,9 @@ export function editService(params: Record<string, any>) {
* @returns * @returns
*/ */
export function deleteService(id: number) { export function deleteService(id: number) {
return request.delete(`service/service/${id}`, { return request.delete(`service/service/${id}`, { showErrorMessage: true, showSuccessMessage: true })
showErrorMessage: true,
showSuccessMessage: true,
})
} }
// USER_CODE_END -- service // USER_CODE_END -- service

25
admin/src/app/api/user_feedback.ts

@ -1,5 +1,7 @@
import request from '@/utils/request' import request from '@/utils/request'
// USER_CODE_BEGIN -- user_feedback // USER_CODE_BEGIN -- user_feedback
/** /**
* *
@ -7,7 +9,7 @@ import request from '@/utils/request'
* @returns * @returns
*/ */
export function getUserFeedbackList(params: Record<string, any>) { export function getUserFeedbackList(params: Record<string, any>) {
return request.get(`user_feedback/user_feedback`, { params }) return request.get(`user_feedback/user_feedback`, {params})
} }
/** /**
@ -16,7 +18,7 @@ export function getUserFeedbackList(params: Record<string, any>) {
* @returns * @returns
*/ */
export function getUserFeedbackInfo(id: number) { export function getUserFeedbackInfo(id: number) {
return request.get(`user_feedback/user_feedback/${id}`) return request.get(`user_feedback/user_feedback/${id}`);
} }
/** /**
@ -25,10 +27,7 @@ export function getUserFeedbackInfo(id: number) {
* @returns * @returns
*/ */
export function addUserFeedback(params: Record<string, any>) { export function addUserFeedback(params: Record<string, any>) {
return request.post('user_feedback/user_feedback', params, { return request.post('user_feedback/user_feedback', params, { showErrorMessage: true, showSuccessMessage: true })
showErrorMessage: true,
showSuccessMessage: true,
})
} }
/** /**
@ -38,10 +37,7 @@ export function addUserFeedback(params: Record<string, any>) {
* @returns * @returns
*/ */
export function editUserFeedback(params: Record<string, any>) { export function editUserFeedback(params: Record<string, any>) {
return request.put(`user_feedback/user_feedback/${params.id}`, params, { return request.put(`user_feedback/user_feedback/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
showErrorMessage: true,
showSuccessMessage: true,
})
} }
/** /**
@ -50,10 +46,11 @@ export function editUserFeedback(params: Record<string, any>) {
* @returns * @returns
*/ */
export function deleteUserFeedback(id: number) { export function deleteUserFeedback(id: number) {
return request.delete(`user_feedback/user_feedback/${id}`, { return request.delete(`user_feedback/user_feedback/${id}`, { showErrorMessage: true, showSuccessMessage: true })
showErrorMessage: true, }
showSuccessMessage: true,
}) export function getWithCustomerResourcesList(params: Record<string,any>){
return request.get('user_feedback/customer_resources_all', {params})
} }
// USER_CODE_END -- user_feedback // USER_CODE_END -- user_feedback

52
admin/src/app/lang/zh-cn/service.service.json

@ -1,29 +1,27 @@
{ {
"id": "服务编号", "serviceName":"服务名称",
"idPlaceholder": "请输入服务编号", "serviceNamePlaceholder":"请输入服务名称",
"serviceName": "服务名称", "previewImageUrl":"服务预览图",
"serviceNamePlaceholder": "请输入服务名称", "previewImageUrlPlaceholder":"请输入服务预览图",
"previewImageUrl": "服务预览图URL", "description":"服务描述",
"previewImageUrlPlaceholder": "请输入服务预览图URL", "descriptionPlaceholder":"请输入服务描述",
"description": "服务描述", "serviceType":"服务类型",
"descriptionPlaceholder": "请输入服务描述", "serviceTypePlaceholder":"请输入服务类型",
"serviceType": "服务类型", "executionRules":"服务执行规则",
"serviceTypePlaceholder": "请输入服务类型", "executionRulesPlaceholder":"请输入服务执行规则",
"executionRules": "服务执行规则", "staffReminder":"是否员工提醒",
"executionRulesPlaceholder": "请输入服务执行规则", "staffReminderPlaceholder":"请输入是否员工提醒",
"staffReminder": "是否员工提醒: 1-是, 0-否", "customerReminder":"是否客户提醒",
"staffReminderPlaceholder": "请输入是否员工提醒: 1-是, 0-否", "customerReminderPlaceholder":"请输入是否客户提醒",
"customerReminder": "是否客户提醒: 1-是, 0-否", "customerConfirmation":"是否客户确认",
"customerReminderPlaceholder": "请输入是否客户提醒: 1-是, 0-否", "customerConfirmationPlaceholder":"请输入是否客户确认",
"customerConfirmation": "是否客户确认: 1-是, 0-否", "customerFeedback":"客户反馈内容",
"customerConfirmationPlaceholder": "请输入是否客户确认: 1-是, 0-否", "customerFeedbackPlaceholder":"请输入客户反馈内容",
"customerFeedback": "客户反馈内容", "status":"状态",
"customerFeedbackPlaceholder": "请输入客户反馈内容", "statusPlaceholder":"请输入状态",
"status": "状态", "addService":"添加服务",
"statusPlaceholder": "请输入状态", "updateService":"编辑服务",
"addService": "添加服务", "serviceDeleteTips":"确定要删除该数据吗?",
"updateService": "编辑服务", "startDate":"请选择开始时间",
"serviceDeleteTips": "确定要删除该数据吗?", "endDate":"请选择结束时间"
"startDate": "请选择开始时间",
"endDate": "请选择结束时间"
} }

24
admin/src/app/lang/zh-cn/user_feedback.user_feedback.json

@ -1,15 +1,13 @@
{ {
"id": "反馈编号", "userId":"客户名称",
"idPlaceholder": "请输入反馈编号", "userIdPlaceholder":"全部",
"userId": "用户ID", "feedbackText":"反馈内容",
"userIdPlaceholder": "请输入用户ID", "feedbackTextPlaceholder":"请输入反馈内容",
"feedbackText": "反馈内容", "attachmentUrl":"附件",
"feedbackTextPlaceholder": "请输入反馈内容", "attachmentUrlPlaceholder":"请输入附件",
"attachmentUrl": "附件URL(OSS对象存储)", "addUserFeedback":"添加用户反馈信息",
"attachmentUrlPlaceholder": "请输入附件URL(OSS对象存储)", "updateUserFeedback":"查看用户反馈信息",
"addUserFeedback": "添加用户反馈信息", "userFeedbackDeleteTips":"确定要删除该数据吗?",
"updateUserFeedback": "编辑用户反馈信息", "startDate":"请选择开始时间",
"userFeedbackDeleteTips": "确定要删除该数据吗?", "endDate":"请选择结束时间"
"startDate": "请选择开始时间",
"endDate": "请选择结束时间"
} }

31
admin/src/app/views/customer_resources/components/customer-resources-edit.vue

@ -230,6 +230,26 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="会员标签">
<el-select
v-model="formData.member_label"
multiple
collapse-tags
placeholder="请选择会员标签"
class="input-width"
>
<el-option
:label="item['label_name']"
:value="item['label_id']"
v-for="(item, index) in labelSelectData"
:key="index"
/>
</el-select>
</el-form-item>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
@ -410,6 +430,7 @@ import { ref, reactive, computed, watch } from 'vue'
import { useDictionary } from '@/app/api/dict' import { useDictionary } from '@/app/api/dict'
import { t } from '@/lang' import { t } from '@/lang'
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import { getMemberLabelAll } from '@/app/api/member'
import { import {
addCustomerResources, addCustomerResources,
editCustomerResources, editCustomerResources,
@ -448,6 +469,7 @@ const initialFormData = {
initial_intent: '', initial_intent: '',
campus: '', campus: '',
status: '', status: '',
member_label:'',
purchase_power: '', purchase_power: '',
concept_awareness: '', concept_awareness: '',
@ -461,6 +483,15 @@ const initialFormData = {
second_visit_status: '', second_visit_status: '',
is_closed: '', is_closed: '',
} }
const labelSelectData: any = ref(null)
//
const getMemberLabelAllFn = async () => {
labelSelectData.value = await (await getMemberLabelAll()).data
}
getMemberLabelAllFn()
const formData: Record<string, any> = reactive({ ...initialFormData }) const formData: Record<string, any> = reactive({ ...initialFormData })
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()

48
admin/src/app/views/customer_resources/customer_resources.vue

@ -36,6 +36,24 @@
:placeholder="t('phoneNumberPlaceholder')" /> :placeholder="t('phoneNumberPlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item label="会员标签" prop="member_label">
<el-select
v-model="customerResourcesTable.searchParam.member_label"
collapse-tags
clearable
placeholder="请选择会员标签"
class="input-width"
>
<el-option label="会员标签" value="" />
<el-option
:label="item['label_name']"
:value="item['label_id']"
v-for="(item, index) in labelSelectData"
:key="index"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="customerResourcesTable.searchParam.created_at" type="daterange" range-separator="" <el-date-picker v-model="customerResourcesTable.searchParam.created_at" type="daterange" range-separator=""
@ -93,6 +111,26 @@
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column
prop="member_label"
label="会员标签"
min-width="120"
align="center"
>
<template #default="{ row }">
<div class="flex flex-col items-center">
<div
v-for="(item, key) in row.member_label_array"
class="my-[3px]"
:key="key"
>
<el-tag type="info">{{ item.label_name }}</el-tag>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="created_at" label="添加时间" min-width="120" :show-overflow-tooltip="true" /> <el-table-column prop="created_at" label="添加时间" min-width="120" :show-overflow-tooltip="true" />
<el-table-column prop="updated_at" label="修改时间" min-width="120" :show-overflow-tooltip="true" /> <el-table-column prop="updated_at" label="修改时间" min-width="120" :show-overflow-tooltip="true" />
@ -160,9 +198,10 @@
import Edit from '@/app/views/customer_resources/components/customer-resources-edit.vue' import Edit from '@/app/views/customer_resources/components/customer-resources-edit.vue'
import Fp from '@/app/views/customer_resources/components/fp.vue' import Fp from '@/app/views/customer_resources/components/fp.vue'
import Order from '@/app/views/order_table/components/order-table-edit.vue' import Order from '@/app/views/order_table/components/order-table-edit.vue'
import Tc from '@/app/views/tc_dialog/tc_dialog.vue' import Tc from '@/app/views/tc_dialog/tc_dialog.vue'
import { getMemberLabelAll } from '@/app/api/member'
import { useRouter, useRoute } from 'vue-router' import { useRouter, useRoute } from 'vue-router'
const route = useRoute() const route = useRoute()
const pageName = route.meta.title; const pageName = route.meta.title;
@ -179,6 +218,7 @@
"age": "", "age": "",
"gender": "", "gender": "",
"phone_number": "", "phone_number": "",
"member_label" : "",
'type': '', 'type': '',
"created_at" : "", "created_at" : "",
"updated_at" : "" "updated_at" : ""
@ -195,6 +235,12 @@
// const type = pageName == '' ? 'yjfp' : 'khzy'; // const type = pageName == '' ? 'yjfp' : 'khzy';
//
const labelSelectData = ref([])
const getMemberLabelAllFn = async () => {
labelSelectData.value = await (await getMemberLabelAll()).data
}
getMemberLabelAllFn()
const modificationLog = (id : number) => { const modificationLog = (id : number) => {

4
admin/src/app/views/departments/departments.vue

@ -25,7 +25,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="t('parentDepartmentId')" label="上级部门"
prop="parent_department_id" prop="parent_department_id"
> >
<el-select <el-select
@ -72,7 +72,7 @@
<el-table-column <el-table-column
prop="parent_department_id_name" prop="parent_department_id_name"
:label="t('parentDepartmentId')" label="上级部门"
min-width="120" min-width="120"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />

3
admin/src/app/views/member/components/edit-member.vue

@ -47,6 +47,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('memberLabel')" v-if="type == 'member_label'"> <el-form-item :label="t('memberLabel')" v-if="type == 'member_label'">
<el-select <el-select
v-model="saveData.member_label" v-model="saveData.member_label"
@ -63,6 +64,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<div v-if="type == 'member_level'"> <div v-if="type == 'member_level'">
<el-form-item :label="t('memberLevelUpdate')" prop="member_level"> <el-form-item :label="t('memberLevelUpdate')" prop="member_level">
<el-select <el-select

40
admin/src/app/views/order_table/components/order-table-edit.vue

@ -12,7 +12,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--
<el-form-item :label="t('orderStatus')" prop="order_status"> <el-form-item :label="t('orderStatus')" prop="order_status">
<el-select class="input-width" v-model="formData.order_status" clearable :placeholder="t('orderStatusPlaceholder')"> <el-select class="input-width" v-model="formData.order_status" clearable :placeholder="t('orderStatusPlaceholder')">
<el-option label="请选择" value=""></el-option> <el-option label="请选择" value=""></el-option>
@ -23,7 +23,7 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item :label="t('paymentType')" prop="payment_type"> <el-form-item :label="t('paymentType')" prop="payment_type">
<el-select class="input-width" v-model="formData.payment_type" clearable :placeholder="t('paymentTypePlaceholder')"> <el-select class="input-width" v-model="formData.payment_type" clearable :placeholder="t('paymentTypePlaceholder')">
@ -37,12 +37,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('orderAmount')" prop="order_amount">
<el-input v-model="formData.order_amount" clearable :placeholder="t('orderAmountPlaceholder')" class="input-width" />
</el-form-item>
<el-form-item :label="t('courseId')" prop="course_id"> <el-form-item :label="t('courseId')" prop="course_id">
<el-select class="input-width" v-model="formData.course_id" clearable :placeholder="t('courseIdPlaceholder')"> <el-select class="input-width" v-model="formData.course_id" clearable :placeholder="t('courseIdPlaceholder')" @change="handleCourseChange">
<el-option label="请选择" value=""></el-option> <el-option label="请选择" value=""></el-option>
<el-option <el-option
v-for="(item, index) in courseIdList" v-for="(item, index) in courseIdList"
@ -53,6 +49,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('orderAmount')" prop="order_amount">
<el-input v-model="formData.order_amount" :placeholder="t('orderAmountPlaceholder')" class="input-width" disabled/>
</el-form-item>
<el-form-item :label="t('classId')" prop="class_id"> <el-form-item :label="t('classId')" prop="class_id">
<el-select class="input-width" v-model="formData.class_id" clearable :placeholder="t('classIdPlaceholder')"> <el-select class="input-width" v-model="formData.class_id" clearable :placeholder="t('classIdPlaceholder')">
<el-option label="请选择" value=""></el-option> <el-option label="请选择" value=""></el-option>
@ -88,13 +91,17 @@ import { addOrderTable, editOrderTable, getOrderTableInfo, getWithCustomerResour
let showDialog = ref(false) let showDialog = ref(false)
const loading = ref(false) const loading = ref(false)
function handleCourseChange(selectedId) {
const selectedCourse = courseIdList.value.find(item => item.id === selectedId)
formData.order_amount = selectedCourse ? selectedCourse.price : ''
}
/** /**
* 表单数据 * 表单数据
*/ */
const initialFormData = { const initialFormData = {
id: '', id: '',
resource_id: '', resource_id: '',
order_status: '', // order_status: '',
payment_type: '', payment_type: '',
order_amount: '', order_amount: '',
course_id: '', course_id: '',
@ -110,11 +117,6 @@ const formRules = computed(() => {
resource_id: [ resource_id: [
{ required: true, message: t('resourceIdPlaceholder'), trigger: 'blur' }, { required: true, message: t('resourceIdPlaceholder'), trigger: 'blur' },
]
,
order_status: [
{ required: true, message: t('orderStatusPlaceholder'), trigger: 'blur' },
] ]
, ,
payment_type: [ payment_type: [
@ -168,12 +170,12 @@ const confirm = async (formEl: FormInstance | undefined) => {
} }
// //
let order_statusList = ref([]) // let order_statusList = ref([])
const order_statusDictList = async () => { // const order_statusDictList = async () => {
order_statusList.value = await (await useDictionary('order_status')).data.dictionary // order_statusList.value = await (await useDictionary('order_status')).data.dictionary
} // }
order_statusDictList(); // order_statusDictList();
watch(() => order_statusList.value, () => { formData.order_status = order_statusList.value[0].value }) // watch(() => order_statusList.value, () => { formData.order_status = order_statusList.value[0].value })
let payment_typeList = ref([]) let payment_typeList = ref([])
const payment_typeDictList = async () => { const payment_typeDictList = async () => {
payment_typeList.value = await (await useDictionary('payment_type')).data.dictionary payment_typeList.value = await (await useDictionary('payment_type')).data.dictionary

251
admin/src/app/views/service/components/service-edit.vue

@ -1,122 +1,86 @@
<template> <template>
<el-dialog <el-dialog v-model="showDialog" :title="formData.id ? t('updateService') : t('addService')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
v-model="showDialog" <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
:title="formData.id ? t('updateService') : t('addService')"
width="50%"
class="diy-dialog-wrap"
:destroy-on-close="true"
>
<el-form
:model="formData"
label-width="120px"
ref="formRef"
:rules="formRules"
class="page-form"
v-loading="loading"
>
<el-form-item :label="t('serviceName')" prop="service_name"> <el-form-item :label="t('serviceName')" prop="service_name">
<el-input <el-input v-model="formData.service_name" clearable :placeholder="t('serviceNamePlaceholder')" class="input-width" />
v-model="formData.service_name"
clearable
:placeholder="t('serviceNamePlaceholder')"
class="input-width"
/>
</el-form-item> </el-form-item>
<el-form-item :label="t('previewImageUrl')"> <el-form-item :label="t('previewImageUrl')">
<el-input <upload-image v-model="formData.preview_image_url" />
v-model="formData.preview_image_url"
clearable
:placeholder="t('previewImageUrlPlaceholder')"
class="input-width"
/>
</el-form-item> </el-form-item>
<el-form-item :label="t('description')" prop="description"> <el-form-item :label="t('description')" prop="description">
<el-input <el-input v-model="formData.description" clearable :placeholder="t('descriptionPlaceholder')" class="input-width" />
v-model="formData.description"
clearable
:placeholder="t('descriptionPlaceholder')"
class="input-width"
/>
</el-form-item> </el-form-item>
<el-form-item :label="t('serviceType')" prop="service_type"> <el-form-item :label="t('serviceType')" prop="service_type">
<el-input <el-input v-model="formData.service_type" clearable :placeholder="t('serviceTypePlaceholder')" class="input-width" />
v-model="formData.service_type"
clearable
:placeholder="t('serviceTypePlaceholder')"
class="input-width"
/>
</el-form-item> </el-form-item>
<el-form-item :label="t('executionRules')" prop="execution_rules"> <el-form-item :label="t('executionRules')" prop="execution_rules">
<el-input <el-input v-model="formData.execution_rules" clearable :placeholder="t('executionRulesPlaceholder')" class="input-width" />
v-model="formData.execution_rules"
clearable
:placeholder="t('executionRulesPlaceholder')"
class="input-width"
/>
</el-form-item> </el-form-item>
<el-form-item :label="t('staffReminder')" prop="staff_reminder"> <el-form-item :label="t('staffReminder')" prop="staff_reminder">
<el-input <el-select class="input-width" v-model="formData.staff_reminder" clearable :placeholder="t('staffReminderPlaceholder')">
v-model="formData.staff_reminder" <el-option label="请选择" value=""></el-option>
clearable <el-option
:placeholder="t('staffReminderPlaceholder')" v-for="(item, index) in staff_reminderList"
class="input-width" :key="index"
:label="item.name"
:value="item.value"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('customerReminder')" prop="customer_reminder"> <el-form-item :label="t('customerReminder')" prop="customer_reminder">
<el-input <el-select class="input-width" v-model="formData.customer_reminder" clearable :placeholder="t('customerReminderPlaceholder')">
v-model="formData.customer_reminder" <el-option label="请选择" value=""></el-option>
clearable <el-option
:placeholder="t('customerReminderPlaceholder')" v-for="(item, index) in customer_reminderList"
class="input-width" :key="index"
:label="item.name"
:value="item.value"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item :label="t('customerConfirmation')" prop="customer_confirmation">
:label="t('customerConfirmation')" <el-select class="input-width" v-model="formData.customer_confirmation" clearable :placeholder="t('customerConfirmationPlaceholder')">
prop="customer_confirmation" <el-option label="请选择" value=""></el-option>
> <el-option
<el-input v-for="(item, index) in customer_confirmationList"
v-model="formData.customer_confirmation" :key="index"
clearable :label="item.name"
:placeholder="t('customerConfirmationPlaceholder')" :value="item.value"
class="input-width"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('customerFeedback')"> <el-form-item :label="t('customerFeedback')" >
<el-input <el-input v-model="formData.customer_feedback" clearable :placeholder="t('customerFeedbackPlaceholder')" class="input-width" />
v-model="formData.customer_feedback"
clearable
:placeholder="t('customerFeedbackPlaceholder')"
class="input-width"
/>
</el-form-item> </el-form-item>
<el-form-item :label="t('status')" prop="status"> <el-form-item :label="t('status')" prop="status">
<el-input <el-select class="input-width" v-model="formData.status" clearable :placeholder="t('statusPlaceholder')">
v-model="formData.status" <el-option label="请选择" value=""></el-option>
clearable <el-option
:placeholder="t('statusPlaceholder')" v-for="(item, index) in statusList"
class="input-width" :key="index"
:label="item.name"
:value="item.value"
/> />
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="showDialog = false">{{ t('cancel') }}</el-button> <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
<el-button <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
type="primary" t('confirm')
:loading="loading" }}</el-button>
@click="confirm(formRef)"
>{{ t('confirm') }}</el-button
>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -157,58 +121,54 @@ const formRules = computed(() => {
return { return {
service_name: [ service_name: [
{ required: true, message: t('serviceNamePlaceholder'), trigger: 'blur' }, { required: true, message: t('serviceNamePlaceholder'), trigger: 'blur' },
],
]
,
preview_image_url: [ preview_image_url: [
{ { required: true, message: t('previewImageUrlPlaceholder'), trigger: 'blur' },
required: true,
message: t('previewImageUrlPlaceholder'), ]
trigger: 'blur', ,
},
],
description: [ description: [
{ required: true, message: t('descriptionPlaceholder'), trigger: 'blur' }, { required: true, message: t('descriptionPlaceholder'), trigger: 'blur' },
],
]
,
service_type: [ service_type: [
{ required: true, message: t('serviceTypePlaceholder'), trigger: 'blur' }, { required: true, message: t('serviceTypePlaceholder'), trigger: 'blur' },
],
]
,
execution_rules: [ execution_rules: [
{ { required: true, message: t('executionRulesPlaceholder'), trigger: 'blur' },
required: true,
message: t('executionRulesPlaceholder'), ]
trigger: 'blur', ,
},
],
staff_reminder: [ staff_reminder: [
{ { required: true, message: t('staffReminderPlaceholder'), trigger: 'blur' },
required: true,
message: t('staffReminderPlaceholder'), ]
trigger: 'blur', ,
},
],
customer_reminder: [ customer_reminder: [
{ { required: true, message: t('customerReminderPlaceholder'), trigger: 'blur' },
required: true,
message: t('customerReminderPlaceholder'), ]
trigger: 'blur', ,
},
],
customer_confirmation: [ customer_confirmation: [
{ { required: true, message: t('customerConfirmationPlaceholder'), trigger: 'blur' },
required: true,
message: t('customerConfirmationPlaceholder'), ]
trigger: 'blur', ,
},
],
customer_feedback: [ customer_feedback: [
{ { required: true, message: t('customerFeedbackPlaceholder'), trigger: 'blur' },
required: true,
message: t('customerFeedbackPlaceholder'), ]
trigger: 'blur', ,
},
],
status: [ status: [
{ required: true, message: t('statusPlaceholder'), trigger: 'blur' }, { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
],
]
,
} }
}) })
@ -228,13 +188,11 @@ const confirm = async (formEl: FormInstance | undefined) => {
let data = formData let data = formData
save(data) save(data).then(res => {
.then((res) => {
loading.value = false loading.value = false
showDialog.value = false showDialog.value = false
emit('complete') emit('complete')
}) }).catch(err => {
.catch((err) => {
loading.value = false loading.value = false
}) })
} }
@ -242,14 +200,38 @@ const confirm = async (formEl: FormInstance | undefined) => {
} }
// //
let staff_reminderList = ref([])
const staff_reminderDictList = async () => {
staff_reminderList.value = await (await useDictionary('global_true_or_false')).data.dictionary
}
staff_reminderDictList();
watch(() => staff_reminderList.value, () => { formData.staff_reminder = staff_reminderList.value[0].value })
let customer_reminderList = ref([])
const customer_reminderDictList = async () => {
customer_reminderList.value = await (await useDictionary('global_true_or_false')).data.dictionary
}
customer_reminderDictList();
watch(() => customer_reminderList.value, () => { formData.customer_reminder = customer_reminderList.value[0].value })
let customer_confirmationList = ref([])
const customer_confirmationDictList = async () => {
customer_confirmationList.value = await (await useDictionary('global_true_or_false')).data.dictionary
}
customer_confirmationDictList();
watch(() => customer_confirmationList.value, () => { formData.customer_confirmation = customer_confirmationList.value[0].value })
let statusList = ref([])
const statusDictList = async () => {
statusList.value = await (await useDictionary('SiteStatus')).data.dictionary
}
statusDictList();
watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
const setFormData = async (row: any = null) => { const setFormData = async (row: any = null) => {
Object.assign(formData, initialFormData) Object.assign(formData, initialFormData)
loading.value = true loading.value = true
if (row) { if(row){
const data = await (await getServiceInfo(row.id)).data const data = await (await getServiceInfo(row.id)).data
if (data) if (data) Object.keys(formData).forEach((key: string) => {
Object.keys(formData).forEach((key: string) => {
if (data[key] != undefined) formData[key] = data[key] if (data[key] != undefined) formData[key] = data[key]
}) })
} }
@ -267,12 +249,7 @@ const mobileVerify = (rule: any, value: any, callback: any) => {
// //
const idCardVerify = (rule: any, value: any, callback: any) => { const idCardVerify = (rule: any, value: any, callback: any) => {
if ( if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
value &&
!/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
value
)
) {
callback(new Error(t('generateIdCard'))) callback(new Error(t('generateIdCard')))
} else { } else {
callback() callback()
@ -299,13 +276,13 @@ const numberVerify = (rule: any, value: any, callback: any) => {
defineExpose({ defineExpose({
showDialog, showDialog,
setFormData, setFormData
}) })
</script> </script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>
<style lang="scss"> <style lang="scss">
.diy-dialog-wrap .el-form-item__label { .diy-dialog-wrap .el-form-item__label{
height: auto !important; height: auto !important;
} }
</style> </style>

263
admin/src/app/views/service/service.vue

@ -1,200 +1,75 @@
<template> <template>
<div class="main-container"> <div class="main-container">
<el-card class="box-card !border-none" shadow="never"> <el-card class="box-card !border-none" shadow="never">
<div class="flex justify-between items-center"> <div class="flex justify-between items-center">
<span class="text-lg">{{ pageName }}</span> <span class="text-lg">{{pageName}}</span>
<el-button type="primary" @click="addEvent"> <el-button type="primary" @click="addEvent">
{{ t('addService') }} {{ t('addService') }}
</el-button> </el-button>
</div> </div>
<el-card <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
class="box-card !border-none my-[10px] table-search-wrap" <el-form :inline="true" :model="serviceTable.searchParam" ref="searchFormRef">
shadow="never"
>
<el-form
:inline="true"
:model="serviceTable.searchParam"
ref="searchFormRef"
>
<el-form-item :label="t('serviceName')" prop="service_name"> <el-form-item :label="t('serviceName')" prop="service_name">
<el-input <el-input v-model="serviceTable.searchParam.service_name" :placeholder="t('serviceNamePlaceholder')" />
v-model="serviceTable.searchParam.service_name"
:placeholder="t('serviceNamePlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('previewImageUrl')" prop="preview_image_url">
<el-input
v-model="serviceTable.searchParam.preview_image_url"
:placeholder="t('previewImageUrlPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('description')" prop="description">
<el-input
v-model="serviceTable.searchParam.description"
:placeholder="t('descriptionPlaceholder')"
/>
</el-form-item> </el-form-item>
<el-form-item :label="t('serviceType')" prop="service_type"> <el-form-item :label="t('serviceType')" prop="service_type">
<el-input <el-input v-model="serviceTable.searchParam.service_type" :placeholder="t('serviceTypePlaceholder')" />
v-model="serviceTable.searchParam.service_type"
:placeholder="t('serviceTypePlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('executionRules')" prop="execution_rules">
<el-input
v-model="serviceTable.searchParam.execution_rules"
:placeholder="t('executionRulesPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('staffReminder')" prop="staff_reminder">
<el-input
v-model="serviceTable.searchParam.staff_reminder"
:placeholder="t('staffReminderPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('customerReminder')" prop="customer_reminder">
<el-input
v-model="serviceTable.searchParam.customer_reminder"
:placeholder="t('customerReminderPlaceholder')"
/>
</el-form-item>
<el-form-item
:label="t('customerConfirmation')"
prop="customer_confirmation"
>
<el-input
v-model="serviceTable.searchParam.customer_confirmation"
:placeholder="t('customerConfirmationPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('customerFeedback')" prop="customer_feedback">
<el-input
v-model="serviceTable.searchParam.customer_feedback"
:placeholder="t('customerFeedbackPlaceholder')"
/>
</el-form-item> </el-form-item>
<el-form-item :label="t('status')" prop="status"> <el-form-item :label="t('status')" prop="status">
<el-input <el-select class="w-[280px]" v-model="serviceTable.searchParam.status" clearable :placeholder="t('statusPlaceholder')">
v-model="serviceTable.searchParam.status" <el-option label="全部" value=""></el-option>
:placeholder="t('statusPlaceholder')" <el-option
/> v-for="(item, index) in statusList"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="loadServiceList()">{{ <el-button type="primary" @click="loadServiceList()">{{ t('search') }}</el-button>
t('search') <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
}}</el-button>
<el-button @click="resetForm(searchFormRef)">{{
t('reset')
}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<div class="mt-[10px]"> <div class="mt-[10px]">
<el-table <el-table :data="serviceTable.data" size="large" v-loading="serviceTable.loading">
:data="serviceTable.data"
size="large"
v-loading="serviceTable.loading"
>
<template #empty> <template #empty>
<span>{{ !serviceTable.loading ? t('emptyData') : '' }}</span> <span>{{ !serviceTable.loading ? t('emptyData') : '' }}</span>
</template> </template>
<el-table-column <el-table-column prop="service_name" :label="t('serviceName')" min-width="120" :show-overflow-tooltip="true"/>
prop="service_name"
:label="t('serviceName')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column prop="description" :label="t('description')" min-width="120" :show-overflow-tooltip="true"/>
prop="preview_image_url"
:label="t('previewImageUrl')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column prop="service_type" :label="t('serviceType')" min-width="120" :show-overflow-tooltip="true"/>
prop="description"
:label="t('description')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column prop="customer_feedback" :label="t('customerFeedback')" min-width="120" :show-overflow-tooltip="true"/>
prop="service_type"
:label="t('serviceType')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column :label="t('status')" min-width="180" align="center" :show-overflow-tooltip="true">
prop="execution_rules" <template #default="{ row }">
:label="t('executionRules')" <div v-for="(item, index) in statusList">
min-width="120" <div v-if="item.value == row.status">{{ item.name }}</div>
:show-overflow-tooltip="true" </div>
/> </template>
</el-table-column>
<el-table-column
prop="staff_reminder"
:label="t('staffReminder')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="customer_reminder"
:label="t('customerReminder')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="customer_confirmation"
:label="t('customerConfirmation')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="customer_feedback"
:label="t('customerFeedback')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="status"
:label="t('status')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column :label="t('operation')" fixed="right" min-width="120">
:label="t('operation')"
fixed="right"
min-width="120"
>
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" link @click="editEvent(row)">{{ <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
t('edit') <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
}}</el-button>
<el-button type="primary" link @click="deleteEvent(row.id)">{{
t('delete')
}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="mt-[16px] flex justify-end"> <div class="mt-[16px] flex justify-end">
<el-pagination <el-pagination v-model:current-page="serviceTable.page" v-model:page-size="serviceTable.limit"
v-model:current-page="serviceTable.page" layout="total, sizes, prev, pager, next, jumper" :total="serviceTable.total"
v-model:page-size="serviceTable.limit" @size-change="loadServiceList()" @current-change="loadServiceList" />
layout="total, sizes, prev, pager, next, jumper"
:total="serviceTable.total"
@size-change="loadServiceList()"
@current-change="loadServiceList"
/>
</div> </div>
</div> </div>
@ -209,11 +84,11 @@ import { t } from '@/lang'
import { useDictionary } from '@/app/api/dict' import { useDictionary } from '@/app/api/dict'
import { getServiceList, deleteService } from '@/app/api/service' import { getServiceList, deleteService } from '@/app/api/service'
import { img } from '@/utils/common' import { img } from '@/utils/common'
import { ElMessageBox, FormInstance } from 'element-plus' import { ElMessageBox,FormInstance } from 'element-plus'
import Edit from '@/app/views/service/components/service-edit.vue' import Edit from '@/app/views/service/components/service-edit.vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
const route = useRoute() const route = useRoute()
const pageName = route.meta.title const pageName = route.meta.title;
let serviceTable = reactive({ let serviceTable = reactive({
page: 1, page: 1,
@ -221,18 +96,11 @@ let serviceTable = reactive({
total: 0, total: 0,
loading: true, loading: true,
data: [], data: [],
searchParam: { searchParam:{
service_name: '', "service_name":"",
preview_image_url: '', "service_type":"",
description: '', "status":""
service_type: '', }
execution_rules: '',
staff_reminder: '',
customer_reminder: '',
customer_confirmation: '',
customer_feedback: '',
status: '',
},
}) })
const searchFormRef = ref<FormInstance>() const searchFormRef = ref<FormInstance>()
@ -241,6 +109,26 @@ const searchFormRef = ref<FormInstance>()
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])
// //
const staff_reminderList = ref([] as any[])
const staff_reminderDictList = async () => {
staff_reminderList.value = await (await useDictionary('global_true_or_false')).data.dictionary
}
staff_reminderDictList();
const customer_reminderList = ref([] as any[])
const customer_reminderDictList = async () => {
customer_reminderList.value = await (await useDictionary('global_true_or_false')).data.dictionary
}
customer_reminderDictList();
const customer_confirmationList = ref([] as any[])
const customer_confirmationDictList = async () => {
customer_confirmationList.value = await (await useDictionary('global_true_or_false')).data.dictionary
}
customer_confirmationDictList();
const statusList = ref([] as any[])
const statusDictList = async () => {
statusList.value = await (await useDictionary('SiteStatus')).data.dictionary
}
statusDictList();
/** /**
* 获取服务列表 * 获取服务列表
@ -252,14 +140,12 @@ const loadServiceList = (page: number = 1) => {
getServiceList({ getServiceList({
page: serviceTable.page, page: serviceTable.page,
limit: serviceTable.limit, limit: serviceTable.limit,
...serviceTable.searchParam, ...serviceTable.searchParam
}) }).then(res => {
.then((res) => {
serviceTable.loading = false serviceTable.loading = false
serviceTable.data = res.data.data serviceTable.data = res.data.data
serviceTable.total = res.data.total serviceTable.total = res.data.total
}) }).catch(() => {
.catch(() => {
serviceTable.loading = false serviceTable.loading = false
}) })
} }
@ -288,19 +174,22 @@ const editEvent = (data: any) => {
* 删除服务 * 删除服务
*/ */
const deleteEvent = (id: number) => { const deleteEvent = (id: number) => {
ElMessageBox.confirm(t('serviceDeleteTips'), t('warning'), { ElMessageBox.confirm(t('serviceDeleteTips'), t('warning'),
{
confirmButtonText: t('confirm'), confirmButtonText: t('confirm'),
cancelButtonText: t('cancel'), cancelButtonText: t('cancel'),
type: 'warning', type: 'warning',
}).then(() => { }
deleteService(id) ).then(() => {
.then(() => { deleteService(id).then(() => {
loadServiceList() loadServiceList()
}).catch(() => {
}) })
.catch(() => {})
}) })
} }
const resetForm = (formEl: FormInstance | undefined) => { const resetForm = (formEl: FormInstance | undefined) => {
if (!formEl) return if (!formEl) return
formEl.resetFields() formEl.resetFields()
@ -317,5 +206,5 @@ const resetForm = (formEl: FormInstance | undefined) => {
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
</style> </style>

120
admin/src/app/views/user_feedback/components/user-feedback-edit.vue

@ -1,56 +1,33 @@
<template> <template>
<el-dialog <el-dialog v-model="showDialog" :title="formData.id ? t('updateUserFeedback') : t('addUserFeedback')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
v-model="showDialog" <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
:title="formData.id ? t('updateUserFeedback') : t('addUserFeedback')" <el-form-item :label="t('userId')" >
width="50%" <el-select class="input-width" v-model="formData.user_id" clearable :placeholder="t('userIdPlaceholder')" disabled>
class="diy-dialog-wrap" <el-option label="请选择" value=""></el-option>
:destroy-on-close="true" <el-option
> v-for="(item, index) in userIdList"
<el-form :key="index"
:model="formData" :label="item['name']"
label-width="120px" :value="item['id']"
ref="formRef"
:rules="formRules"
class="page-form"
v-loading="loading"
>
<el-form-item :label="t('userId')" prop="user_id">
<el-input
v-model="formData.user_id"
clearable
:placeholder="t('userIdPlaceholder')"
class="input-width"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('feedbackText')" prop="feedback_text"> <el-form-item :label="t('feedbackText')" >
<el-input <el-input disabled v-model="formData.feedback_text" type="textarea" rows="4" clearable :placeholder="t('feedbackTextPlaceholder')" class="input-width"/>
v-model="formData.feedback_text"
clearable
:placeholder="t('feedbackTextPlaceholder')"
class="input-width"
/>
</el-form-item> </el-form-item>
<el-form-item :label="t('attachmentUrl')" >
<el-form-item :label="t('attachmentUrl')"> <upload-file v-model="formData.attachment_url" disabled/>
<el-input
v-model="formData.attachment_url"
clearable
:placeholder="t('attachmentUrlPlaceholder')"
class="input-width"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="showDialog = false">{{ t('cancel') }}</el-button> <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
<el-button <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
type="primary" t('confirm')
:loading="loading" }}</el-button>
@click="confirm(formRef)"
>{{ t('confirm') }}</el-button
>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -61,11 +38,7 @@ import { ref, reactive, computed, watch } from 'vue'
import { useDictionary } from '@/app/api/dict' import { useDictionary } from '@/app/api/dict'
import { t } from '@/lang' import { t } from '@/lang'
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import { import { addUserFeedback, editUserFeedback, getUserFeedbackInfo, getWithCustomerResourcesList } from '@/app/api/user_feedback'
addUserFeedback,
editUserFeedback,
getUserFeedbackInfo,
} from '@/app/api/user_feedback'
let showDialog = ref(false) let showDialog = ref(false)
const loading = ref(false) const loading = ref(false)
@ -88,21 +61,19 @@ const formRules = computed(() => {
return { return {
user_id: [ user_id: [
{ required: true, message: t('userIdPlaceholder'), trigger: 'blur' }, { required: true, message: t('userIdPlaceholder'), trigger: 'blur' },
],
]
,
feedback_text: [ feedback_text: [
{ { required: true, message: t('feedbackTextPlaceholder'), trigger: 'blur' },
required: true,
message: t('feedbackTextPlaceholder'), ]
trigger: 'blur', ,
},
],
attachment_url: [ attachment_url: [
{ { required: true, message: t('attachmentUrlPlaceholder'), trigger: 'blur' },
required: true,
message: t('attachmentUrlPlaceholder'), ]
trigger: 'blur', ,
},
],
} }
}) })
@ -122,13 +93,11 @@ const confirm = async (formEl: FormInstance | undefined) => {
let data = formData let data = formData
save(data) save(data).then(res => {
.then((res) => {
loading.value = false loading.value = false
showDialog.value = false showDialog.value = false
emit('complete') emit('complete')
}) }).catch(err => {
.catch((err) => {
loading.value = false loading.value = false
}) })
} }
@ -137,13 +106,19 @@ const confirm = async (formEl: FormInstance | undefined) => {
// //
const userIdList = ref([] as any[])
const setUserIdList = async () => {
userIdList.value = await (await getWithCustomerResourcesList({})).data
}
setUserIdList()
const setFormData = async (row: any = null) => { const setFormData = async (row: any = null) => {
Object.assign(formData, initialFormData) Object.assign(formData, initialFormData)
loading.value = true loading.value = true
if (row) { if(row){
const data = await (await getUserFeedbackInfo(row.id)).data const data = await (await getUserFeedbackInfo(row.id)).data
if (data) if (data) Object.keys(formData).forEach((key: string) => {
Object.keys(formData).forEach((key: string) => {
if (data[key] != undefined) formData[key] = data[key] if (data[key] != undefined) formData[key] = data[key]
}) })
} }
@ -161,12 +136,7 @@ const mobileVerify = (rule: any, value: any, callback: any) => {
// //
const idCardVerify = (rule: any, value: any, callback: any) => { const idCardVerify = (rule: any, value: any, callback: any) => {
if ( if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
value &&
!/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
value
)
) {
callback(new Error(t('generateIdCard'))) callback(new Error(t('generateIdCard')))
} else { } else {
callback() callback()
@ -193,13 +163,13 @@ const numberVerify = (rule: any, value: any, callback: any) => {
defineExpose({ defineExpose({
showDialog, showDialog,
setFormData, setFormData
}) })
</script> </script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>
<style lang="scss"> <style lang="scss">
.diy-dialog-wrap .el-form-item__label { .diy-dialog-wrap .el-form-item__label{
height: auto !important; height: auto !important;
} }
</style> </style>

144
admin/src/app/views/user_feedback/user_feedback.vue

@ -1,106 +1,58 @@
<template> <template>
<div class="main-container"> <div class="main-container">
<el-card class="box-card !border-none" shadow="never"> <el-card class="box-card !border-none" shadow="never">
<div class="flex justify-between items-center"> <div class="flex justify-between items-center">
<span class="text-lg">{{ pageName }}</span> <span class="text-lg">{{pageName}}</span>
<el-button type="primary" @click="addEvent"> <el-button type="primary" @click="addEvent">
{{ t('addUserFeedback') }} {{ t('addUserFeedback') }}
</el-button> </el-button>
</div> </div>
<el-card <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
class="box-card !border-none my-[10px] table-search-wrap" <el-form :inline="true" :model="userFeedbackTable.searchParam" ref="searchFormRef">
shadow="never"
>
<el-form
:inline="true"
:model="userFeedbackTable.searchParam"
ref="searchFormRef"
>
<el-form-item :label="t('userId')" prop="user_id"> <el-form-item :label="t('userId')" prop="user_id">
<el-input <el-select class="w-[280px]" v-model="userFeedbackTable.searchParam.user_id" clearable :placeholder="t('userIdPlaceholder')">
v-model="userFeedbackTable.searchParam.user_id" <el-option
:placeholder="t('userIdPlaceholder')" v-for="(item, index) in userIdList"
/> :key="index"
</el-form-item> :label="item['name']"
<el-form-item :label="t('feedbackText')" prop="feedback_text"> :value="item['id']"
<el-input
v-model="userFeedbackTable.searchParam.feedback_text"
:placeholder="t('feedbackTextPlaceholder')"
/>
</el-form-item>
<el-form-item :label="t('attachmentUrl')" prop="attachment_url">
<el-input
v-model="userFeedbackTable.searchParam.attachment_url"
:placeholder="t('attachmentUrlPlaceholder')"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="loadUserFeedbackList()">{{ <el-button type="primary" @click="loadUserFeedbackList()">{{ t('search') }}</el-button>
t('search') <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
}}</el-button>
<el-button @click="resetForm(searchFormRef)">{{
t('reset')
}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<div class="mt-[10px]"> <div class="mt-[10px]">
<el-table <el-table :data="userFeedbackTable.data" size="large" v-loading="userFeedbackTable.loading">
:data="userFeedbackTable.data"
size="large"
v-loading="userFeedbackTable.loading"
>
<template #empty> <template #empty>
<span>{{ !userFeedbackTable.loading ? t('emptyData') : '' }}</span> <span>{{ !userFeedbackTable.loading ? t('emptyData') : '' }}</span>
</template> </template>
<el-table-column <el-table-column prop="user_id_name" :label="t('userId')" min-width="120" :show-overflow-tooltip="true"/>
prop="user_id"
:label="t('userId')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column prop="feedback_text" :label="t('feedbackText')" min-width="120" :show-overflow-tooltip="true"/>
prop="feedback_text"
:label="t('feedbackText')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column prop="attachment_url" :label="t('attachmentUrl')" min-width="120" :show-overflow-tooltip="true"/>
prop="attachment_url"
:label="t('attachmentUrl')"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column :label="t('operation')" fixed="right" min-width="120">
:label="t('operation')"
fixed="right"
min-width="120"
>
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" link @click="editEvent(row)">{{ <el-button type="primary" link @click="editEvent(row)">查看</el-button>
t('edit') <!-- <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button> -->
}}</el-button>
<el-button type="primary" link @click="deleteEvent(row.id)">{{
t('delete')
}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="mt-[16px] flex justify-end"> <div class="mt-[16px] flex justify-end">
<el-pagination <el-pagination v-model:current-page="userFeedbackTable.page" v-model:page-size="userFeedbackTable.limit"
v-model:current-page="userFeedbackTable.page" layout="total, sizes, prev, pager, next, jumper" :total="userFeedbackTable.total"
v-model:page-size="userFeedbackTable.limit" @size-change="loadUserFeedbackList()" @current-change="loadUserFeedbackList" />
layout="total, sizes, prev, pager, next, jumper"
:total="userFeedbackTable.total"
@size-change="loadUserFeedbackList()"
@current-change="loadUserFeedbackList"
/>
</div> </div>
</div> </div>
@ -113,16 +65,13 @@
import { reactive, ref, watch } from 'vue' import { reactive, ref, watch } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { useDictionary } from '@/app/api/dict' import { useDictionary } from '@/app/api/dict'
import { import { getUserFeedbackList, deleteUserFeedback, getWithCustomerResourcesList } from '@/app/api/user_feedback'
getUserFeedbackList,
deleteUserFeedback,
} from '@/app/api/user_feedback'
import { img } from '@/utils/common' import { img } from '@/utils/common'
import { ElMessageBox, FormInstance } from 'element-plus' import { ElMessageBox,FormInstance } from 'element-plus'
import Edit from '@/app/views/user_feedback/components/user-feedback-edit.vue' import Edit from '@/app/views/user_feedback/components/user-feedback-edit.vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
const route = useRoute() const route = useRoute()
const pageName = route.meta.title const pageName = route.meta.title;
let userFeedbackTable = reactive({ let userFeedbackTable = reactive({
page: 1, page: 1,
@ -130,11 +79,9 @@ let userFeedbackTable = reactive({
total: 0, total: 0,
loading: true, loading: true,
data: [], data: [],
searchParam: { searchParam:{
user_id: '', "user_id":""
feedback_text: '', }
attachment_url: '',
},
}) })
const searchFormRef = ref<FormInstance>() const searchFormRef = ref<FormInstance>()
@ -144,6 +91,7 @@ const selectData = ref<any[]>([])
// //
/** /**
* 获取用户反馈信息列表 * 获取用户反馈信息列表
*/ */
@ -154,14 +102,12 @@ const loadUserFeedbackList = (page: number = 1) => {
getUserFeedbackList({ getUserFeedbackList({
page: userFeedbackTable.page, page: userFeedbackTable.page,
limit: userFeedbackTable.limit, limit: userFeedbackTable.limit,
...userFeedbackTable.searchParam, ...userFeedbackTable.searchParam
}) }).then(res => {
.then((res) => {
userFeedbackTable.loading = false userFeedbackTable.loading = false
userFeedbackTable.data = res.data.data userFeedbackTable.data = res.data.data
userFeedbackTable.total = res.data.total userFeedbackTable.total = res.data.total
}) }).catch(() => {
.catch(() => {
userFeedbackTable.loading = false userFeedbackTable.loading = false
}) })
} }
@ -190,19 +136,27 @@ const editEvent = (data: any) => {
* 删除用户反馈信息 * 删除用户反馈信息
*/ */
const deleteEvent = (id: number) => { const deleteEvent = (id: number) => {
ElMessageBox.confirm(t('userFeedbackDeleteTips'), t('warning'), { ElMessageBox.confirm(t('userFeedbackDeleteTips'), t('warning'),
{
confirmButtonText: t('confirm'), confirmButtonText: t('confirm'),
cancelButtonText: t('cancel'), cancelButtonText: t('cancel'),
type: 'warning', type: 'warning',
}).then(() => { }
deleteUserFeedback(id) ).then(() => {
.then(() => { deleteUserFeedback(id).then(() => {
loadUserFeedbackList() loadUserFeedbackList()
}).catch(() => {
}) })
.catch(() => {})
}) })
} }
const userIdList = ref([])
const setUserIdList = async () => {
userIdList.value = await (await getWithCustomerResourcesList({})).data
}
setUserIdList()
const resetForm = (formEl: FormInstance | undefined) => { const resetForm = (formEl: FormInstance | undefined) => {
if (!formEl) return if (!formEl) return
formEl.resetFields() formEl.resetFields()
@ -219,5 +173,5 @@ const resetForm = (formEl: FormInstance | undefined) => {
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
</style> </style>

4
niucloud/app/adminapi/controller/customer_resources/CustomerResources.php

@ -32,6 +32,7 @@ class CustomerResources extends BaseAdminController
["age",""], ["age",""],
["gender",""], ["gender",""],
["phone_number",""], ["phone_number",""],
['member_label', 0],
["type","khzy"], ["type","khzy"],
["created_at",[]], ["created_at",[]],
["updated_at",[]], ["updated_at",[]],
@ -69,6 +70,8 @@ class CustomerResources extends BaseAdminController
["initial_intent",""], ["initial_intent",""],
["campus",""], ["campus",""],
["status",""], ["status",""],
['member_label', []],
["create_year_month",date("Y-m")], ["create_year_month",date("Y-m")],
["create_date",date("Y-m-d")], ["create_date",date("Y-m-d")],
["purchase_power",""], ["purchase_power",""],
@ -110,6 +113,7 @@ class CustomerResources extends BaseAdminController
["initial_intent",""], ["initial_intent",""],
["campus",""], ["campus",""],
["status",""], ["status",""],
['member_label', []],
["create_year_month",date("Y-m")], ["create_year_month",date("Y-m")],
["create_date",date("Y-m-d")], ["create_date",date("Y-m-d")],

6
niucloud/app/adminapi/controller/departments/Departments.php

@ -54,8 +54,7 @@ class Departments extends BaseAdminController
]); ]);
$this->validate($data, 'app\validate\departments\Departments.add'); $this->validate($data, 'app\validate\departments\Departments.add');
$id = (new DepartmentsService())->add($data); return (new DepartmentsService())->add($data);
return success('ADD_SUCCESS', ['id' => $id]);
} }
/** /**
@ -70,8 +69,7 @@ class Departments extends BaseAdminController
]); ]);
$this->validate($data, 'app\validate\departments\Departments.edit'); $this->validate($data, 'app\validate\departments\Departments.edit');
(new DepartmentsService())->edit($id, $data); return (new DepartmentsService())->edit($id, $data);
return success('EDIT_SUCCESS');
} }
/** /**

7
niucloud/app/adminapi/controller/order_table/OrderTable.php

@ -50,7 +50,7 @@ class OrderTable extends BaseAdminController
public function add(){ public function add(){
$data = $this->request->params([ $data = $this->request->params([
["resource_id",0], ["resource_id",0],
["order_status",""], // ["order_status",""],
["payment_type",""], ["payment_type",""],
["order_amount",0.00], ["order_amount",0.00],
["course_id",0], ["course_id",0],
@ -58,8 +58,7 @@ class OrderTable extends BaseAdminController
]); ]);
$this->validate($data, 'app\validate\order_table\OrderTable.add'); $this->validate($data, 'app\validate\order_table\OrderTable.add');
$id = (new OrderTableService())->add($data); return (new OrderTableService())->add($data);
return success('ADD_SUCCESS', ['id' => $id]);
} }
/** /**
@ -70,7 +69,7 @@ class OrderTable extends BaseAdminController
public function edit(int $id){ public function edit(int $id){
$data = $this->request->params([ $data = $this->request->params([
["resource_id",0], ["resource_id",0],
["order_status",""], // ["order_status",""],
["payment_type",""], ["payment_type",""],
["order_amount",0.00], ["order_amount",0.00],
["course_id",0], ["course_id",0],

7
niucloud/app/adminapi/controller/service/Service.php

@ -29,14 +29,7 @@ class Service extends BaseAdminController
public function lists(){ public function lists(){
$data = $this->request->params([ $data = $this->request->params([
["service_name",""], ["service_name",""],
["preview_image_url",""],
["description",""],
["service_type",""], ["service_type",""],
["execution_rules",""],
["staff_reminder",""],
["customer_reminder",""],
["customer_confirmation",""],
["customer_feedback",""],
["status",""] ["status",""]
]); ]);
return success((new ServiceService())->getPage($data)); return success((new ServiceService())->getPage($data));

8
niucloud/app/adminapi/controller/user_feedback/UserFeedback.php

@ -28,9 +28,7 @@ class UserFeedback extends BaseAdminController
*/ */
public function lists(){ public function lists(){
$data = $this->request->params([ $data = $this->request->params([
["user_id",""], ["user_id",""]
["feedback_text",""],
["attachment_url",""]
]); ]);
return success((new UserFeedbackService())->getPage($data)); return success((new UserFeedbackService())->getPage($data));
} }
@ -88,4 +86,8 @@ class UserFeedback extends BaseAdminController
} }
public function getCustomerResourcesAll(){
return success(( new UserFeedbackService())->getCustomerResourcesAll());
}
} }

1
niucloud/app/adminapi/route/service.php

@ -15,6 +15,7 @@ use app\adminapi\middleware\AdminCheckRole;
use app\adminapi\middleware\AdminCheckToken; use app\adminapi\middleware\AdminCheckToken;
use app\adminapi\middleware\AdminLog; use app\adminapi\middleware\AdminLog;
// USER_CODE_BEGIN -- service // USER_CODE_BEGIN -- service
Route::group('service', function () { Route::group('service', function () {

3
niucloud/app/adminapi/route/user_feedback.php

@ -14,6 +14,7 @@ use think\facade\Route;
use app\adminapi\middleware\AdminCheckRole; use app\adminapi\middleware\AdminCheckRole;
use app\adminapi\middleware\AdminCheckToken; use app\adminapi\middleware\AdminCheckToken;
use app\adminapi\middleware\AdminLog; use app\adminapi\middleware\AdminLog;
// USER_CODE_BEGIN -- user_feedback // USER_CODE_BEGIN -- user_feedback
Route::group('user_feedback', function () { Route::group('user_feedback', function () {
@ -29,6 +30,8 @@ Route::group('user_feedback', function () {
//删除用户反馈信息 //删除用户反馈信息
Route::delete('user_feedback/:id', 'user_feedback.UserFeedback/del'); Route::delete('user_feedback/:id', 'user_feedback.UserFeedback/del');
Route::get('customer_resources_all','user_feedback.UserFeedback/getCustomerResourcesAll');
})->middleware([ })->middleware([
AdminCheckToken::class, AdminCheckToken::class,
AdminCheckRole::class, AdminCheckRole::class,

13
niucloud/app/model/customer_resources/CustomerResources.php

@ -15,6 +15,7 @@ use app\model\dict\Dict;
use app\model\resource_sharing\ResourceSharing; use app\model\resource_sharing\ResourceSharing;
use app\model\six_speed\SixSpeed; use app\model\six_speed\SixSpeed;
use core\base\BaseModel; use core\base\BaseModel;
use think\db\Query;
use think\model\concern\SoftDelete; use think\model\concern\SoftDelete;
use think\model\relation\HasMany; use think\model\relation\HasMany;
use think\model\relation\HasOne; use think\model\relation\HasOne;
@ -57,6 +58,10 @@ class CustomerResources extends BaseModel
*/ */
protected $defaultSoftDelete = 0; protected $defaultSoftDelete = 0;
protected $json = [ 'member_label' ];
protected $jsonAssoc = true;
//定义一个常量数组-字段中文映射 //定义一个常量数组-字段中文映射
const FieldZh = [ const FieldZh = [
'id' => '编号', 'id' => '编号',
@ -96,6 +101,14 @@ class CustomerResources extends BaseModel
} }
} }
public function searchMemberLabelAttr(Query $query, $value, $data)
{
if ($value) {
$query->whereLike('member_label', '%"' . $value . '"%');
}
}
/** /**
* 搜索器:客户资源联系电话 * 搜索器:客户资源联系电话
* @param $value * @param $value

96
niucloud/app/model/service/Service.php

@ -50,18 +50,6 @@ class Service extends BaseModel
*/ */
protected $defaultSoftDelete = 0; protected $defaultSoftDelete = 0;
/**
* 搜索器:服务服务编号
* @param $value
* @param $data
*/
public function searchIdAttr($query, $value, $data)
{
if ($value) {
$query->where("id", $value);
}
}
/** /**
* 搜索器:服务服务名称 * 搜索器:服务服务名称
* @param $value * @param $value
@ -74,30 +62,6 @@ class Service extends BaseModel
} }
} }
/**
* 搜索器:服务服务预览图URL
* @param $value
* @param $data
*/
public function searchPreviewImageUrlAttr($query, $value, $data)
{
if ($value) {
$query->where("preview_image_url", $value);
}
}
/**
* 搜索器:服务服务描述
* @param $value
* @param $data
*/
public function searchDescriptionAttr($query, $value, $data)
{
if ($value) {
$query->where("description", $value);
}
}
/** /**
* 搜索器:服务服务类型 * 搜索器:服务服务类型
* @param $value * @param $value
@ -110,66 +74,6 @@ class Service extends BaseModel
} }
} }
/**
* 搜索器:服务服务执行规则
* @param $value
* @param $data
*/
public function searchExecutionRulesAttr($query, $value, $data)
{
if ($value) {
$query->where("execution_rules", $value);
}
}
/**
* 搜索器:服务是否员工提醒: 1-是, 0-否
* @param $value
* @param $data
*/
public function searchStaffReminderAttr($query, $value, $data)
{
if ($value) {
$query->where("staff_reminder", $value);
}
}
/**
* 搜索器:服务是否客户提醒: 1-是, 0-否
* @param $value
* @param $data
*/
public function searchCustomerReminderAttr($query, $value, $data)
{
if ($value) {
$query->where("customer_reminder", $value);
}
}
/**
* 搜索器:服务是否客户确认: 1-是, 0-否
* @param $value
* @param $data
*/
public function searchCustomerConfirmationAttr($query, $value, $data)
{
if ($value) {
$query->where("customer_confirmation", $value);
}
}
/**
* 搜索器:服务客户反馈内容
* @param $value
* @param $data
*/
public function searchCustomerFeedbackAttr($query, $value, $data)
{
if ($value) {
$query->where("customer_feedback", $value);
}
}
/** /**
* 搜索器:服务状态 * 搜索器:服务状态
* @param $value * @param $value

42
niucloud/app/model/user_feedback/UserFeedback.php

@ -16,6 +16,8 @@ use think\model\concern\SoftDelete;
use think\model\relation\HasMany; use think\model\relation\HasMany;
use think\model\relation\HasOne; use think\model\relation\HasOne;
use app\model\customer_resources\CustomerResources;
/** /**
* 用户反馈信息模型 * 用户反馈信息模型
* Class UserFeedback * Class UserFeedback
@ -43,19 +45,7 @@ class UserFeedback extends BaseModel
/** /**
* 搜索器:用户反馈信息反馈编号 * 搜索器:用户反馈信息客户名称
* @param $value
* @param $data
*/
public function searchIdAttr($query, $value, $data)
{
if ($value) {
$query->where("id", $value);
}
}
/**
* 搜索器:用户反馈信息用户ID
* @param $value * @param $value
* @param $data * @param $data
*/ */
@ -66,33 +56,13 @@ class UserFeedback extends BaseModel
} }
} }
/**
* 搜索器:用户反馈信息反馈内容
* @param $value
* @param $data
*/
public function searchFeedbackTextAttr($query, $value, $data)
{
if ($value) {
$query->where("feedback_text", $value);
}
}
/**
* 搜索器:用户反馈信息附件URL(OSS对象存储)
* @param $value
* @param $data
*/
public function searchAttachmentUrlAttr($query, $value, $data)
{
if ($value) {
$query->where("attachment_url", $value);
}
}
public function customerResources(){
return $this->hasOne(CustomerResources::class, 'id', 'user_id')->joinType('left')->withField('name,id')->bind(['user_id_name'=>'name']);
}
} }

32
niucloud/app/service/admin/customer_resources/CustomerResourcesService.php

@ -19,6 +19,7 @@ use app\model\campus\Campus;
use app\model\resource_sharing\ResourceSharing; use app\model\resource_sharing\ResourceSharing;
use app\model\six_speed\SixSpeed; use app\model\six_speed\SixSpeed;
use app\model\six_speed_modification_log\SixSpeedModificationLog; use app\model\six_speed_modification_log\SixSpeedModificationLog;
use app\service\admin\member\MemberLabelService;
use core\base\BaseAdminService; use core\base\BaseAdminService;
@ -66,9 +67,9 @@ class CustomerResourcesService extends BaseAdminService
$where[] = ['b.shared_by','=',0]; $where[] = ['b.shared_by','=',0];
} }
if($data['member_label']){
$where[] = ['a.member_label','like',"%".$data['member_label']."%"];
}
$search_model = $this->model $search_model = $this->model
@ -87,11 +88,9 @@ class CustomerResourcesService extends BaseAdminService
} }
$list = $this->pageQuery($search_model); return $this->pageQuery($search_model, function ($item, $key) {
$item = $this->makeUp($item);
});
return $list;
} }
/** /**
@ -101,7 +100,7 @@ class CustomerResourcesService extends BaseAdminService
*/ */
public function getInfo(int $id) public function getInfo(int $id)
{ {
$field = 'id,create_year_month,create_date,source,source_channel,consultant,name,age,gender,phone_number,demand,purchasing_power,cognitive_idea,optional_class_time,distance,decision_maker,initial_intent,campus,created_at,updated_at,deleted_at,status'; $field = 'id,create_year_month,create_date,source,source_channel,member_label,consultant,name,age,gender,phone_number,demand,purchasing_power,cognitive_idea,optional_class_time,distance,decision_maker,initial_intent,campus,created_at,updated_at,deleted_at,status';
$info = $this->model->field($field)->where([['id', "=", $id]])->with(['personnel'])->findOrEmpty()->toArray(); $info = $this->model->field($field)->where([['id', "=", $id]])->with(['personnel'])->findOrEmpty()->toArray();
@ -109,7 +108,16 @@ class CustomerResourcesService extends BaseAdminService
$data = $sixSpeed->where(['resource_id' => $id])->field("*,distance as distance_tow")->findOrEmpty()->toArray(); $data = $sixSpeed->where(['resource_id' => $id])->field("*,distance as distance_tow")->findOrEmpty()->toArray();
$info = $info+$data; $info = $info+$data;
return $info; return $this->makeUp($info);
}
public function makeUp($data){
//会员标签
if(!empty($data['member_label'])){
$data['member_label_array'] = (new MemberLabelService())->getMemberLabelListByLabelIds($data['member_label']);
}
return $data;
} }
/** /**
@ -128,6 +136,8 @@ class CustomerResourcesService extends BaseAdminService
} }
$sixSpeed = new SixSpeed(); $sixSpeed = new SixSpeed();
// $data['member_label'] = json_encode($data['member_label']);
$res = $this->model->create($data); $res = $this->model->create($data);
@ -188,7 +198,7 @@ class CustomerResourcesService extends BaseAdminService
$this->model->where([['id', '=', $id]])->update([ $this->model->where([['id', '=', $id]])->update([
'source' => $data['source'], 'source' => $data['source'],
'source_channel' => $data['source_channel'], 'source_channel' => $data['source_channel'],
// 'consultant' => $data['consultant'], 'member_label' => $data['member_label'],
'name' => $data['name'], 'name' => $data['name'],
'age' => $data['age'], 'age' => $data['age'],
'gender' => $data['gender'], 'gender' => $data['gender'],

13
niucloud/app/service/admin/departments/DepartmentsService.php

@ -65,8 +65,12 @@ class DepartmentsService extends BaseAdminService
*/ */
public function add(array $data) public function add(array $data)
{ {
if($this->model->where(['department_name' => $data['department_name']])->find()){
return fail("部门名称不能重复");
}
$res = $this->model->create($data); $res = $this->model->create($data);
return $res->id; return success("操作成功");
} }
@ -74,13 +78,14 @@ class DepartmentsService extends BaseAdminService
* 部门编辑 * 部门编辑
* @param int $id * @param int $id
* @param array $data * @param array $data
* @return bool
*/ */
public function edit(int $id, array $data) public function edit(int $id, array $data)
{ {
if($this->model->where([['id', '<>', $id]])->where(['department_name' => $data['department_name']])->find()){
return fail("部门名称不能重复");
}
$this->model->where([['id', '=', $id]])->update($data); $this->model->where([['id', '=', $id]])->update($data);
return true; return success("操作成功");
} }
/** /**

12
niucloud/app/service/admin/order_table/OrderTableService.php

@ -69,15 +69,15 @@ class OrderTableService extends BaseAdminService
public function add(array $data) public function add(array $data)
{ {
$personnel = new Personnel(); $personnel = new Personnel();
$data['staff_id'] = $personnel->where(['sys_user_id' => $this->uid])->value("id"); // $data['staff_id'] = $personnel->where(['sys_user_id' => $this->uid])->value("id");
if(!$data['staff_id']){ // if(!$data['staff_id']){
return fail("操作失败"); // return fail("操作失败");
} // }
// $data['staff_id'] = 1; $data['staff_id'] = 1;
$res = $this->model->create($data); $res = $this->model->create($data);
return $res->id; return success("操作成功");
} }

2
niucloud/app/service/admin/service/ServiceService.php

@ -39,7 +39,7 @@ class ServiceService extends BaseAdminService
$field = 'id,service_name,preview_image_url,description,service_type,execution_rules,staff_reminder,customer_reminder,customer_confirmation,customer_feedback,status,created_at,updated_at,deleted_at'; $field = 'id,service_name,preview_image_url,description,service_type,execution_rules,staff_reminder,customer_reminder,customer_confirmation,customer_feedback,status,created_at,updated_at,deleted_at';
$order = 'id desc'; $order = 'id desc';
$search_model = $this->model->withSearch(["id","service_name","preview_image_url","description","service_type","execution_rules","staff_reminder","customer_reminder","customer_confirmation","customer_feedback","status"], $where)->field($field)->order($order); $search_model = $this->model->withSearch(["service_name","service_type","status"], $where)->field($field)->order($order);
$list = $this->pageQuery($search_model); $list = $this->pageQuery($search_model);
return $list; return $list;
} }

10
niucloud/app/service/admin/user_feedback/UserFeedbackService.php

@ -12,6 +12,7 @@
namespace app\service\admin\user_feedback; namespace app\service\admin\user_feedback;
use app\model\user_feedback\UserFeedback; use app\model\user_feedback\UserFeedback;
use app\model\customer_resources\CustomerResources;
use core\base\BaseAdminService; use core\base\BaseAdminService;
@ -39,7 +40,7 @@ class UserFeedbackService extends BaseAdminService
$field = 'id,user_id,feedback_text,attachment_url,created_at,updated_at'; $field = 'id,user_id,feedback_text,attachment_url,created_at,updated_at';
$order = 'id desc'; $order = 'id desc';
$search_model = $this->model->withSearch(["id","user_id","feedback_text","attachment_url"], $where)->field($field)->order($order); $search_model = $this->model->withSearch(["user_id"], $where)->with(['customerResources'])->field($field)->order($order);
$list = $this->pageQuery($search_model); $list = $this->pageQuery($search_model);
return $list; return $list;
} }
@ -53,7 +54,7 @@ class UserFeedbackService extends BaseAdminService
{ {
$field = 'id,user_id,feedback_text,attachment_url,created_at,updated_at'; $field = 'id,user_id,feedback_text,attachment_url,created_at,updated_at';
$info = $this->model->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray(); $info = $this->model->field($field)->where([['id', "=", $id]])->with(['customerResources'])->findOrEmpty()->toArray();
return $info; return $info;
} }
@ -95,5 +96,10 @@ class UserFeedbackService extends BaseAdminService
} }
public function getCustomerResourcesAll(){
$customerResourcesModel = new CustomerResources();
return $customerResourcesModel->select()->toArray();
}
} }

4
niucloud/app/validate/order_table/OrderTable.php

@ -38,8 +38,8 @@ class OrderTable extends BaseValidate
]; ];
protected $scene = [ protected $scene = [
"add" => ['resource_id', 'order_status', 'payment_type', 'order_amount', 'course_id', 'class_id'], "add" => ['resource_id', 'payment_type', 'order_amount', 'course_id', 'class_id'],
"edit" => ['resource_id', 'order_status', 'payment_type', 'order_amount', 'course_id', 'class_id'] "edit" => ['resource_id', 'payment_type', 'order_amount', 'course_id', 'class_id']
]; ];
} }

6
niucloud/app/validate/user_feedback/UserFeedback.php

@ -20,13 +20,11 @@ class UserFeedback extends BaseValidate
{ {
protected $rule = [ protected $rule = [
'user_id' => 'require',
'feedback_text' => 'require',
]; ];
protected $message = [ protected $message = [
'user_id.require' => ['common_validate.require', ['user_id']],
'feedback_text.require' => ['common_validate.require', ['feedback_text']],
]; ];
protected $scene = [ protected $scene = [

Loading…
Cancel
Save