Merge remote-tracking branch 'origin/2025北京诚祥' into 2025北京诚祥

pages/admin/Jiazheng/index.vue

@@ -150,6 +150,10 @@
 	let isFirstClickluru = ref('true')
 	let isFirstClickjuli = ref('true')
 	let userIdList = ref(null)
+	let startDate = ref(null)
+	let endDate = ref(null)
+	let from = ref(null)
+	let zjId = ref(null)
 
 	function updateTimeClick() {
 		data.sortType = 1
@@ -276,7 +280,7 @@
 			id: data.id,
 			userId: data.userId,
 			isZijiazheng: isZijiazhengFlag.value,
-			userIdList:userIdList.value?userIdList.value:"",
+			userIdList: userIdList.value ? userIdList.value : "",
 		}
 		uni.redirectTo({
 			url: `/pages/admin/Jiazheng/jiazhengUserInfo?pageInfo=` + JSON.stringify(pageInfo)
@@ -284,9 +288,17 @@
 	}
 
 	function goUpPage() {
-		uni.redirectTo({
-			url: `/pages/admin/ShouYe/shouye`
-		})
+		if (from.value == 'zijiazhenggongsi') {
+			const originalParams =
+				`isZijiazheng=true&userIdList=${userIdList.value}&startDate=${startDate.value}&endDate=${endDate.value}&zjId=${zjId.value}&from=zijiazhenggongsi`
+			uni.redirectTo({
+				url: `/pages/admin/zijiazheng/index?${originalParams}`
+			})
+		} else {
+			uni.redirectTo({
+				url: `/pages/admin/ShouYe/shouye`
+			})
+		}
 	}
 
 	function onRefresh() {
@@ -329,6 +341,7 @@
 		}
 	}
 	const convertToArray = (str) => str.split(',').map(item => item.trim());
+
 	function refreshData() {
 		const opt = {
 			"zyId": data.zyId == '全部职业' ? '' : data.zyId,
@@ -340,7 +353,7 @@
 			"userName": data.userName,
 			"jingdu": data.jingdu,
 			"weidu": data.weidu,
-			"userIdList":userIdList.value? convertToArray(userIdList.value):[]
+			"userIdList": userIdList.value ? convertToArray(userIdList.value) : []
 		}
 		data.list = [];
 		// 数学
@@ -387,7 +400,7 @@
 			"userName": data.userName,
 			"jingdu": data.jingdu,
 			"weidu": data.weidu,
-	"userIdList":userIdList.value? convertToArray(userIdList.value):[]
+			"userIdList": userIdList.value ? convertToArray(userIdList.value) : []
 		}
 		if (data.state == 'no-more') return;
 		data.state = 'loading';
@@ -468,6 +481,10 @@
 		if (options && options.isZijiazheng == 'true') {
 			isZijiazhengFlag.value = 'true'
 			userIdList.value = options.userIdList
+			startDate.value = options.startDate
+			endDate.value = options.endDate
+			from.value = options.from
+			zjId.value = options.zjId
 			console.log('userIdList.value', userIdList.value);
 		}
 		getMore()