Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/api/property/chargeManagement/index.ts

@@ -10,7 +10,7 @@ import { requestClient } from '#/api/request';
 * @returns 绿植租赁-订单收费列表
 */
 export function orderChargeList(params?: OrderChargeQuery) {
-  return requestClient.get<PageResult<OrderChargeVO>>('/system/orderCharge/list', { params });
+  return requestClient.get<PageResult<OrderChargeVO>>('/property/orderCharge/list', { params });
 }
 
 /**
@@ -19,7 +19,7 @@ export function orderChargeList(params?: OrderChargeQuery) {
  * @returns 绿植租赁-订单收费列表
  */
 export function orderChargeExport(params?: OrderChargeQuery) {
-  return commonExport('/system/orderCharge/export', params ?? {});
+  return commonExport('/property/orderCharge/export', params ?? {});
 }
 
 /**
@@ -28,7 +28,7 @@ export function orderChargeExport(params?: OrderChargeQuery) {
  * @returns 绿植租赁-订单收费详情
  */
 export function orderChargeInfo(id: ID) {
-  return requestClient.get<OrderChargeVO>(`/system/orderCharge/${id}`);
+  return requestClient.get<OrderChargeVO>(`/property/orderCharge/${id}`);
 }
 
 /**
@@ -37,7 +37,7 @@ export function orderChargeInfo(id: ID) {
  * @returns void
  */
 export function orderChargeAdd(data: OrderChargeForm) {
-  return requestClient.postWithMsg<void>('/system/orderCharge', data);
+  return requestClient.postWithMsg<void>('/property/orderCharge', data);
 }
 
 /**
@@ -46,7 +46,7 @@ export function orderChargeAdd(data: OrderChargeForm) {
  * @returns void
  */
 export function orderChargeUpdate(data: OrderChargeForm) {
-  return requestClient.putWithMsg<void>('/system/orderCharge', data);
+  return requestClient.putWithMsg<void>('/property/orderCharge', data);
 }
 
 /**
@@ -55,5 +55,5 @@ export function orderChargeUpdate(data: OrderChargeForm) {
  * @returns void
  */
 export function orderChargeRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/system/orderCharge/${id}`);
+  return requestClient.deleteWithMsg<void>(`/property/orderCharge/${id}`);
 }

apps/web-antd/src/api/property/resident/person/model.d.ts

@@ -59,7 +59,7 @@ export interface PersonVO {
   /**
    * 状态
    */
-  state: number;
+  state: number|string;
 
   /**
    * 备注

apps/web-antd/src/api/property/visitorManagement/index.ts

@@ -1,8 +1,6 @@
 import type { VisitorManagementVO, VisitorManagementForm, VisitorManagementQuery } from './model';
-
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
-
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
@@ -59,3 +57,4 @@ export function visitorManagementUpdate(data: VisitorManagementForm) {
 export function visitorManagementRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/property/visitorManagement/${id}`);
 }
+

apps/web-antd/src/api/property/visitorManagement/model.d.ts

@@ -70,7 +70,6 @@ export interface VisitorManagementVO {
    * 预约状态（0：待确认，1：已确认，2：已取消，3：已完成）
    */
   serveStatus: number;
-
 }
 
 export interface VisitorManagementForm extends BaseEntity {
@@ -143,7 +142,6 @@ export interface VisitorManagementForm extends BaseEntity {
    * 预约状态（0：待确认，1：已确认，2：已取消，3：已完成）
    */
   serveStatus?: number;
-
 }
 
 export interface VisitorManagementQuery extends PageQuery {
@@ -217,3 +215,76 @@ export interface VisitorManagementQuery extends PageQuery {
     */
   params?: any;
 }
+
+export interface VisitorManagementDetail extends BaseEntity {
+  /**
+   * id
+   */
+  id?: string | number;
+
+  /**
+   * 访客姓名
+   */
+  visitorName?: string;
+
+  /**
+   * 所属公司
+   */
+  visitorUnit?: string;
+
+  /**
+   * 访客电话
+   */
+  visitorPhone?: string;
+
+  /**
+   * 拜访事由
+   */
+  visitingReason?: string;
+
+  /**
+   * 被访人
+   */
+  interviewedPerson?: string;
+
+  /**
+   * 被访单位
+   */
+  interviewedUnit?: string;
+
+  /**
+   * 被访人联系方式
+   */
+  interviewedPhone?: string;
+
+  /**
+   * 拜访开始时间
+   */
+  visitingBeginTime?: string;
+
+  /**
+   * 拜访结束时间
+   */
+  visitingEndTime?: string;
+
+  /**
+   * 预约车位（0：预约，1：不预约）
+   */
+  bookingParkingSpace?: number;
+
+  /**
+   * 车牌号
+   */
+  licensePlate?: string;
+
+  /**
+   * 人脸图片
+   */
+  facePictures?: string;
+
+  /**
+   * 预约状态（0：待确认，1：已确认，2：已取消，3：已完成）
+   */
+  serveStatus?: number;
+}
+