diff --git a/apps/web-antd/src/api/common.d.ts b/apps/web-antd/src/api/common.d.ts index 2b10b322..a2b1cdfb 100644 --- a/apps/web-antd/src/api/common.d.ts +++ b/apps/web-antd/src/api/common.d.ts @@ -51,5 +51,6 @@ export interface TreeNode { title?: string; key?:any + disabled: boolean } diff --git a/apps/web-antd/src/api/property/chargeManagement/index.ts b/apps/web-antd/src/api/property/chargeManagement/index.ts index 37299e2c..c00328dc 100644 --- a/apps/web-antd/src/api/property/chargeManagement/index.ts +++ b/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>('/system/orderCharge/list', { params }); + return requestClient.get>('/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(`/system/orderCharge/${id}`); + return requestClient.get(`/property/orderCharge/${id}`); } /** @@ -37,7 +37,7 @@ export function orderChargeInfo(id: ID) { * @returns void */ export function orderChargeAdd(data: OrderChargeForm) { - return requestClient.postWithMsg('/system/orderCharge', data); + return requestClient.postWithMsg('/property/orderCharge', data); } /** @@ -46,7 +46,7 @@ export function orderChargeAdd(data: OrderChargeForm) { * @returns void */ export function orderChargeUpdate(data: OrderChargeForm) { - return requestClient.putWithMsg('/system/orderCharge', data); + return requestClient.putWithMsg('/property/orderCharge', data); } /** @@ -55,5 +55,5 @@ export function orderChargeUpdate(data: OrderChargeForm) { * @returns void */ export function orderChargeRemove(id: ID | IDS) { - return requestClient.deleteWithMsg(`/system/orderCharge/${id}`); + return requestClient.deleteWithMsg(`/property/orderCharge/${id}`); } diff --git a/apps/web-antd/src/api/sis/authRecord/index.ts b/apps/web-antd/src/api/sis/authRecord/index.ts index 0c53942f..9a1a4845 100644 --- a/apps/web-antd/src/api/sis/authRecord/index.ts +++ b/apps/web-antd/src/api/sis/authRecord/index.ts @@ -39,7 +39,7 @@ export function authRecordInfo(id: ID) { * @returns void */ export function authRecordAdd(data: AuthRecordForm) { - return requestClient.postWithMsg('/sis/authRecord', data); + return requestClient.postWithMsg('/sis/authRecord/add', data); } /** diff --git a/apps/web-antd/src/api/sis/authRecord/model.d.ts b/apps/web-antd/src/api/sis/authRecord/model.d.ts index 92bd8d19..fdbd9caa 100644 --- a/apps/web-antd/src/api/sis/authRecord/model.d.ts +++ b/apps/web-antd/src/api/sis/authRecord/model.d.ts @@ -1,4 +1,4 @@ -import type { PageQuery, BaseEntity } from '#/api/common'; +import type { BaseEntity, PageQuery } from '#/api/common'; export interface AuthRecordVO { /** @@ -15,25 +15,25 @@ export interface AuthRecordVO { * 门禁id */ acdId: string | number; - } export interface AuthRecordForm extends BaseEntity { /** * 主键id */ - id?: string | number; + libId?: string | number; /** * 人像id */ - imgId?: string | number; + imgIds?: string[] | number[]; /** * 门禁id */ - acdId?: string | number; + acIds?: string[] | number[]; + issue: boolean; } export interface AuthRecordQuery extends PageQuery { @@ -48,7 +48,7 @@ export interface AuthRecordQuery extends PageQuery { acdId?: string | number; /** - * 日期范围参数 - */ + * 日期范围参数 + */ params?: any; } diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue index 5e3b97f9..4c2b938e 100644 --- a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue +++ b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue @@ -310,10 +310,12 @@ async function handleConfirm() { : isUpdate.value ? editCleanId.value : ''; - // data.sumPeices = totalSumPeices; + + data.sumPeices = parseInt(totalSumPeices.value, 10); + // 组装 cleanIds - data.cleanIds = detailTable.value.map((item: any) => item.id); - data.details = detailTable.value; + // data.cleanIds = detailTable.value.map((item: any) => item.id); + data.cleanList = detailTable.value; console.log(data); console.log(12037847120120); await clean_orderAdd(data) diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue index d861d716..9fabaeb0 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue @@ -51,7 +51,7 @@ const gridOptions: VxeGridProps = { rowConfig: { keyField: 'id', }, - id: 'system-orderCharge-index' + id: 'property-orderCharge-index' }; const [BasicTable, tableApi] = useVbenVxeGrid({ @@ -105,7 +105,7 @@ function handleDownloadExcel() {