From cd324c6258f6659c6371062ccd12e3c96b13c42d Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Tue, 1 Jul 2025 18:08:04 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BC=98=E5=8C=96=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tree-view/TreeView.vue             |  4 ++--
 .../staffAttendance/staffAttendance.vue       | 22 +++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/components/tree-view/TreeView.vue b/components/tree-view/TreeView.vue
index c90dbd0e..f0c2886d 100644
--- a/components/tree-view/TreeView.vue
+++ b/components/tree-view/TreeView.vue
@@ -75,8 +75,8 @@
 <style scoped lang="scss">
 	/* 保持你的样式 */
 	.scroll-view {
-		margin: 20rpx 26rpx;
-		width: calc(100% - 26rpx - 26rpx);
+		// margin: 10rpx 26rpx;
+		width: calc(100%);
 		max-height: 60vh;
 		border-radius: 6rpx;
 		background-color: white;
diff --git a/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue b/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue
index 314bc3d8..da15e650 100644
--- a/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue
+++ b/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue
@@ -17,7 +17,7 @@
 				</view>
 			</view>
 			<u-dropdown :overlay="true" active-color="#3190F3">
-				<u-dropdown-item @change="onMenuChage" title="班组" v-model="searchInfo.teamId" :options="teamOptions">
+				<u-dropdown-item @change="onMenuChage" :title="searchInfo.teamId == '' ? '班组' : dataListUp(teamOptions, searchInfo.teamId)" v-model="searchInfo.teamId" :options="teamOptions">
 					<view class="slot-content">
 						<scroll-view scroll-y="true" class="scroll-view">
 							<view @click="onMenuClick(item, 1)" class="cell-box" v-for="item in teamOptions"
@@ -29,11 +29,11 @@
 						</scroll-view>
 					</view>
 				</u-dropdown-item>
-				<u-dropdown-item :disabled="optsDetail.enterDate == 1" @change="onMenuChage" title="进场日期"
+				<u-dropdown-item :title="searchInfo.enterDate == '' ? '进场日期' : dataListUp(enterDateList, searchInfo.enterDate)" :disabled="optsDetail.enterDate == 1" @change="onMenuChage"
 					v-model="searchInfo.enterDate" :options="enterDateList"></u-dropdown-item>
 				<u-dropdown-item @change="onMenuChage" v-model="searchInfo.inserviceType" :options="inserviceTypeList"
 					:title="inserviceTypeListUp"></u-dropdown-item>
-				<u-dropdown-item @change="onMenuChage" title="工种" v-model="searchInfo.workerTypeId"
+				<u-dropdown-item  @change="onMenuChage" :title="searchInfo.enterDate == '' ? '工种' : dataListUp(workerTypeList, searchInfo.workerTypeId)" v-model="searchInfo.workerTypeId"
 					:options="workerTypeList">
 					<view class="slot-content">
 						<scroll-view scroll-y="true" class="scroll-view">
@@ -405,6 +405,12 @@
 				const find = this.inserviceTypeList.find(item => item.value == this.searchInfo.inserviceType);
 				console.log(112233, find)
 				return find ? find.text : '--'
+			},
+			dataListUp() {
+				return (dataList, id) => {
+					const find = dataList.find(item => item.value == id);
+					return find ? find.text : '--'
+				}
 			}
 		}
 	}
@@ -412,11 +418,19 @@
 
 <style scoped lang="scss">
 	.scroll-view {
-		margin: 20rpx 26rpx;
+		margin: 10rpx 26rpx;
 		width: calc(100% - 26rpx - 26rpx);
 		max-height: 60vh;
 		border-radius: 6rpx;
 	}
+	
+	/deep/ .u-dropdown__menu__item__text {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		/* 限制为两行 */
+		overflow: hidden;
+	}
 
 	.cell-box {
 		display: flex;