From 9dc0d681e17d735ff42195a29e6905f4ee9f01da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 六月 2025 09:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 wx/pages/employee_management/employee_management.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wx/pages/employee_management/employee_management.vue b/wx/pages/employee_management/employee_management.vue
index e9faa24..bc5c69c 100644
--- a/wx/pages/employee_management/employee_management.vue
+++ b/wx/pages/employee_management/employee_management.vue
@@ -11,7 +11,7 @@
 				<view class="status info" v-if="item.solutionsStatus === 2">涓嶅湪淇�</view>
 				<view class="top">
 					<view class="top_mc">
-						<text>{{item.name}}</text>
+						<text>{{item.memberName}}</text>
 						<text>{{sex === 1 ? '濂�' : '鐢�'}}锝渰{item.age}}宀�</text>
 					</view>
 					<view class="top_card">韬唤璇佸彿锛歿{item.idcardNo}}</view> 
@@ -28,7 +28,7 @@
 					</view>
 					<view class="bottom_item">
 						<view class="bottom_item_label">淇濋櫓鐢熸晥鏈燂細</view>
-						<view class="bottom_item_val">2024.01.01-2024.05.30</view>
+						<view class="bottom_item_val">{{item.startTime}}</view>
 					</view>
 				</view>
 			</view>
@@ -75,7 +75,7 @@
 					capacity: 10,
 					page: this.page,
 					model: {
-						keywords: this.keyword
+						memberName: this.keyword
 					}
 				}).then(res => {
 					if (res.code === 200) {

--
Gitblit v1.9.3