From 68c06f273b2dcff77fd7291298fe6743ea4f3507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Fri, 19 Dec 2025 11:42:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=AE=BF=E7=94=B3=E8=AF=B7=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E7=94=B3=E8=AF=B7=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsideAccommodation/applicationForm.vue  | 146 ++++++---
 .../dormitory/outsideAccommodation/index.vue  | 304 ++++++++++--------
 .../images/workbench/outsideAccommodation.png | Bin 2995 -> 3001 bytes
 3 files changed, 264 insertions(+), 186 deletions(-)

diff --git a/pages/dormitory/outsideAccommodation/applicationForm.vue b/pages/dormitory/outsideAccommodation/applicationForm.vue
index 8b68a82..73de445 100644
--- a/pages/dormitory/outsideAccommodation/applicationForm.vue
+++ b/pages/dormitory/outsideAccommodation/applicationForm.vue
@@ -9,7 +9,7 @@
 		<!-- 表单主体容器 -->
 		<view class="main-container">
 			<!-- 选项卡容器 - 原生选项卡 -->
-			<view class="tabs-container">
+			<view class="tabs-container" id="tabs">
 				<view class="tabs-header">
 					<!-- 详情模式下禁用选项卡切换 -->
 					<view class="tab-item" :class="{ active: activeTab === 0 }" @click="switchTab(0)">
@@ -37,7 +37,7 @@
 			</view>
 
 			<!-- 表单内容区域 -->
-			<scroll-view scroll-y class="form-scroll" :style="{ height: formScrollHeight }">
+			<scroll-view scroll-y class="form-scroll" :style="{ height: formScrollHeight }" id="form-scroll">
 				<view class="form-wrapper">
 					<!-- 1. 基本信息标签页 -->
 					<view v-show="activeTab === 0" class="tab-panel">
@@ -46,13 +46,14 @@
 							<view class="form-item">
 								<label class="form-label">原宿舍号</label>
 								<!-- 详情模式下禁用输入框 -->
-								<input v-model="form.originalDormitory" placeholder="如：1栋302"
-									class="form-input" :disabled="isDetailMode"></input>
+								<input v-model="form.originalDormitory" placeholder="如：1栋302" class="form-input"
+									:disabled="isDetailMode"></input>
 							</view>
 
 							<view class="form-item">
 								<label class="form-label">姓名</label>
-								<input v-model="form.studentName" placeholder="请输入姓名" class="form-input" :disabled="isDetailMode"></input>
+								<input v-model="form.studentName" placeholder="请输入姓名" class="form-input"
+									:disabled="isDetailMode"></input>
 							</view>
 
 							<view class="form-item">
@@ -68,7 +69,8 @@
 
 							<view class="form-item">
 								<label class="form-label">出生年月</label>
-								<picker mode="date" :value="form.birthDate" @change="handleBirthDateChange" :disabled="isDetailMode">
+								<picker mode="date" :value="form.birthDate" @change="handleBirthDateChange"
+									:disabled="isDetailMode">
 									<view class="picker-input">
 										{{ form.birthDate || '请选择出生年月' }}
 									</view>
@@ -77,22 +79,26 @@
 
 							<view class="form-item">
 								<label class="form-label">专业系</label>
-								<input v-model="form.majorName" placeholder="请输入专业系" class="form-input" :disabled="isDetailMode"></input>
+								<input v-model="form.majorName" placeholder="请输入专业系" class="form-input"
+									:disabled="isDetailMode"></input>
 							</view>
 
 							<view class="form-item">
 								<label class="form-label">班级</label>
-								<input v-model="form.className" placeholder="请输入班级" class="form-input" :disabled="isDetailMode"></input>
+								<input v-model="form.className" placeholder="请输入班级" class="form-input"
+									:disabled="isDetailMode"></input>
 							</view>
 
 							<view class="form-item">
 								<label class="form-label">学号</label>
-								<input v-model="form.studentNo" placeholder="请输入学号" class="form-input" :disabled="isDetailMode"></input>
+								<input v-model="form.studentNo" placeholder="请输入学号" class="form-input"
+									:disabled="isDetailMode"></input>
 							</view>
 
 							<view class="form-item">
 								<label class="form-label">身份证号码</label>
-								<input v-model="form.idCard" placeholder="请输入身份证号码" class="form-input" :disabled="isDetailMode"></input>
+								<input v-model="form.idCard" placeholder="请输入身份证号码" class="form-input"
+									:disabled="isDetailMode"></input>
 							</view>
 
 							<view class="form-item">
