From 5e8cb4fc7252e175a9f641b888101f80393bbc77 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Sat, 28 Feb 2026 13:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/addjigou/all.vue           |  9 ++--
 pages/addjigou/name.vue          |  7 ++-
 pages/addoldman/IDcard.vue       |  2 +-
 pages/addoldman/oldIDcard.vue    |  7 ++-
 pages/addstaff/all.vue           |  2 +-
 pages/addstaff/api/addjigou.js   |  6 +++
 pages/oldmanindex/index.vue      | 71 +++++++++-----------------
 pages/oldmanindex/moneylist.vue  | 87 +-------------------------------
 pages/yuangongindex/index.vue    | 61 ++++++++++++----------
 pages/yuangongindex/workjoin.vue |  7 +--
 10 files changed, 80 insertions(+), 179 deletions(-)

diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue
index 257d080..1a1c844 100644
--- a/pages/addjigou/all.vue
+++ b/pages/addjigou/all.vue
@@ -42,7 +42,7 @@
 					<view class="white-photo" @click="getMessage(headImge)">
 						<view class="photo-left">
 							<view class="photo-weight">人像面</view>
-							<!-- <view class="photo-font">请上传身份证人像面</view> -->
+							<view class="photo-font">请上传身份证人像面</view>
 						</view>
 						<view style="position: relative;">
 							<image class="photo"
@@ -56,7 +56,7 @@
 					<view class="white-photo" style="margin-top: 30rpx;" @click="getMessage(backImge)">
 						<view class="photo-left">
 							<view class="photo-weight">国徽面</view>
-							<!-- <view class="photo-font">请上传身份证国徽面</view> -->
+							<view class="photo-font">请上传身份证国徽面</view>
 						</view>
 						<view style="position: relative;">
 							<image class="photo"
@@ -201,7 +201,7 @@
 	const nameArray0 = ["企业名称", "注册地址", "信用代码", "法人"];
 	const textArray0 = reactive(["", "", "", "", "", "", ""]);
 	
-	const nameArray1 = ["机构位置","详细地址","机构负责人", "机构负责人电话", "房屋性质","建筑面积"];
+	const nameArray1 = ["机构位置","详细地址","机构负责人", "负责人电话", "房屋性质","建筑面积"];
 	const textArray1 = reactive([ "","", "", "", "", ""]);
 	
 	const backImge = ref("");
@@ -437,8 +437,7 @@
 
 		.photo-font {
 			font-size: 28rpx;
-			margin-top: 10rpx;
-			color: #666;
+			margin-top: 10rpx; 
 		}
 
 	}
diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue
index 50e4eb7..fa928f0 100644
--- a/pages/addjigou/name.vue
+++ b/pages/addjigou/name.vue
@@ -22,7 +22,7 @@
 			<view class="white-photo" @click="selectphoto(0)">
 				<view class="photo-left">
 					<view class="photo-weight">人像面</view>
-					<!-- <view class="photo-font">请上传身份证人像面</view> -->
+					<view class="photo-font">请上传身份证人像面</view>
 				</view>
 				<view style="position: relative;">
 					<image class="photo"
@@ -38,7 +38,7 @@
 			<view class="white-photo" style="margin-top: 30rpx;" @click="selectphoto(1)">
 				<view class="photo-left">
 					<view class="photo-weight">国徽面</view>
-					<!-- <view class="photo-font">请上传身份证国徽面</view> -->
+					<view class="photo-font">请上传身份证国徽面</view>
 				</view>
 				<view style="position: relative;">
 					<!-- <image class="photo"
@@ -574,8 +574,7 @@
 
 		.photo-font {
 			font-size: 28rpx;
-			margin-top: 10rpx;
-			color: #666;
+			margin-top: 10rpx; 
 		}
 
 	}
diff --git a/pages/addoldman/IDcard.vue b/pages/addoldman/IDcard.vue
index ee9c976..28c6547 100644
--- a/pages/addoldman/IDcard.vue
+++ b/pages/addoldman/IDcard.vue
@@ -24,7 +24,7 @@
 			<view class="white-photo" @click="selectphoto()">
 				<view class="photo-left">
 					<view class="photo-weight">人像面</view>
