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 11d1e48a..91d61285 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 @@ -1,4 +1,4 @@ -import type { PageQuery, BaseEntity } from '#/api/common'; +import type {PageQuery, BaseEntity} from '#/api/common'; export interface MeetVO { /** @@ -90,6 +90,10 @@ export interface MeetVO { * 负责人 */ principalsName: string; + /** + * 保密等级 + */ + secrecyGrade: string; } export interface MeetForm extends BaseEntity { @@ -236,8 +240,8 @@ export interface MeetQuery extends PageQuery { searchValue?: string; /** - * 日期范围参数 - */ + * 日期范围参数 + */ params?: any; /** @@ -274,7 +278,7 @@ export interface MeetQuery extends PageQuery { picture: string; } -export interface ConferenceSettingsDetail{ +export interface ConferenceSettingsDetail { /** * 主键 */ @@ -375,7 +379,7 @@ export interface ConferenceSettingsDetail{ } -export interface MeetBo{ +export interface MeetBo { /** * 会议室名称 */ 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 498dafa9..a08554c2 100644 --- a/apps/web-antd/src/views/property/customerService/feedbacks/data.ts +++ b/apps/web-antd/src/views/property/customerService/feedbacks/data.ts @@ -63,11 +63,6 @@ export const columns: VxeGridProps['columns'] = [ }, width:120 }, - { - title: '客服电话', - field: 'serviceName', - width:120 - }, { field: 'action', fixed: 'right', @@ -122,10 +117,10 @@ export const modalSchema: FormSchemaGetter = () => [ }, }, { - label: '客服电话', - fieldName: 'serviceName', - component: 'Input', - rules: 'required', + label: '反馈单位', + fieldName: 'feedbackUnit', + component: 'Select', + rules: 'selectRequired', }, { label: '反馈内容', 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 431632c8..42250385 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 @@ -18,6 +18,7 @@ import type {FeedbacksVO} from "#/api/property/customerService/feedbacks/model"; import { workOrdersTypeTree } from "#/api/property/businessManagement/workOrdersType"; +import {resident_unitList} from "#/api/property/resident/unit"; const emit = defineEmits<{ reload: [] }>(); @@ -66,6 +67,7 @@ const [BasicModal, modalApi] = useVbenModal({ const {id} = modalApi.getData() as { id?: number | string }; isUpdate.value = !!id; await initWorkOrderTypeOption() + await initUnitOption() if (isUpdate.value && id) { const record = await feedbacksInfo(id); detail.value = record @@ -127,6 +129,25 @@ async function initWorkOrderTypeOption() { ]); } +async function initUnitOption() { + let params = { + pageSize: 1000, + pageNum: 1 + } + const res = await resident_unitList(params) + formApi.updateSchema([{ + componentProps: () => ({ + options: res.rows, + //开启搜索 + showSearch: true, + //数据过滤字段 + optionFilterProp: 'name', + //下拉显示字段 + fieldNames: {label: 'name', value: 'id'}, + }), + fieldName: 'feedbackUnit', + }]) +}