@@ -127,12 +133,13 @@
 								</view>
 								<view class="file-list" v-if="affixFiles.length">
 									<view class="file-item" v-for="(file, index) in affixFiles" :key="index">
-										<text class="file-name" @click="previewImage(baseUrl + file.savePath)">{{ file.attachmentName || file.trueName }}</text>
+										<text class="file-name"
+											@click="previewImage(baseUrl + file.savePath)">{{ file.attachmentName || file.trueName }}</text>
 										<!-- 详情模式下禁用删除按钮 -->
 										<!-- <button size="mini" type="warn" @click="deleteAffixFile(index)" v-if="!isDetailMode"
 											class="delete-btn" :disabled="isDetailMode">删除</button> -->
-										<uni-icons type="trash-filled" size="30" @click="deleteAffixFile(index)" v-if="!isDetailMode"
-											class="delete-btn"></uni-icons>
+										<uni-icons type="trash-filled" size="30" @click="deleteAffixFile(index)"
+											v-if="!isDetailMode" class="delete-btn"></uni-icons>
 									</view>
 								</view>
 								<!-- <uni-file-picker :auto-upload="false" @select="chooseAffixFile" @delete="deleteAffixFile"></uni-file-picker> -->
@@ -143,8 +150,9 @@
 								<label class="form-label">电子签名</label>
 								<view class="signature-container">
 									<!-- 详情模式下隐藏签名按钮 -->
-									<button size="mini" type="primary" @click="!isDetailMode && openSignature('student')"
-										class="sign-btn" v-if="!isDetailMode">
+									<button size="mini" type="primary"
+										@click="!isDetailMode && openSignature('student')" class="sign-btn"
+										v-if="!isDetailMode">
 										签署电子签名
 									</button>
 									<image v-if="form.studentSignature" :src="baseUrl + form.studentSignature"
@@ -163,7 +171,8 @@
 							<view class="form-item">
 								<label class="form-label">外宿地区</label>
 								<!-- 详情模式下禁用省市区选择器 -->
-								<view class="area-picker" @click="!isDetailMode && (showAreaPicker = true)" :class="{disabled: isDetailMode}">
+								<view class="area-picker" @click="!isDetailMode && (showAreaPicker = true)"
+									:class="{disabled: isDetailMode}">
 									<text class="picker-text">{{ areaText || '请选择省/市/区' }}</text>
 									<uni-icons type="arrowright" size="16" color="#999" class="picker-icon"></uni-icons>
 								</view>
@@ -177,8 +186,8 @@
 
 							<view class="form-item">
 								<label class="form-label">紧急联系人</label>
-								<input v-model="form.emergencyContact" placeholder="请输入紧急联系人姓名"
-									class="form-input" :disabled="isDetailMode"></input>
+								<input v-model="form.emergencyContact" placeholder="请输入紧急联系人姓名" class="form-input"
+									:disabled="isDetailMode"></input>
 							</view>
 
 							<view class="form-item">
@@ -197,7 +206,8 @@
 								<label class="form-label">家长意见</label>
 								<!-- 详情模式下禁用选择器 -->
 								<picker mode="selector" :range="parentOpinionOptions" :range-key="'text'"
-									v-model="form.parentOpinion" @change="handleParentOpinionChange" :disabled="isDetailMode">
+									v-model="form.parentOpinion" @change="handleParentOpinionChange"
+									:disabled="isDetailMode">
 									<view class="picker-input">
 										{{ form.parentOpinion ? getParentOpinionText(form.parentOpinion) : '请选择家长意见' }}
 									</view>
@@ -227,7 +237,8 @@
 							<view class="form-item">
 								<label class="form-label">家长通讯地区</label>
 								<!-- 详情模式下禁用省市区选择器 -->
-								<view class="area-picker" @click="!isDetailMode && (showParentAreaPicker = true)" :class="{disabled: isDetailMode}">
+								<view class="area-picker" @click="!isDetailMode && (showParentAreaPicker = true)"
+									:class="{disabled: isDetailMode}">
 									<text class="picker-text">{{ parentAreaText || '请选择省/市/区' }}</text>
 									<uni-icons type="arrowright" size="16" color="#999" class="picker-icon"></uni-icons>
 								</view>
@@ -235,8 +246,8 @@
 
 							<view class="form-item">
 								<label class="form-label">家长详细地址</label>
-								<input v-model="form.parentDetailAddress" placeholder="请输入家长详细通讯地址"
-									class="form-input" :disabled="isDetailMode"></input>
+								<input v-model="form.parentDetailAddress" placeholder="请输入家长详细通讯地址" class="form-input"
+									:disabled="isDetailMode"></input>
 							</view>
 						</view>
 					</view>