-					<!-- <view class="photo-font">请上传身份证人像面</view> -->
+					<view class="photo-font">请上传身份证人像面</view>
 				</view>
 				<view style="position: relative;">
 					<image class="photo"
diff --git a/pages/addoldman/oldIDcard.vue b/pages/addoldman/oldIDcard.vue
index 181c3d0..5b5c63d 100644
--- a/pages/addoldman/oldIDcard.vue
+++ b/pages/addoldman/oldIDcard.vue
@@ -17,7 +17,7 @@
 			<view class="white-photo" @click="selectphoto(2)">
 				<view class="photo-left">
 					<view class="photo-weight">人像面</view>
-					<!-- <view class="photo-font">请上传身份证人像面</view> -->
+					<view class="photo-font">请上传身份证人像面</view>
 				</view>
 				<view style="position: relative;">
 					<image class="photo"
@@ -75,7 +75,7 @@
 			<view class="white-photo" @click="selectphoto(0)">
 				<view class="photo-left">
 					<view class="photo-weight">人像面</view>
-					<!-- <view class="photo-font">请上传身份证人像面</view> -->
+					<view class="photo-font">请上传身份证人像面</view>
 				</view>
 				<view style="position: relative;">
 					<image class="photo"
@@ -983,8 +983,7 @@
 
 		.photo-font {
 			font-size: 28rpx;
-			margin-top: 10rpx;
-			color: #666;
+			margin-top: 10rpx; 
 		}
 
 	}
diff --git a/pages/addstaff/all.vue b/pages/addstaff/all.vue
index 1553dd2..a962ef6 100644
--- a/pages/addstaff/all.vue
+++ b/pages/addstaff/all.vue
@@ -42,7 +42,7 @@
 						<view style="display: flex;">
 							<view class="shu"></view>
 							<view class="content-weight" style="margin-top: -2rpx;">个人信息</view>
-							<view class="small-blue" @click="changeMessage" v-if="alldata.applyStatus&&alldata.applyStatus!=1&&alldata.applyStatus!=4&&code<0">
+							<view class="small-blue" @click="changeMessage" v-if="alldata.applyStatus&&alldata.applyStatus!=1&&alldata.applyStatus!=4&&code==1">
 								编辑
 							</view>
 							<image class="shu-img" v-else
diff --git a/pages/addstaff/api/addjigou.js b/pages/addstaff/api/addjigou.js
index 27d4ebe..badd8b4 100644
--- a/pages/addstaff/api/addjigou.js
+++ b/pages/addstaff/api/addjigou.js
@@ -24,6 +24,12 @@ export function queryEmployeeInfoById(id){
 		method: 'get',
     })
 }
