选人处理为滚动加载分页人员 整改通知显示附件

pages/apply/subPages/BS/riskSumbit.vue

@@ -155,7 +155,7 @@
 
 		<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title"
 			:lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked" @search="handleSearch"
-			@select="handleSelected" @close="selectorInfo.showPopup=false" />
+			@select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
 
 		<!-- <query-selector :show="comPickerInfo.showSheet" :lists="userLists" :defaultValue="currentOperateUser.NAME"
 			@close="closePicker" @search="handleSearchUser" @select="onConfirmPicker" /> -->
@@ -201,8 +201,8 @@
 	} from '../../../../uni_modules/uview-ui/libs/mixin/mixin'
 
 	import {
-		OrderPagedUseful2,
+		UserPagedLimit,
-		OrderPagedUser,
+		UserPagedAll,
 		GetDpartMentNameHeader
 	} from '../../../../services/common'
 
@@ -256,6 +256,7 @@
 					name: 'user',
 					isMultiple: false,
 					showPopup: false,
+					totalCount: 0,
 					title: '人员选择',
 					index: 0,
 					dataLists: [],
@@ -576,15 +577,24 @@
 			},
 
 			//数据加载
-			handleSearch(val) {
+			handleSearch(val, pageIndex) {
 				const orgId = uni.getStorageSync('orgId')
 				const json = initFilter(orgId, "", "NAME")
 				if (val) {
 					extendRule(json, 'NAME', 9, val);
 				}
 				if (this.selectorInfo.name == 'user') {
-					OrderPagedUser(json).then(res => {
+					//验收人
-						this.selectorInfo.dataLists = res.map(i => {
+					json.Limit = 20
+					json.Sort = 'NAME'
+					json.PageIndex = pageIndex ?? 1
+					if (pageIndex) {
+						json.Start = (pageIndex - 1) * json.Limit;
+					}
+					
+					UserPagedAll(json).then(res => {
+						this.selectorInfo.totalCount = res.TotalCount
+						this.selectorInfo.dataLists = res.Data.map(i => {
 							return {
 								...i,
 								name: i.NAME,
@@ -593,8 +603,27 @@
 						})
 					})
 				} else if (this.selectorInfo.name == 'userDetailer') {
-					OrderPagedUseful2(json).then(res => {
+					//整改责任人
+					// if (val) {
+					// 	extendRule(json, 'NAME', 9, val);
+					// }
+					json.Limit = 20
+					json.Sort = 'NAME'
+					json.PageIndex = pageIndex ?? 1
+					if (pageIndex) {
+						json.Start = (pageIndex - 1) * json.Limit;
+					}
+					UserPagedLimit(json).then(res => {
 						if (res.IsSuccessful) {
+							// 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,
+							// 			res.Data[i].code = res.Data[i].CODE
+							// 	}
+							// }
+							// return res.Data
+							this.selectorInfo.totalCount = res.TotalCount
 							this.selectorInfo.dataLists = res.Data.map(i => {
 								return {
 									...i,

pages/apply/subPages/BS/riskSumbitActualDealCheck.vue

@@ -76,6 +76,8 @@
 											inputAlign="right"></u--input>
 									</u-form-item>
 
+									<view class="upload-title">附件</view>
+									<full-upload v-model="item.Nav_Files" :isShowBtn='false'></full-upload>
 									<u-form-item label="整改期限" prop="LastDateUser" borderBottom>
 										<u--input disabled :value="$u.timeFormat(model.LastDateUser, ' yyyy-mm-dd')"
 											disabledColor="#fff" placeholder="请选择整改期限" border="none"

pages/apply/subPages/BS/riskSumbitNoticeCheck.vue

@@ -59,9 +59,11 @@
 										<u--input disabled disabledColor="#fff" v-model="item.ADDRESS" border="none"
 											inputAlign="right"></u--input>
 									</u-form-item>
+									<view class="upload-title">附件</view>
+									<full-upload v-model="item.Nav_Files" :isShowBtn='false'></full-upload>
 									<u-form-item label="备注" prop="REMARK" borderBottom>
-										<u--input disabled disabledColor="#fff" placeholder='备注'  border="none" v-model="item.REMARK"
+										<u--input disabled disabledColor="#fff" placeholder='备注' border="none"
-											inputAlign="right"></u--input>
+											v-model="item.REMARK" inputAlign="right"></u--input>
 									</u-form-item>
 									<u-form-item label="整改期限" prop="LastDateUserShow" borderBottom>
 										<u--input disabled disabledColor="#fff" placeholder="请选择整改期限" border="none"

pages/apply/subPages/BS/riskSumbitNoticeToActual.vue

@@ -70,8 +70,9 @@
 											border="none" inputAlign="right"></u--input>
 									</u-form-item>
 
-									<u-form-item required label="整改落实人" required style="margin-left: 8px;margin-bottom: 70px;"
+									<u-form-item required label="整改落实人" required
-										prop="Nav_UserActualDeal.NAME" borderBottom
+										style="margin-left: 8px;margin-bottom: 70px;" prop="Nav_UserActualDeal.NAME"
+										borderBottom
 										@click="handleShowSheet({title: '整改落实人', name: 'actualDeal', dataIndex: index})">
 										<u--input disabled disabledColor="#fff" v-model="item.Nav_UserActualDeal.NAME"
 											border="none" inputAlign="right"></u--input>
@@ -90,7 +91,8 @@
 		</u-sticky>
 
 		<query-selector :show="comPickerInfo.showSheet" :title="comPickerInfo.title" :lists="comPickerInfo.dataLists"
-			@search="handleShowSheet" @select="onConfirmPicker" @close="comPickerInfo.showSheet=false" />
+			@search="handleShowSheet" @select="onConfirmPicker" @close="comPickerInfo.showSheet=false"
+			:total="comPickerInfo.totalCount" />
 		<!-- handleSearchUser -->
 		<view class="bottom-button">
 			<button type="primary" v-if='isLoadOK&&tableKey==1' @click="FullCheckUpdate">提交</button>
@@ -122,7 +124,7 @@
 	} from '../../../../uni_modules/uview-ui/libs/mixin/mixin'
 
 	import {
-		OrderPagedUseful,
+		UserPagedLimit,
 		GetDpartMentNameHeader
 	} from '../../../../services/common'
 
@@ -168,6 +170,7 @@
 					columns: [],
 					dataLists: [],
 					title: '整改落实人选择',
+					totalCount: 0,
 					dataIndex: undefined,
 					dataIndex: undefined,
 					name: ''
@@ -275,7 +278,7 @@
 			},
 
 			//下拉数据加载
-			async handleShowSheet(p) {
+			async handleShowSheet(p, pageIndex) {
 				const orgId = uni.getStorageSync('orgId')
 				const json = initFilter(orgId, "", "", 0)
 				if (p.name) {
@@ -286,9 +289,21 @@
 						extendRule(json, 'NAME', 9, p);
 					}
 				}
-				let dataSelect = []
+
-				OrderPagedUseful(json).then(res => {
+				// if (p.val) {
-					this.comPickerInfo.dataLists = res.map(i => {
+				// 	extendRule(json, 'NAME', 9, p.val);
+				// }
+				json.PageIndex = pageIndex ?? 1
+				json.Limit = 20
+				json.Sort = 'NAME'
+				if (p.pageIndex) {
+					json.Start = (p.pageIndex - 1) * json.Limit;
+				}
+
+				// let dataSelect = []
+				UserPagedLimit(json).then(res => {
+					this.comPickerInfo.totalCount = res.TotalCount
+					this.comPickerInfo.dataLists = res.Data.map(i => {
 						return {
 							...i,
 							name: i.NAME,

pages/apply/subPages/BS/riskSumbitUserDepNew.vue

@@ -124,7 +124,7 @@
 
 		<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title"
 			:lists="selectorInfo.dataLists" @search="handleSearch" @select="handleSelected"
-			@close="selectorInfo.showPopup=false" />
+			@close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
 
 		<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker"
 			@close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
@@ -175,9 +175,10 @@
 	} from '../../../../uni_modules/uview-ui/libs/mixin/mixin'
 
 	import {
-		OrderPagedUseful2,
+		UserPagedLimit,
 		OrderPagedUseful,
 		OrderPagedUser,
+		UserPagedAll,
 		GetDpartMentNameHeader,
 		getEnum
 	} from '../../../../services/common'
@@ -273,6 +274,7 @@
 				selectorInfo: {
 					showPopup: false,
 					isMultiple: false,
+					totalCount: 0,
 					title: '人员选择',
 					index: 0,
 					dataLists: [],
@@ -615,7 +617,7 @@
 			},
 
 			//数据加载
-			handleSearch(val) {
+			handleSearch(val, pageIndex) {
 				const orgId = uni.getStorageSync('orgId')
 				const json = initFilter(orgId, "", "NAME")
 				if (val) {
@@ -737,9 +739,17 @@
 					})
 
 				} else if (this.selectorInfo.name == 'usercheck') {
-					OrderPagedUser(json).then(res => {
+					json.PageIndex = pageIndex ?? 1
+					json.Limit = 20
+					json.Sort = 'NAME'
+					if (pageIndex) {
+						json.Start = (pageIndex - 1) * json.Limit;
+					}
+
+					UserPagedAll(json).then(res => {
+						this.selectorInfo.totalCount = res.TotalCount
 						// if (res.IsSuccessful) {
-						this.selectorInfo.dataLists = res.map(i => {
+						this.selectorInfo.dataLists = res.Data.map(i => {
 							return {
 								...i,
 								name: i.NAME,
@@ -749,7 +759,14 @@
 						// }
 					})
 				} else {
-					OrderPagedUseful2(json).then(res => {
+					json.PageIndex = pageIndex ?? 1
+					json.Limit = 20
+					json.Sort = 'NAME'
+					if (pageIndex) {
+						json.Start = (pageIndex - 1) * json.Limit;
+					}
+					UserPagedLimit(json).then(res => {
+						this.selectorInfo.totalCount = res.TotalCount
 						if (res.IsSuccessful) {
 							this.selectorInfo.dataLists = res.Data.map(i => {
 								return {