@@ -259,8 +270,9 @@
 								<label class="form-label">承诺签名</label>
 								<view class="signature-container">
 									<!-- 详情模式下隐藏签名按钮 -->
-									<button size="mini" type="primary" @click="!isDetailMode && openSignature('promise')"
-										class="sign-btn" v-if="!isDetailMode">
+									<button size="mini" type="primary"
+										@click="!isDetailMode && openSignature('promise')" class="sign-btn"
+										v-if="!isDetailMode">
 										签署承诺签名
 									</button>
 									<image v-if="form.studentPromiseSign" :src="baseUrl + form.studentPromiseSign"
@@ -269,7 +281,8 @@
 									<view class="date-item">
 										<label class="form-label">签署日期</label>
 										<!-- 详情模式下禁用日期选择器 -->
-										<picker mode="date" :value="form.promiseDate" @change="handlePromiseDateChange" :disabled="isDetailMode">
+										<picker mode="date" :value="form.promiseDate" @change="handlePromiseDateChange"
+											:disabled="isDetailMode">
 											<view class="picker-input">
 												{{ form.promiseDate || '请选择签署日期' }}
 											</view>
@@ -287,7 +300,7 @@
 							<uni-icons type="folder" size="16"></uni-icons> 保存
 						</button>
 						<button type="primary" @click="submitForm(1)" class="submit-btn submit-primary"
-							v-if="form.status == 0">
+							v-if="form.status == 0 || form.processInstanceId == ''">
 							<uni-icons type="checkmark" size="16"></uni-icons> 提交申请
 						</button>
 						<button type="default" @click="resetForm" class="reset-btn" v-if="!currentId">
@@ -410,7 +423,8 @@
 	} from "@/utils/checkPic.js";
 	import uploadFile from "@/plugins/upload.js";
 	import {
-		getAffixItems, deleteAffix
+		getAffixItems,
+		deleteAffix
 	} from "@/api/affix.js";
 	export default {
 		name: 'OutsideAccommodationApply',
@@ -502,6 +516,7 @@
 				// 文件上传相关
 				affixFiles: [],
 				parentSignFiles: "",
+				reasonFileList: [],
 				// 页面状态
 				currentId: null,
 				loading: false,
@@ -514,7 +529,7 @@
 		onLoad(options) {
 			// 新增：判断是否为详情模式（核心逻辑）
 			this.isDetailMode = options.type === 'detail';
-			
+
 			// 1. 初始化省市区数据
 			this.initAreaData();
 			// 2. 初始化页面高度
@@ -917,8 +932,9 @@
 
 									if (!isDuplicate) {
 										this.affixFiles.push(fileInfo);
+										this.reasonFileList.push(fileInfo)
 									}
-									console.log(this.affixFiles);
+									// console.log(this.affixFiles);
 									uni.showToast({
 										title: `文件 ${file.name} 上传成功`,
 										icon: 'success',
@@ -957,7 +973,7 @@
 				const deletedFile = this.affixFiles[index];
 				this.affixFiles.splice(index, 1);
 				// this.form.affixId = this.affixFiles.length ? 'uploaded' : '';
-				let fileId = deletedFile.id ||  deletedFile.fileId
+				let fileId = deletedFile.id || deletedFile.fileId
 				deleteAffix(fileId).then(() => {
 					deleteOutsideAccommodationAttachmentNameAndStuName({
 						attachmentName: deletedFile.trueName || deletedFile.attachmentName,
@@ -974,7 +990,7 @@
 						});
 					});
 				})
-				
+
 			},
 			// 家长附件上传
 			handleUpload() {
@@ -1026,9 +1042,9 @@
 					// 		url: this.baseUrl + this.form.parentSignAttachment
 					// 	}];
 					// }
-					
-					this.getAffixs(this.form.affixId)
 
+					this.getAffixs(this.form.affixId)
+					this.setFormScroll()
 					this.loading = false;
 				}).catch(() => {
 					this.loading = false;
@@ -1038,6 +1054,16 @@
 					});
 				});
 			},