+export function queryEmployeeInfoByOrgId(id){
+    return request({
+        url: `/api/employeesAdvisiory/queryEmployeeInfoByOrgId?id=${id}`,
+		method: 'get',
+    })
+}
 
 //向机构申请
 export function Apply(data){
diff --git a/pages/oldmanindex/index.vue b/pages/oldmanindex/index.vue
index be19c51..6598f95 100644
--- a/pages/oldmanindex/index.vue
+++ b/pages/oldmanindex/index.vue
@@ -35,7 +35,7 @@
 											src="https://www.focusnu.com/media/directive/index/oldmanphoto/time.png"
 											mode="widthFix" lazy-load="false" />
 									</view>
-									<view style="display: flex;margin-left: 5rpx;">
+									<view style="display: flex;margin-left: 5rpx;font-size: 24rpx;">
 										{{ dateText  }}
 										<view style="margin-left: 20rpx;">
 											{{ weekdayText  }}
@@ -53,7 +53,7 @@
 											<view style="font-size: 32rpx;font-weight: 600;margin-bottom: 8rpx;">
 												{{ (item.elderInfo && item.elderInfo.name)  }}
 											</view>
-											<view style="margin-left: 5rpx;font-size: 20rpx;display: flex;">
+											<view style="margin-left: 5rpx;font-size: 23rpx;display: flex;">
 												<view>
 													{{ item.elderInfo?.sex }}
 												</view>
@@ -77,14 +77,31 @@
 									</view>
 									<view class="right-top-card"
 										style="margin-top: 20rpx;padding: 0 30rpx;font-size: 25rpx;">
-
+										<view
+											style="display: flex;flex-direction: column;width: 50%;padding-left: 15rpx;">
+											<!-- <image style="width: 45rpx;height: 45rpx;margin-bottom: 5rpx;"
+												src="https://www.focusnu.com/media/directive/index/oldmanphoto/wen.png"
+												mode="widthFix" lazy-load="false" /> -->
+												<image style="width: 45rpx;height: 45rpx;margin-bottom: 5rpx;"
+													src="https://www.focusnu.com/media/directive/index/oldmanmenu/wendu.png"
+													mode="widthFix" lazy-load="false" />
+												
+											<view style="display: flex;">
+												<view style="font-size: 25rpx;margin-right: 15rpx;">
+													温度
+												</view>
+												<view style="font-size: 25rpx;">
+													{{ (item.humidDeviceList && item.humidDeviceList[0] && item.humidDeviceList[0].temperature !== undefined && item.humidDeviceList[0].temperature !== null) ? item.humidDeviceList[0].temperature : '—' }}℃
+												</view>
+											</view>
+										</view>
 										<view
 											style="display: flex;flex-direction: column;width: 50%;padding-left: 15rpx;">
 											<image style="width: 45rpx;height: 45rpx;margin-bottom: 5rpx;"
 												src="https://www.focusnu.com/media/directive/index/oldmanphoto/shi.png"
 												mode="widthFix" lazy-load="false" />
 											<view style="display: flex;">
-												<view style="font-size: 23rpx;margin-right: 15rpx;">
+												<view style="font-size: 25rpx;margin-right: 15rpx;">
 													湿度
 												</view>
 												<view style="font-size: 25rpx;">
@@ -94,20 +111,7 @@
 												</view>
 											</view>
 										</view>
-										<view
-											style="display: flex;flex-direction: column;width: 50%;padding-left: 15rpx;">
-											<image style="width: 45rpx;height: 45rpx;margin-bottom: 5rpx;"
-												src="https://www.focusnu.com/media/directive/index/oldmanphoto/wen.png"
-												mode="widthFix" lazy-load="false" />
-											<view style="display: flex;">
-												<view style="font-size: 23rpx;margin-right: 15rpx;">
-													温度
-												</view>
-												<view style="font-size: 25rpx;">
-													{{ (item.humidDeviceList && item.humidDeviceList[0] && item.humidDeviceList[0].temperature !== undefined && item.humidDeviceList[0].temperature !== null) ? item.humidDeviceList[0].temperature : '—' }}℃
-												</view>
-											</view>
-										</view>
+										
 
 
 									</view>
@@ -525,39 +529,10 @@
 			url: `/pages/addjigou/name`
 		});
 	}
