From fe909584c18a805a9af7cae6a4b431b57ae8f9bf Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 16 Aug 2024 10:57:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=90=9C=E7=B4=A2=20?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E4=B8=8B=E6=8B=89=E8=A7=A6=E5=BA=95=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/subPages/BS/plan.vue | 34 ++++++++++++++++----------------
 services/common.js               | 24 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/pages/apply/subPages/BS/plan.vue b/pages/apply/subPages/BS/plan.vue
index f4663c8..09135db 100644
--- a/pages/apply/subPages/BS/plan.vue
+++ b/pages/apply/subPages/BS/plan.vue
@@ -202,7 +202,8 @@
 
 		<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup"
 			:defaultChecked="selectorInfo.defaultChecked" :title="selectorInfo.title" :lists="selectorInfo.dataLists"
-			@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" />
+			@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false"
+			:total="selectorInfo.totalCount" />
 
 		<view class="bottom-button">
 			<button type="primary"
@@ -243,7 +244,7 @@
 	} from '../../../../services/apply/subPages/BS/safeCheck'
 
 	import {
-		OrderPagedUseful2,
+		UserPagedLimit,
 		auditOptionShow,
 		getEnum
 	} from '../../../../services/common'
@@ -345,6 +346,7 @@
 					isSubShow: false,
 					isMultiple: false,
 					showPopup: false,
+					totalCount: 0,
 					title: '检查人员',
 					itemData: {},
 					index: 0,
@@ -720,7 +722,7 @@
 			//下拉数据加载
 			async handleShowSheet(p) {
 				const orgId = uni.getStorageSync('orgId')
-				const json = initFilter(orgId, "", "", 0)
+				const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1)
 				let dataSelect = []
 				// this.selectorInfo.defaultChecked = []
 				var defaultChecked = []
@@ -944,17 +946,13 @@
 					if (p.val) {
 						extendRule(json, 'NAME', 9, p.val);
 					}
+					json.Limit = 20
 					json.Sort = 'NAME'
-
-					// if (this.model.CHECKOBJECT != 0) {
-					// 	json.FilterGroup.Rules.push({
-					// 		'Field': "MineType",
-					// 		'Operate': 1,
-					// 		'Value': this.model.CHECKOBJECT
-					// 	})
-					// }
-
-					dataSelect = await OrderPagedUseful2(json).then(res => {
+					if (p.pageIndex) {
+						json.Start = (p.pageIndex - 1) * json.Limit;
+					}
+					dataSelect = await UserPagedLimit(json).then(res => {
+						this.selectorInfo.totalCount = res.TotalCount
 						if (res.Data != undefined && res.Data.length > 0) {
 							for (let i = 0; i < res.Data.length; i++) {
 								res.Data[i].name = res.Data[i].NAME,
@@ -963,7 +961,6 @@
 						}
 						return res.Data
 					})
-
 					// this.selectorInfo.defaultChecked = []
 					if (this.model.Nav_ListCheckUser != null && this.model.Nav_ListCheckUser.length > 0 && this.model
 						.Nav_ListCheckUser[0].Nav_User != null) {
@@ -1025,8 +1022,10 @@
 					defaultChecked = []
 				if (dataSelect.length) {
 					this.selectorInfo = {
-						itemData:p.itemData!=undefined ?p.itemData: this.selectorInfo.itemData,//itemData: p.itemData,  搜索的时候  p.itemData为空  赋值修改 为 她自己本身 this.selectorInfo.itemData
+						itemData: p.itemData != undefined ? p.itemData : this.selectorInfo
+							.itemData, //itemData: p.itemData,  搜索的时候  p.itemData为空  赋值修改 为 她自己本身 this.selectorInfo.itemData
 						isMultiple: this.selectorInfo.isMultiple,
+						totalCount: this.selectorInfo.totalCount,
 						showPopup: true,
 						title: p.title,
 						name: p.name,
@@ -1279,11 +1278,12 @@
 			},
 
 			//数据加载
-			handleSearch(val) {
+			handleSearch(val, pageIndex) {
 				var p = {
 					name: this.selectorInfo.name,
 					title: this.selectorInfo.title,
-					val: val
+					val: val,
+					pageIndex: pageIndex
 				}
 				this.handleShowSheet(p)
 
diff --git a/services/common.js b/services/common.js
index 3b089f3..0217513 100644
--- a/services/common.js
+++ b/services/common.js
@@ -73,6 +73,30 @@ export function OrderPagedUseful2(params) {
 		})
 	})
 }
+//获取用户信息 班组做限制
+export function UserPagedLimit(params) {
+	return new Promise((resolve, reject) => {
+		request.post("/FM/FMUser/OrderPagedUseful", params).then((result) => {
+			if (result.IsSuccessful) {
+				resolve(result);
+			}
+		}).catch((error) => {
+			reject(error);
+		})
+	})
+}
+//获取用户信息 不做限制 
+export function UserPagedAll(params) {
+	return new Promise((resolve, reject) => {
+		request.post("/FM/User/OrderPaged", params).then((result) => {
+			if (result.IsSuccessful) {
+				resolve(result);
+			}
+		}).catch((error) => {
+			reject(error);
+		})
+	})
+}
 
 //未删除 不包含 admin
 export function OrderPagedUser(params) {