+			// 计算表单内容顶部外边距
+			setFormScroll() {
+				// 获取搜索框元素高度
+				let tabs = document.getElementById("tabs")
+				// 获取列表内容元素
+				let formScroll = document.getElementById("form-scroll")
+				// 设置列表内容的顶部外边距，让内容不被搜索框遮挡
+				formScroll.style.marginTop = `${tabs.offsetHeight}px`
+				console.log(formScroll.style.marginTop);
+			},
 			getUser() {
 				this.loading = true;
 				getUserProfile().then((response) => {
@@ -1045,7 +1071,7 @@
 					if (response.data) {
 						this.form.studentName = response.data.nickName;
 						this.form.gender = response.data.sex || '';
-
+						this.setFormScroll()
 						getOwnInfo().then((res) => {
 							if (res.data) {
 								this.form.studentId = res.data.stuId;
@@ -1143,11 +1169,11 @@
 			},
 			// 获取上传的附件数据
 			getAffixs(affix) {
-					getAffixItems({
-						affixId: affix
-					}).then(file => {
-						this.affixFiles = file.data;
-					})
+				getAffixItems({
+					affixId: affix
+				}).then(file => {
+					this.affixFiles = file.data;
+				})
 			},
 			submitForm(status) {
 				// 定义英文字段名和中文提示的映射关系
@@ -1189,6 +1215,36 @@
 					return;
 				}
 
+				// 定义手机号正则表达式（11位数字，以1开头）
+				const phoneReg = /^1[3-9]\d{9}$/;
+
+				// 校验学生手机号码格式
+				if (!phoneReg.test(this.form.studentPhone)) {
+					uni.showToast({
+						title: '请填写正确的手机号码',
+						icon: 'none'
+					});
+					return;
+				}
+
+				// 校验家长手机号码
+				if (!phoneReg.test(this.form.parentPhone)) {
+					uni.showToast({
+						title: '请填写正确的家长手机号码',
+						icon: 'none'
+					});
+					return;
+				}
+
+				// 校验紧急联系人电话
+				if (!phoneReg.test(this.form.emergencyPhone)) {
+					uni.showToast({
+						title: '请填写正确的紧急联系电话',
+						icon: 'none'
+					});
+					return;
+				}
+
 				if (!this.form.studentSignature) {
 					uni.showToast({
 						title: '请完成电子签名',
@@ -1245,11 +1301,11 @@
 					addOutsideAccommodationApply(submitForm);
 
 				requestPromise.then((response) => {
-					if (this.affixFiles.length > 0) {
-						this.affixFiles.forEach(item => {
+					if (this.reasonFileList.length > 0) {
+						this.reasonFileList.forEach(item => {
 							item.applyId = this.form.id || response.data.id;
 						});
-						batchAddOutsideAccommodationAttachment(this.affixFiles);
+						batchAddOutsideAccommodationAttachment(this.reasonFileList);
 					}
 
 					uni.showToast({
@@ -1378,6 +1434,10 @@
 		width: 100%;
 		background-color: #fff;
 		border-bottom: 1px solid #e8eaec;
+		position: fixed;
+		left: 0;
+		right: 0;
+		z-index: 100;
 	}
 
 	.tabs-header {
@@ -1597,7 +1657,7 @@
 	.area-picker:active {
 		border-color: #409EFF;
 	}
-	
+
 	/* 新增：禁用状态样式（可选） */
 	.area-picker.disabled {
 		opacity: 0.7;
diff --git a/pages/dormitory/outsideAccommodation/index.vue b/pages/dormitory/outsideAccommodation/index.vue
index 5b17360..bc125fb 100644
--- a/pages/dormitory/outsideAccommodation/index.vue
+++ b/pages/dormitory/outsideAccommodation/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<view class="app-container">
+	<view>
 		<!-- 搜索区（仅非学生角色显示） -->
-		<view class="fixed-search-wrap" v-if="roleGroup != '学生'">
+		<view class="fixed-search-wrap" id="search" v-if="roleGroup != '学生'">
 			<view class="search-content">
 				<view class="search-card">
 					<!-- 姓名搜索输入框 -->
@@ -44,151 +44,153 @@
 				</view>
 			</view>
 		</view>
-
-		<!-- 数据列表滚动容器 -->
-		<scroll-view class="list-container" scroll-y @scrolltolower="handleLoadMore" lower-threshold="50" enhanced
-			:show-scrollbar="false">
-			<!-- 初始加载状态 -->
-			<uni-load-more :status="loading ? 'loading' : 'done'" v-if="loading" class="loading-wrap"></uni-load-more>
-
-			<!-- 空数据状态 -->
-			<view class="empty-state" v-if="!loading && !hasData">
-				<uni-icons type="empty" size="80" color="#c0c4cc"></uni-icons>
-				<text class="empty-text">暂无外宿申请数据</text>
-				<text class="empty-tip" v-if="roleGroup.includes('学生')">点击右下角"+号"按钮提交新申请</text>
-			</view>
-
-			<!-- 数据列表 -->
-			<view class="card-list" v-if="!loading && hasData">
-				<view class="apply-card" v-for="(item, index) in validDataList" :key="index" hover-class="card-hover"
-					:hover-stop-propagation="true">
-					<!-- 卡片头部 -->
-					<view class="card-header">
-						<view class="apply-no">
-							<text class="label-text">申请编号：</text>
-							<text class="no-text">{{ getSafeValue(item, 'applyNo', '无') }}</text>
-						</view>
-						<view class="status-wrap">
-							<view class="status-label" :class="getStatusClass(item)">
-								{{ getStatusText(item) }}
+		<view class="app-container">
+			<!-- 数据列表滚动容器 -->
+			<scroll-view class="list-container" id="list-container" scroll-y @scrolltolower="handleLoadMore"
+				lower-threshold="50" enhanced :show-scrollbar="false">
+				<!-- 初始加载状态 -->
+				<uni-load-more :status="loading ? 'loading' : 'done'" v-if="loading" class="loading-wrap"></uni-load-more>
+			
+				<!-- 空数据状态 -->
+				<view class="empty-state" v-if="!loading && !hasData">
+					<uni-icons type="empty" size="80" color="#c0c4cc"></uni-icons>
+					<text class="empty-text">暂无外宿申请数据</text>
+					<text class="empty-tip" v-if="roleGroup.includes('学生')">点击右下角"+号"按钮提交新申请</text>
+				</view>
+			
+				<!-- 数据列表 -->
+				<view class="card-list" v-if="!loading && hasData">
+					<view class="apply-card" v-for="(item, index) in validDataList" :key="index" hover-class="card-hover"
+						:hover-stop-propagation="true">
+						<!-- 卡片头部 -->
+						<view class="card-header">
+							<view class="apply-no">
+								<text class="label-text">申请编号：</text>
+								<text class="no-text">{{ getSafeValue(item, 'applyNo', '无') }}</text>
 							</view>
-							<view class="valid-label"
-								:class="getSafeValue(item, 'isValid') == 1 ? 'valid-success' : 'valid-info'">
-								{{ getSafeValue(item, 'isValid') == 1 ? '有效' : '到期' }}
+							<view class="status-wrap">
+								<view class="status-label" :class="getStatusClass(item)">
+									{{ getStatusText(item) }}
+								</view>
+								<view class="valid-label"
+									:class="getSafeValue(item, 'isValid') == 1 ? 'valid-success' : 'valid-info'">
+									{{ getSafeValue(item, 'isValid') == 1 ? '有效' : '到期' }}
+								</view>
 							</view>
 						</view>
-					</view>
-
-					<!-- 卡片主体折叠面板 -->
-					<uni-collapse accordion v-model="item.activeCollapse">
-						<uni-collapse-item title="基本信息" name="basic" class="collapse-item">
-							<view class="info-grid">
-								<view class="info-item"><text class="label">学号：</text><text
-										class="value">{{ getSafeValue(item, 'studentNo', '-') }}</text></view>
-								<view class="info-item"><text class="label">姓名：</text><text
-										class="value">{{ getSafeValue(item, 'studentName', '-') }}</text></view>
-								<view class="info-item"><text class="label">性别：</text><text
-										class="value">{{ getSafeValue(item, 'gender') == 1 ? '男' : getSafeValue(item, 'gender') == 0 ? '女' : '-' }}</text>
+			
+						<!-- 卡片主体折叠面板 -->
+						<uni-collapse accordion v-model="item.activeCollapse">
+							<uni-collapse-item title="基本信息" name="basic" class="collapse-item">
+								<view class="info-grid">
+									<view class="info-item"><text class="label">学号：</text><text
+											class="value">{{ getSafeValue(item, 'studentNo', '-') }}</text></view>
+									<view class="info-item"><text class="label">姓名：</text><text
+											class="value">{{ getSafeValue(item, 'studentName', '-') }}</text></view>
+									<view class="info-item"><text class="label">性别：</text><text
+											class="value">{{ getSafeValue(item, 'gender') == 1 ? '男' : getSafeValue(item, 'gender') == 0 ? '女' : '-' }}</text>
+									</view>
+									<view class="info-item"><text class="label">出生年月：</text><text
+											class="value">{{ parseTime(getSafeValue(item, 'birthDate')) || '-' }}</text>
+									</view>
+									<view class="info-item"><text class="label">学院：</text><text
+											class="value">{{ getSafeValue(item, 'deptName', '-') }}</text></view>
+									<view class="info-item"><text class="label">专业：</text><text
+											class="value">{{ getSafeValue(item, 'majorName', '-') }}</text></view>
+									<view class="info-item"><text class="label">班级：</text><text
+											class="value">{{ getSafeValue(item, 'className', '-') }}</text></view>
+									<view class="info-item"><text class="label">辅导员：</text><text
+											class="value">{{ getSafeValue(item, 'teacherName', '-') }}</text></view>
+									<view class="info-item"><text class="label">原宿舍号：</text><text
+											class="value">{{ getSafeValue(item, 'originalDormitory', '-') }}</text></view>
+									<view class="info-item">
+										<text class="label">住宿费状态：</text>
+										<text class="value">
+											<view class="fee-label"
+												:class="getSafeValue(item, 'accommodationFeeStatus') === 1 ? 'fee-success' : 'fee-info'">
+												{{ getSafeValue(item, 'accommodationFeeStatus') === 1 ? '已交' : '未交' }}
+											</view>
+										</text>
+									</view>
+									<view class="info-item"><text class="label">宿费交纳：</text><text
+											class="value">{{ getSafeValue(item, 'accommodationFee', '-') }}</text></view>
 								</view>
-								<view class="info-item"><text class="label">出生年月：</text><text
-										class="value">{{ parseTime(getSafeValue(item, 'birthDate')) || '-' }}</text>
+							</uni-collapse-item>
+			
+							<uni-collapse-item title="外宿信息" name="outside" class="collapse-item">
+								<view class="info-form">
+									<view class="form-item"><text class="label">外宿原因：</text><text
+											class="value">{{ getSafeValue(item, 'applyReason', '-') }}</text></view>
+									<view class="form-item"><text class="label">外宿地址：</text><text
+											class="value">{{ (getSafeValue(item, 'address', '') + ' ' + getSafeValue(item, 'outsideAddress', '')) || '-' }}</text>
+									</view>
+									<view class="form-item">
+										<text class="label">外宿时间：</text>
+										<text class="value">{{ parseTime(getSafeValue(item, 'startDate')) || '-' }}
+											<text class="split-text">至</text>
+											{{ parseTime(getSafeValue(item, 'endDate')) || '-' }}
+										</text>
+									</view>
+									<view class="form-item"><text class="label">紧急联系人：</text><text
+											class="value">{{ getSafeValue(item, 'emergencyContact', '-') }}
+											({{ getSafeValue(item, 'emergencyPhone', '-') }})</text></view>
+									<view class="form-item"><text class="label">家长意见：</text><text
+											class="value">{{ getSafeValue(item, 'parentOpinion') == 1 ? '同意' : getSafeValue(item, 'parentOpinion') == 0 ? '不同意' : '-' }}</text>
+									</view>
+									<view class="form-item"><text class="label">家长联系方式：</text><text
+											class="value">{{ getSafeValue(item, 'parentPhone', '-') }}</text></view>
 								</view>
-								<view class="info-item"><text class="label">学院：</text><text
-										class="value">{{ getSafeValue(item, 'deptName', '-') }}</text></view>
-								<view class="info-item"><text class="label">专业：</text><text
-										class="value">{{ getSafeValue(item, 'majorName', '-') }}</text></view>
-								<view class="info-item"><text class="label">班级：</text><text
-										class="value">{{ getSafeValue(item, 'className', '-') }}</text></view>
-								<view class="info-item"><text class="label">辅导员：</text><text
-										class="value">{{ getSafeValue(item, 'teacherName', '-') }}</text></view>
-								<view class="info-item"><text class="label">原宿舍号：</text><text
-										class="value">{{ getSafeValue(item, 'originalDormitory', '-') }}</text></view>
-								<view class="info-item">
-									<text class="label">住宿费状态：</text>
-									<text class="value">
-										<view class="fee-label"
-											:class="getSafeValue(item, 'accommodationFeeStatus') === 1 ? 'fee-success' : 'fee-info'">
-											{{ getSafeValue(item, 'accommodationFeeStatus') === 1 ? '已交' : '未交' }}
-										</view>
-									</text>
+							</uni-collapse-item>
+			
+							<uni-collapse-item title="审批记录" name="approval" class="collapse-item">
+								<view class="approval-list"
+									v-if="getSafeValue(item, 'outsideAccommodationApprovals', []).length > 0">
+									<view class="approval-item"
+										v-for="(approval, idx) in getSafeValue(item, 'outsideAccommodationApprovals', [])"
+										:key="idx">
+										<text
+											class="approval-node">{{ getSafeValue(approval, 'approvalNode', '未知节点') }}：</text>
+										<text class="approval-result"
+											:class="getSafeValue(approval, 'approvalResult') == 1 ? 'result-pass' : 'result-reject'">
+											{{ getSafeValue(approval, 'approvalResult') == 1 ? '通过' : '驳回' }}
+										</text>
+										<text class="approval-time"
+											v-if="getSafeValue(approval, 'approvalTime')">{{ parseTime(getSafeValue(approval, 'approvalTime')) }}</text>
+										<text class="approval-remark"
+											v-if="getSafeValue(approval, 'approvalRemark')">备注：{{ getSafeValue(approval, 'approvalRemark') }}</text>
+									</view>
 								</view>
-								<view class="info-item"><text class="label">宿费交纳：</text><text
-										class="value">{{ getSafeValue(item, 'accommodationFee', '-') }}</text></view>
+								<view class="empty-approval" v-else>暂无审批记录</view>
+							</uni-collapse-item>
+						</uni-collapse>
+			
+						<!-- 卡片操作区 -->
+						<view class="card-actions">
+							<view>
+								<uni-button type="text" size="mini" @click="detail(item, '修改')"
+									v-if="item.status == 0 || getRejectInfo(item.outsideAccommodationApprovals).isReject">
+									<uni-icons type="eye-filled" size="14" class="mr-5"></uni-icons>修改
+								</uni-button>
 							</view>
-						</uni-collapse-item>
-
-						<uni-collapse-item title="外宿信息" name="outside" class="collapse-item">
-							<view class="info-form">
-								<view class="form-item"><text class="label">外宿原因：</text><text
-										class="value">{{ getSafeValue(item, 'applyReason', '-') }}</text></view>
-								<view class="form-item"><text class="label">外宿地址：</text><text
-										class="value">{{ (getSafeValue(item, 'address', '') + ' ' + getSafeValue(item, 'outsideAddress', '')) || '-' }}</text>
-								</view>
-								<view class="form-item">
-									<text class="label">外宿时间：</text>
-									<text class="value">{{ parseTime(getSafeValue(item, 'startDate')) || '-' }}
-										<text class="split-text">至</text>
-										{{ parseTime(getSafeValue(item, 'endDate')) || '-' }}
-									</text>
-								</view>
-								<view class="form-item"><text class="label">紧急联系人：</text><text
-										class="value">{{ getSafeValue(item, 'emergencyContact', '-') }}
-										({{ getSafeValue(item, 'emergencyPhone', '-') }})</text></view>
-								<view class="form-item"><text class="label">家长意见：</text><text
-										class="value">{{ getSafeValue(item, 'parentOpinion') == 1 ? '同意' : getSafeValue(item, 'parentOpinion') == 0 ? '不同意' : '-' }}</text>
-								</view>
-								<view class="form-item"><text class="label">家长联系方式：</text><text
-										class="value">{{ getSafeValue(item, 'parentPhone', '-') }}</text></view>
+							<view>
+								<uni-button type="text" size="mini" @click="detail(item, '详情')" class="detail-btn"
+									:disabled="!getSafeValue(item, 'id')">
+									<uni-icons type="info" size="14" class="mr-5"></uni-icons>查看详情
+								</uni-button>
 							</view>
-						</uni-collapse-item>
-
-						<uni-collapse-item title="审批记录" name="approval" class="collapse-item">
-							<view class="approval-list"
-								v-if="getSafeValue(item, 'outsideAccommodationApprovals', []).length > 0">
-								<view class="approval-item"
-									v-for="(approval, idx) in getSafeValue(item, 'outsideAccommodationApprovals', [])"
-									:key="idx">
-									<text
-										class="approval-node">{{ getSafeValue(approval, 'approvalNode', '未知节点') }}：</text>
-									<text class="approval-result"
-										:class="getSafeValue(approval, 'approvalResult') == 1 ? 'result-pass' : 'result-reject'">
-										{{ getSafeValue(approval, 'approvalResult') == 1 ? '通过' : '驳回' }}
-									</text>
-									<text class="approval-time"
-										v-if="getSafeValue(approval, 'approvalTime')">{{ parseTime(getSafeValue(approval, 'approvalTime')) }}</text>
-									<text class="approval-remark"
-										v-if="getSafeValue(approval, 'approvalRemark')">备注：{{ getSafeValue(approval, 'approvalRemark') }}</text>
-								</view>
-							</view>
-							<view class="empty-approval" v-else>暂无审批记录</view>
-						</uni-collapse-item>
-					</uni-collapse>
-
-					<!-- 卡片操作区 -->
-					<view class="card-actions">
-						<view>
-							<uni-button type="text" size="mini" @click="detail(item, '修改')" v-if="item.status == 0 || getRejectInfo(item.outsideAccommodationApprovals).isReject">
-								<uni-icons type="eye-filled" size="14" class="mr-5"></uni-icons>修改
-							</uni-button>
-						</view>
-						<view>
-							<uni-button type="text" size="mini" @click="detail(item, '详情')" class="detail-btn"
-								:disabled="!getSafeValue(item, 'id')">
-								<uni-icons type="info" size="14" class="mr-5"></uni-icons>查看详情
-							</uni-button>
 						</view>
 					</view>
 				</view>
-			</view>
-
-			<!-- 加载更多状态 -->
-			<view class="load-more-wrap" v-if="hasData">
-				<uni-load-more :status="loadingMore ? 'loading' : (hasMore ? 'more' : 'nomore')"
-					:content-text="loadMoreText"></uni-load-more>
-			</view>
-		</scroll-view>
+			
+				<!-- 加载更多状态 -->
+				<view class="load-more-wrap" v-if="hasData">
+					<uni-load-more :status="loadingMore ? 'loading' : (hasMore ? 'more' : 'nomore')"
+						:content-text="loadMoreText"></uni-load-more>
+				</view>
+			</scroll-view>
+		</view>
 		<!-- 添加外宿申请按钮 -->
-		<view class="add" @click="addOutsideAccommodation">+</view>
+		<view class="add" @click="addOutsideAccommodation" v-if="roleGroup == '学生'">+</view>
 	</view>
 </template>
 
@@ -379,21 +381,32 @@
 					});
 				});
 			},
-
+			// 计算列表内容顶部外边距
+			setList() {
+				// 获取搜索框元素高度
+				let search = document.getElementById("search")
+				// 获取列表内容元素
+				let listContainer = document.getElementById("list-container")
+				// 设置列表内容的顶部外边距，让内容不被搜索框遮挡
+				listContainer.style.marginTop = `${search.offsetHeight}px`
+			},
 			/** 获取用户信息 */
 			getUser() {
 				getUserProfile().then(response => {
 					const res = response || {};
 					this.user = res.data || {};
 					this.roleGroup = res.roleGroup || '';
-
 					// 填充查询条件
 					if (this.roleGroup.includes("学生")) {
-						this.queryParams.studentName = this.user.nickName || '';
+						this.queryParams.studentName = this.user.nickName || '';		
 					} else if (this.roleGroup.includes("辅导员")) {
 						this.queryParams.teacherName = this.user.nickName || '';
+						this.setList()
 					} else if (this.roleGroup.includes("二级学院")) {
 						this.queryParams.deptName = this.user.dept?.deptName || '';
+						this.setList()
+					} else {
+						this.setList()
 					}
 
 					this.getList(true);
@@ -506,6 +519,8 @@
 		padding: 20rpx;
 		background-color: #f5f7fa;
 		min-height: 100vh;
+		width: 100%;
+		box-sizing: border-box;
 	}
 
 	.mr-5 {
@@ -517,7 +532,9 @@
 		z-index: 90;
 		background-color: #fff;
 		border-bottom: 1px solid #eee;
-		margin-bottom: 15rpx;
+		position: fixed;
+		left: 0;
+		right: 0;
 	}
 
 	.search-content {
@@ -616,7 +633,7 @@
 	/* 列表滚动容器 */
 	.list-container {
 		width: 100%;
-		height: calc(100vh - 380rpx);
+		height: calc(100vh - 100rpx);
 		overflow-y: auto;
 		-webkit-overflow-scrolling: touch;
 	}
@@ -794,7 +811,8 @@
 	}
 
 	.info-grid .info-item {
-		width: calc(50% - 10rpx);
+		/* width: calc(50% - 10rpx); */
+		width: 100%;
 		display: flex;
 		align-items: center;
 		font-size: 26rpx;
@@ -913,7 +931,7 @@
 	}
 
 	/* 适配小屏幕 */
-	@media (max-width: 750rpx) {
+	@media (max-width: 650rpx) {
 		.info-grid .info-item {
 			width: 100%;
 		}
@@ -929,7 +947,7 @@
 		}
 
 		.list-container {
-			height: calc(100vh - 420rpx);
+			/* height: calc(100vh - 420rpx); */
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/static/images/workbench/outsideAccommodation.png b/static/images/workbench/outsideAccommodation.png
index 00417e48e2dddf4df5741925623cec8bfc0fffaf..92ba458fd39db94e7eb0e2586b5f9e7357b94259 100644
GIT binary patch
literal 3001
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

literal 2995
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