-	// const jumpToAll = (element) => {
-	// 	console.log("????",element.applyStatus)
-	// 	uni.getStorage({
-	// 		key: 'openid',
-	// 		success: function(res) {
-	// 			getMessageList(res.data).then(res => {
-	// 				if (res.success) {
-	// 					uni.navigateTo({
-	// 						url: `/pages/addstaff/all?element=${JSON.stringify(res.result[0])}&applyStatus=${element.applyStatus}`
-	// 					});
-	// 				}
-
-	// 			})
-	// 		}
-	// 	});
-	// }
 	const look = (element) => {
 		uni.navigateTo({
 			url: `/pages/yuangongindex/workjoin`
 		});
-		// uni.getStorage({
-		// 	key: 'openid',
-		// 	success: function(res) {
-		// 		getMessageList(res.data).then(res => {
-		// 			if (res.success) {
-		// 				uni.navigateTo({
-		// 					url: `/pages/addstaff/all?element=${JSON.stringify(res.result[0])}&applyStatus=${element.applyStatus}`
-		// 				});
-		// 			}
-
-		// 		})
-		// 	}
-		// });
 	}
 
 	const jumptolist = (res) => {
@@ -1228,7 +1203,7 @@
 			.left-card-view {
 				display: flex;
 				align-items: center;
-				font-size: 26rpx;
+				font-size: 28rpx;
 				margin-top: 10rpx;
 				color: black;
 				.left-card-imge{
diff --git a/pages/oldmanindex/moneylist.vue b/pages/oldmanindex/moneylist.vue
index 4faf7e7..6de5855 100644
--- a/pages/oldmanindex/moneylist.vue
+++ b/pages/oldmanindex/moneylist.vue
@@ -81,35 +81,7 @@
 						<view style="margin-top: 20rpx;color: #999999;font-size: 30rpx;">
 							{{ item.departName }}
 						</view>
-						<!-- <image style="height: 90rpx;width: 90rpx;"
-							src="https://www.focusnu.com/media/directive/index/touxiang.png" />
-						<view class="">
-							<view style="display: flex;margin-left: 20rpx;align-items: center;">
-								<view style="color: black;font-size: 32rpx;">
-									{{ item.name }}
-								</view>
-								<view style="margin-left: 20rpx;">
-									{{ item.sex }}
-								</view>
-							</view>
-							<view style="display: flex;margin-left: 20rpx;align-items: center;margin-top: 10rpx;">
-								<view style="color: black;font-size: 28rpx;">
-									NUID
-								</view>
-								<view style="margin-left: 10rpx;">
-									{{ item.nuId }}
-								</view>
-							</view>
-						</view>
-						<view style="position: absolute;right: 20rpx;top: 60rpx;display: flex;align-items: center;">
-							<image style="height: 30rpx;width: 30rpx;"
-								src="https://www.focusnu.com/media/directive/index/infotime.png" />
-								<view style="margin-left: 20rpx;">
-									{{ item.createTime.slice(0, 10) }} 
-								</view>
-								<image style="height: 30rpx;width: 30rpx;margin-left: 10rpx;"
-									src="https://www.focusnu.com/media/directive/index/more.png" />
-						</view> -->
+						 
 					</view>
 				</view>
 			</view>
@@ -171,62 +143,7 @@
 	const goBack = () => {
 		uni.navigateBack()
 	}
-	// const changeoldman = (item) => {
-	// 	console.log("????",item)
-	// 	uni.setStorageSync("baddata", item)
-	// 	uni.setStorageSync('specicalid', item.id);
-	// 	uni.setStorageSync("backhuancun", {})
-	// 	let data = {
-	// 		nuId : item.nuId,
-	// 		orgCode : item.orgCode
-	// 	}
-	// 	uni.setStorageSync('oldman', data);
-	// 	uni.navigateTo({
-	// 		url: "/pages/addoldman/oldIDcard"
-	// 	})
-	// }
-	// const again = (item) => {
-	// 	uni.navigateTo({
-	// 		url: "/pages/yuangongindex/searchjigou"
-	// 	})
-	// 	// uni.getStorage({
-	// 	// 	key: 'openid',
-	// 	// 	success: function(res) {
-	// 	// 		getMessageList(res.data).then(res => {
-	// 	// 			if (res.success) {
-	// 	// 				uni.setStorageSync("baddata", res.result[0])
-	// 	// 				uni.setStorageSync('specicalid', res.result[0].id);
-	// 	// 				uni.setStorageSync("backhuancun", {})
-	// 	// 				uni.navigateTo({
-	// 	// 					url: `/pages/addstaff/information`
-	// 	// 				});
-	// 	// 			}
-
-	// 	// 		})
-	// 	// 	}
-	// 	// });
-
-	// }
-
-	// const jumpToAll = (element) => {
-	// 	console.log("????", element.applyStatus)
-	// 	// uni.getStorage({
-	// 	// 	key: 'openid',
-	// 	// 	success: function(res) {
-	// 	// 		getMessageList(res.data).then(res => {
-	// 	// 			if (res.success) {
-	// 	// 				uni.navigateTo({
-	// 	// 					url: `/pages/addstaff/all?element=${JSON.stringify(res.result[0])}&applyStatus=${element.applyStatus}`
-	// 	// 				});
-	// 	// 			}
-
-	// 	// 		})
-	// 	// 	}
-	// 	// });
-	// 	// uni.navigateTo({
-	// 	// 	url: `/pages/yuangongindex/company?element=${JSON.stringify(element)}`
-	// 	// });
-	// }
+	 
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/yuangongindex/index.vue b/pages/yuangongindex/index.vue
index 2168db3..ef308ff 100644
--- a/pages/yuangongindex/index.vue
+++ b/pages/yuangongindex/index.vue
@@ -157,14 +157,14 @@
 									</view>
 								</view>
 								<view class="right-button">
-									<view class="right-button-one" @click="clickButton(item,1)">
+									<view class="right-button-one" @click="clickButton(item,0)">
 										<image class="right-button-img"
 											:src="`https://www.focusnu.com/media/directive/index/addstaff/jineng.png`" />
 										<view class="">
 											员工信息
 										</view>
 									</view>
-									<view class="right-button-one" @click="clickButton(item,-1)">
+									<view class="right-button-one" @click="clickButton(item,1)">
 										<image class="right-button-img"
 											:src="`https://www.focusnu.com/media/directive/index/addstaff/yuangong.png`" />
 										<view class="">
@@ -262,6 +262,7 @@
 				</view>
 			</view>
 		</u-popup>
+		<exit :show="exitshow" @close="go(0)" :cont="conts" @go="go(1)"/>
 	</view>
 </template>
 
@@ -290,8 +291,9 @@
 	import request from '@/request/index.js'
 	import downMenu from '@/compontent/public/yuangongdownmenu.vue'
 	import model from "@/compontent/public/model.vue"
-
+	import exit from "@/compontent/public/exit.vue"
 	const show = ref(false);
+	const exitshow = ref(false);
 
 	const content = ref("");
 
@@ -363,7 +365,7 @@
 			uni.setStorageSync("changeyuangongorgCode", item.orgCode)
 			if (res.success) {
 				uni.navigateTo({
-					url: `/pages/addstaff/all?element=${JSON.stringify(res.result[0])}&auditContent=${item.auditContent}`
+					url: `/pages/addstaff/all?element=${JSON.stringify(res.result[0])}&auditContent=${item.auditContent}&code=1`
 				});
 			}
 		})
@@ -494,33 +496,36 @@
 		})
 	}
 	const hong = ref(0);
