From f7a3d41075e00498f7033475108c0bcd86cda733 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 01 七月 2025 14:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
wx/pages/employee_management/employee_management.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/wx/pages/employee_management/employee_management.vue b/wx/pages/employee_management/employee_management.vue
index e9faa24..9b5a408 100644
--- a/wx/pages/employee_management/employee_management.vue
+++ b/wx/pages/employee_management/employee_management.vue
@@ -6,18 +6,22 @@
</view>
</u-sticky>
<view class="box_list" v-if="list.length > 0">
- <view class="box_list_item" v-for="(item, index) in list" :key="index" @click="jump(item.id)">
- <view class="status green" v-if="item.solutionsStatus === 1">淇濋殰涓�</view>
- <view class="status info" v-if="item.solutionsStatus === 2">涓嶅湪淇�</view>
+ <view class="box_list_item" v-for="(item, index) in list" :key="index">
+ <view class="status green" v-if="item.status === 0">涓嶅湪淇�</view>
+ <view class="status info" v-if="item.status === 1">淇濋殰涓�</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>
<view class="center"></view>
<view class="bottom">
+ <view class="bottom_item">
+ <view class="bottom_item_label">淇濋櫓鏂规锛�</view>
+ <view class="bottom_item_val">{{item.solutionName}}</view>
+ </view>
<view class="bottom_item">
<view class="bottom_item_label">娲鹃仯鍗曚綅锛�</view>
<view class="bottom_item_val">{{item.duName}}</view>
@@ -28,7 +32,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 +79,7 @@
capacity: 10,
page: this.page,
model: {
- keywords: this.keyword
+ memberName: this.keyword
}
}).then(res => {
if (res.code === 200) {
--
Gitblit v1.9.3