diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index 176c37579..1e11e2dd1 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -33,7 +33,15 @@ export interface TenantExportReqVO { // 查询租户列表 export const getTenantPage = (params: TenantPageReqVO) => { - return request.get({ url: '/system/tenant/page', params }) + console.log(params) + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return request.post({ url: '/system/tenant/senior', data }) + } else { + return request.get({ url: '/system/tenant/page', params }) + } + // return request.get({ url: '/system/tenant/page', params }) } // 查询租户详情 diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts index 614e2ef7f..8e7d12dd6 100644 --- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts +++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts @@ -123,10 +123,11 @@ export const HrPersonAbility = useCrudSchemas(reactive([ searchTitle: '人员信息', // 查询弹窗标题 searchAllSchemas: searchUser.allSchemas, // 查询弹窗所需类 searchField: 'username', // 查询弹窗赋值字段 + searchListPlaceholder: '请选择 人员工号', // 输入框占位文本 searchPage: UserApi.getUserPage, // 查询弹窗所需分页方法 searchCondition: [{ - action: "==", - column: 'userType', + action: '==', + key: 'userType', value: 'WORKER' }] } diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts index 908906fb6..05d07d7d7 100644 --- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts +++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts @@ -46,12 +46,13 @@ export const MesOrderMonthMain = useCrudSchemas(reactive([ searchAllSchemas: FactoryList.allSchemas, // 查询弹窗所需类 searchPage: TenantApi.getTenantPage, // 查询弹窗所需分页方法 isHideFilterButton: true, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - } - ] + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // action: '==', + // // isMainValue: false + // } + // ] } } },