From a43cb1b390867bdccad60be6be5838b247ab9145 Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Thu, 21 Aug 2025 17:11:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=B7=A5=E5=8D=95=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=9D=83=E9=87=8D=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerService/feedbacks/model.d.ts | 10 +++++ .../roomBooking/conferenceSettings/index.ts | 2 +- .../roomBooking/conferenceSettings/model.d.ts | 29 +++++++++++- .../businessManagement/workOrders/data.ts | 6 +-- .../workOrders/work-orders-detail.vue | 2 +- .../costManagement/costItemSetting/index.vue | 2 +- .../customerService/feedbacks/data.ts | 20 +++++++-- .../feedbacks/feedbacks-detail.vue | 6 ++- .../feedbacks/feedbacks-modal.vue | 44 ++++++++++++------- .../customerService/questionnaire/index.vue | 2 +- .../conferenceReservations-modal.vue | 6 +-- .../conferenceReservations/index.vue | 14 +++--- .../conferenceSettings-detail.vue | 8 ++-- .../conferenceSettings-modal.vue | 31 +++++++------ .../roomBooking/conferenceSettings/data.ts | 5 +++ 15 files changed, 130 insertions(+), 57 deletions(-) diff --git a/apps/web-antd/src/api/property/customerService/feedbacks/model.d.ts b/apps/web-antd/src/api/property/customerService/feedbacks/model.d.ts index c3d31a77..62b1abd1 100644 --- a/apps/web-antd/src/api/property/customerService/feedbacks/model.d.ts +++ b/apps/web-antd/src/api/property/customerService/feedbacks/model.d.ts @@ -10,6 +10,7 @@ export interface FeedbacksVO { * 反馈类型(0保修1保洁2会议) */ feedbackType: string; + feedbackTypeName: string; /** * 反馈人 @@ -21,6 +22,11 @@ export interface FeedbacksVO { */ feedbackPersionPhone: string; + /** + * 反馈人名称 + */ + feedbackPersionName: string; + /** * 反馈内容 */ @@ -50,6 +56,10 @@ export interface FeedbacksVO { * 客服电话 */ serviceName: string; + /** + * 工单id + */ + orderId: string; } diff --git a/apps/web-antd/src/api/property/roomBooking/conferenceSettings/index.ts b/apps/web-antd/src/api/property/roomBooking/conferenceSettings/index.ts index 8799428e..2090bf48 100644 --- a/apps/web-antd/src/api/property/roomBooking/conferenceSettings/index.ts +++ b/apps/web-antd/src/api/property/roomBooking/conferenceSettings/index.ts @@ -61,5 +61,5 @@ export function meetRemove(id: ID | IDS) { } export function notlist(params?: MeetBo) { - return requestClient.get>('/property/meet/notlist', { params }); + return requestClient.get('/property/meet/notlist', { params }); } diff --git a/apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts b/apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts index 3766063a..10b65829 100644 --- a/apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts +++ b/apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts @@ -67,6 +67,14 @@ export interface MeetVO { * 图片 */ picture: string; + /** + * 开放时段开始时间 + */ + openStartHours: string; + /** + * 开放时段结束时间 + */ + openEndHours: string; } export interface MeetForm extends BaseEntity { @@ -153,6 +161,15 @@ export interface MeetForm extends BaseEntity { */ picture: string; + /** + * 开放时段开始时间 + */ + openStartHours: string; + /** + * 开放时段结束时间 + */ + openEndHours: string; + } export interface MeetQuery extends PageQuery { @@ -240,7 +257,7 @@ export interface MeetQuery extends PageQuery { picture: string; } -export interface conferenceSettingsDetail extends BaseEntity { +export interface ConferenceSettingsDetail{ /** * 主键 */ @@ -329,6 +346,16 @@ export interface conferenceSettingsDetail extends BaseEntity { * 图片 */ picture: string; + + /** + * 开放时段开始时间 + */ + openStartHours: string; + /** + * 开放时段结束时间 + */ + openEndHours: string; + } export interface MeetBo{ diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts index 0239fe09..cfb2ebd4 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts @@ -30,7 +30,7 @@ export const querySchema: FormSchemaGetter = () => [ options: getDictOptions('pro_processing_weight'), }, fieldName: 'processingWeight', - label: '处理权重', + label: '处理优先级', }, ]; @@ -82,7 +82,7 @@ export const columns: VxeGridProps['columns'] = [ width: 100, }, { - title: '处理权重', + title: '处理优先级', field: 'processingWeight', slots: { default: ({row}) => { @@ -166,7 +166,7 @@ export const modalSchema: FormSchemaGetter = () => [ rules: 'selectRequired', }, { - label: '处理权重', + label: '处理优先级', fieldName: 'processingWeight', component: 'Select', componentProps: { diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue index 2d2f06f0..13517c09 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue @@ -57,7 +57,7 @@ async function handleOpenChange(open: boolean) { :is="renderDict(orderDetail.reportingType,'wy_gdsblx')" /> - + diff --git a/apps/web-antd/src/views/property/costManagement/costItemSetting/index.vue b/apps/web-antd/src/views/property/costManagement/costItemSetting/index.vue index 1d3c3d18..1e821fc6 100644 --- a/apps/web-antd/src/views/property/costManagement/costItemSetting/index.vue +++ b/apps/web-antd/src/views/property/costManagement/costItemSetting/index.vue @@ -140,7 +140,7 @@ const { hasAccessByCodes } = useAccess(); unCheckedValue="0" v-model:value="row.state" :api="() => costItemSettingUpdate(row)" - :disabled=" !hasAccessByCodes(['property:unit:edit'])" + :disabled=" !hasAccessByCodes(['property:costItemSetting:edit'])" @reload="() => tableApi.query()" /> diff --git a/apps/web-antd/src/views/property/customerService/feedbacks/data.ts b/apps/web-antd/src/views/property/customerService/feedbacks/data.ts index 7382d67f..498dafa9 100644 --- a/apps/web-antd/src/views/property/customerService/feedbacks/data.ts +++ b/apps/web-antd/src/views/property/customerService/feedbacks/data.ts @@ -90,7 +90,7 @@ export const modalSchema: FormSchemaGetter = () => [ { label: '反馈类型', fieldName: 'feedbackType', - component: 'Select', + component: 'TreeSelect', rules: 'selectRequired', }, { @@ -160,7 +160,15 @@ export const modalSchema: FormSchemaGetter = () => [ }, rules:'selectRequired' }, - + { + label: '工单id', + fieldName: 'orderId', + component: 'Input', + dependencies: { + show: () => false, + triggerFields: [''], + }, + }, { label: '转至工单',//转至工单 fieldName: 'isWorkOrder', @@ -170,7 +178,11 @@ export const modalSchema: FormSchemaGetter = () => [ options: getDictOptions('wy_sf'), optionType: 'button', }, - defaultValue:'0', - rules:'selectRequired' + defaultValue:'1', + rules:'selectRequired', + dependencies: { + show: (formValue) => !formValue.orderId, + triggerFields: ['orderId'], + }, }, ]; diff --git a/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-detail.vue b/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-detail.vue index c2af9a84..4a8bdf3f 100644 --- a/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-detail.vue +++ b/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-detail.vue @@ -37,10 +37,12 @@ async function handleOpenChange(open: boolean) { - {{ feedbacksDetail.feedbackType }} + {{ feedbacksDetail.feedbackTypeName }} - {{ feedbacksDetail.feedbackPersion+'-'+feedbacksDetail.feedbackPersionPhone }} + + {{ feedbacksDetail.feedbackPersionName||''+'-'+feedbacksDetail.feedbackPersionPhone }} + {{ feedbacksDetail.feedbackContent }} diff --git a/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-modal.vue b/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-modal.vue index 58a2ceef..431632c8 100644 --- a/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-modal.vue +++ b/apps/web-antd/src/views/property/customerService/feedbacks/feedbacks-modal.vue @@ -15,7 +15,9 @@ import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup'; import {modalSchema} from './data'; import type {FeedbacksVO} from "#/api/property/customerService/feedbacks/model"; -import {workOrdersTypeList} from "#/api/property/businessManagement/workOrdersType"; +import { + workOrdersTypeTree +} from "#/api/property/businessManagement/workOrdersType"; const emit = defineEmits<{ reload: [] }>(); @@ -101,28 +103,38 @@ async function handleClosed() { } async function initWorkOrderTypeOption() { - let params = { - pageSize: 1000, - pageNum: 1 - } - const res = await workOrdersTypeList(params) - formApi.updateSchema([{ - componentProps: () => ({ - options: res.rows, - showSearch: true, - optionFilterProp: 'orderTypeName', - fieldNames: {label: 'orderTypeName', value: 'id'}, - }), - fieldName: 'feedbackType', - }]) + const options = await workOrdersTypeTree() + formApi.updateSchema([ + { + componentProps: () => ({ + class: 'w-full', + fieldNames: { + key: 'id', + label: 'orderTypeName', + value: 'id', + children: 'children', + }, + placeholder: '请选择反馈类型', + showSearch: true, + treeData: options, + treeDefaultExpandAll: true, + treeLine: { showLeafIcon: false }, + treeNodeFilterProp: 'orderTypeName', + treeNodeLabelProp: 'orderTypeName', + }), + fieldName: 'feedbackType', + }, + ]); } +