-	const changeStatus = (item, status) => {
-		uni.showModal({
-			title: '提示',
-			content: status?'是否接受邀请':'是否拒绝邀请',
-			success: function (res) {
-				if (res.confirm) {
-					let data = {
-						employeeId: item.employeesId,
-						status: status ? 2 : 3,
-						orgCode: item.orgCode
-					}
-					invitedConfirm(data).then(res => {
-						if (res.success) {
-							loadingData()
-						}
-					})
-					
-					
-				} else if (res.cancel) {
-					console.log('用户点击取消');
-				}
+	const go = (e) =>{
+		if(e==1){
+			let data = {
+				employeeId: orgCodes.value.employeesId,
+				status: conts.value == '是否接受邀请' ? 2 : 3,
+				orgCode: orgCodes.value.orgCode
 			}
-		});
-		
-		
+			invitedConfirm(data).then(res => {
+				exitshow.value = false;
+				if (res.success) {
+					loadingData()
+				}else{
+					uni.showToast({
+						icon:'none',
+						title:res.message
+					})
+				}
+			})
+		}else{
+			exitshow.value = false;
+		}
 		
 	}
+	const conts = ref('')
+	const orgCodes = ref({})
+	const changeStatus = (item, status) => {
+		conts.value = status?'是否接受邀请':'是否拒绝邀请';
+		orgCodes.value = item;
+		exitshow.value = true;
+	}
 	const clickButton = (item, index) => {
 
 			getMessageList(item.orgCode).then(res => {
diff --git a/pages/yuangongindex/workjoin.vue b/pages/yuangongindex/workjoin.vue
index b6882bd..8640a39 100644
--- a/pages/yuangongindex/workjoin.vue
+++ b/pages/yuangongindex/workjoin.vue
@@ -111,7 +111,8 @@
 		getEmployeesOrgRela,
 	} from './api.js'
 	import {
-		queryEmployeeInfoById
+		queryEmployeeInfoById,
+		queryEmployeeInfoByOrgId
 	} from '@/pages/addstaff/api/addjigou.js'
 	import model from "@/compontent/public/model.vue"
 
@@ -182,9 +183,9 @@
 
 	const jumpToAll = (element) => {
 		
-		queryEmployeeInfoById(element.id).then(res => {
+		queryEmployeeInfoByOrgId(element.id).then(res => {
 				uni.navigateTo({
-					url: `/pages/addstaff/all?element=${JSON.stringify(res.result)}&applyStatus=${element.applyStatus}&code=1`
+					url: `/pages/addstaff/all?element=${JSON.stringify(res.result)}&applyStatus=${element.applyStatus}&code=0`
 				});
 
 		})