From ace6293381c3e39930d87e2863a79d966e5142ce Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 24 May 2024 14:18:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/tenant/index.ts                      | 10 +++++++++-
 .../mes/hrPersonAbility/hrPersonAbility.data.ts     |  5 +++--
 .../mes/ordermonthplan/mesOrderMonthMain.data.ts    | 13 +++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

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<CrudSchema[]>([
         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<CrudSchema[]>([
         searchAllSchemas: FactoryList.allSchemas, // 查询弹窗所需类
         searchPage: TenantApi.getTenantPage, // 查询弹窗所需分页方法
         isHideFilterButton: true,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }
-        ]
+        // searchCondition: [{
+        //   key: 'available',
+        //   value: 'TRUE',
+        //   action: '==',
+        //   // isMainValue: false
+        // }
+        // ]
       }
     }
   },