1

pages/admin/Jiazheng/index.vue

@@ -150,10 +150,11 @@
 	let isFirstClickluru = ref('true')
 	let isFirstClickjuli = ref('true')
 	let userIdList = ref(null)
+	let listIds = ref(null)
 	let startDate = ref(null)
 	let endDate = ref(null)
 	let from = ref(null)
-	let zjId = ref(null)
+	let jzId = ref(null)
 
 	function updateTimeClick() {
 		data.sortType = 1
@@ -280,7 +281,13 @@
 			id: data.id,
 			userId: data.userId,
 			isZijiazheng: isZijiazhengFlag.value,
+			from: from.value,
+			endDate: endDate.value,
+			startDate: startDate.value,
+			jzId: jzId.value,
 			userIdList: userIdList.value ? userIdList.value : "",
+			listIds: listIds.value ? listIds.value : "",
+			
 		}
 		uni.redirectTo({
 			url: `/pages/admin/Jiazheng/jiazhengUserInfo?pageInfo=` + JSON.stringify(pageInfo)
@@ -290,10 +297,22 @@
 	function goUpPage() {
 		if (from.value == 'zijiazhenggongsi') {
 			const originalParams =
-				`isZijiazheng=true&userIdList=${userIdList.value}&startDate=${startDate.value}&endDate=${endDate.value}&zjId=${zjId.value}&from=zijiazhenggongsi`
+				`isZijiazheng=true&userIdList=${userIdList.value}&startDate=${startDate.value}&endDate=${endDate.value}&jzId=${jzId.value}&from=zijiazhenggongsi`
 			uni.redirectTo({
 				url: `/pages/admin/zijiazheng/index?${originalParams}`
 			})
+		}else if (from.value == 'banzhengshuliang'){
+			const originalParams =
+				`isZijiazheng=true&userIdList=${userIdList.value}&startDate=${startDate.value}&endDate=${endDate.value}&jzId=${jzId.value}&listIds=${listIds.value}&from=zijiazhenggongsi`
+			uni.redirectTo({
+				url: `/pages/admin/zijiazheng/banzhengshuliang?${originalParams}`
+			})
+		}else if (from.value == 'yibanzhengshuliang'){
+			const originalParams =
+				`isZijiazheng=true&userIdList=${userIdList.value}&startDate=${startDate.value}&endDate=${endDate.value}&jzId=${jzId.value}&listIds=${listIds.value}&from=zijiazhenggongsi`
+			uni.redirectTo({
+				url: `/pages/admin/zijiazheng/yibanzhengshuliang?${originalParams}`
+			})
 		} else {
 			uni.redirectTo({
 				url: `/pages/admin/ShouYe/shouye`
@@ -353,6 +372,7 @@
 			"userName": data.userName,
 			"jingdu": data.jingdu,
 			"weidu": data.weidu,
+			"jzId": jzId.value,
 			"userIdList": userIdList.value ? convertToArray(userIdList.value) : []
 		}
 		data.list = [];
@@ -400,6 +420,7 @@
 			"userName": data.userName,
 			"jingdu": data.jingdu,
 			"weidu": data.weidu,
+			"jzId": jzId.value,
 			"userIdList": userIdList.value ? convertToArray(userIdList.value) : []
 		}
 		if (data.state == 'no-more') return;
@@ -481,10 +502,11 @@
 		if (options && options.isZijiazheng == 'true') {
 			isZijiazhengFlag.value = 'true'
 			userIdList.value = options.userIdList
+			listIds.value = options.listIds
 			startDate.value = options.startDate
 			endDate.value = options.endDate
 			from.value = options.from
-			zjId.value = options.zjId
+			jzId.value = options.jzId
 			console.log('userIdList.value', userIdList.value);
 		}
 		getMore()

pages/admin/Jiazheng/jiazhengUserInfo.vue

@@ -104,6 +104,11 @@
 			this.pageInfo.from = data.from
 			this.pageInfo.isZijiazheng = data.isZijiazheng
 			this.pageInfo.userIdList = data.userIdList
+			this.pageInfo.listIds = data.listIds
+			this.pageInfo.startDate = data.startDate
+			this.pageInfo.endDate = data.endDate
+			this.pageInfo.from = data.from
+			this.pageInfo.jzId = data.jzId
 			this.getJianliInfo()
 		},
 		methods: {
@@ -162,7 +167,12 @@
 					id: this.pageInfo.id,
 					userId: this.pageInfo.userId,
 					isZijiazheng:this.pageInfo.isZijiazheng,
-					userIdList:this.pageInfo.userIdList
+					userIdList:this.pageInfo.userIdList,
+					listIds:this.pageInfo.listIds,
+					startDate:this.pageInfo.startDate,
+					endDate:this.pageInfo.endDate,
+					from:this.pageInfo.from,
+					jzId:this.pageInfo.jzId,
 				}
 				uni.redirectTo({
 					url: "/pages/admin/Jiazheng/jiazhengUserManager?pageInfo=" + JSON.stringify(pageInfo)
@@ -177,7 +187,12 @@
 					uni.redirectTo({
 					  url: "/pages/admin/Jiazheng/index" +
 					       "?isZijiazheng=" + this.pageInfo.isZijiazheng +
-					       "&userIdList=" + this.pageInfo.userIdList
+					       "&userIdList=" + this.pageInfo.userIdList+
+					       "&listIds=" + this.pageInfo.listIds+
+					       "&startDate=" + this.pageInfo.startDate+
+					       "&endDate=" + this.pageInfo.endDate+
+					       "&from=" + this.pageInfo.from+
+					       "&jzId=" + this.pageInfo.jzId
 					})
 
 				}

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -106,7 +106,11 @@
 				from: '',
 				statusFlag: null,
 				isZijiazheng: "false",
-				userIdList: ''
+				userIdList: '',
+				listIds: '',
+				startDate: '',
+				endDate: '',
+				jzId: '',		
 			}
 		},
 		components: {
@@ -137,6 +141,10 @@
 			this.from = pageInfo.from
 			this.isZijiazheng = pageInfo.isZijiazheng
 			this.userIdList = pageInfo.userIdList
+			this.listIds = pageInfo.listIds
+			this.startDate = pageInfo.startDate
+			this.endDate = pageInfo.endDate
+			this.jzId = pageInfo.jzId
 			this.dataHandle(pageInfo)
 		},
 		methods: {
@@ -772,7 +780,11 @@
 					uni.redirectTo({
 						url: "/pages/admin/Jiazheng/index" +
 							"?isZijiazheng=" + this.isZijiazheng +
-							"&userIdList=" + this.userIdList
+							"&userIdList=" + this.userIdList+  "&listIds=" + this.listIds+
+					       "&startDate=" + this.startDate+
+					       "&endDate=" + this.endDate+
+					       "&from=" + this.from+
+					       "&jzId=" + this.jzId
 					})
 				}