From 9e290efc330e70d931b7108ee70afc77cf3252a0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 六月 2025 10:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
wx/pages/employee_management/employee_management.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/wx/pages/employee_management/employee_management.vue b/wx/pages/employee_management/employee_management.vue
index b78c0e5..bc5c69c 100644
--- a/wx/pages/employee_management/employee_management.vue
+++ b/wx/pages/employee_management/employee_management.vue
@@ -11,11 +11,10 @@
<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>
- <view class="top_card">澶囨敞 锛歿{item.remark}}</view>
+ <view class="top_card">韬唤璇佸彿锛歿{item.idcardNo}}</view>
</view>
<view class="center"></view>
<view class="bottom">
@@ -29,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>
@@ -76,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