From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingSel.vue | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/h5/pages/staff/meetingSel.vue b/h5/pages/staff/meetingSel.vue
index a5b2594..cac37aa 100644
--- a/h5/pages/staff/meetingSel.vue
+++ b/h5/pages/staff/meetingSel.vue
@@ -2,27 +2,28 @@
<view class="main_app" :class="{ popupShow: isShowSelMem }">
<view class="search_inp df_ac">
<image class="mr12 search" src="../../static/ic_search@2x.png" mode="widthFix"></image>
- <input v-model="param.keyword" @blur="initData()" type="text" placeholder="鎼滅储"
+ <input v-model="param.queryParam" @confirm="initData()" type="text" placeholder="鎼滅储"
placeholder-style="color: #999999;" />
</view>
<view class="member_list">
<view v-for="(item, index) in memberList" :key="item.id" class="line">
- <image v-if="item.avatar" :src="item.prefixUrl + item.avatar" class="avatar" mode=""></image>
+ <image v-if="item.faceImg" :src="item.faceImg" class="avatar" mode=""></image>
<view v-else class="avatar">{{ item.realname.slice(0, 1) }}</view>
<view class="content">
<view class="info">
<text class="name">{{ item.realname }}</text>
<text class="tag" v-if="item.status == '1'">鏈変細璁�</text>
</view>
- <view class="depart">{{ item.departmentName }}</view>
+ <view class="depart">{{ item.departmentName || item.companyName }}</view>
</view>
<image @click="changeMem(item, index)" v-if="item.checked" src="@/static/checkbox_sel@2x.png" mode="widthFix"
class="checked"></image>
<image @click="changeMem(item, index)" v-if="!item.checked" src="@/static/meeting/icon/ic_choose@2x.png"
mode="widthFix" class="checked"></image>
<text></text>
- </view>
- <view v-if="memberList.length == 0" class="empty">
+ </view>
+ <view class="" style="height: 220rpx;"></view>
+ <view v-if="memberList.length == 0" class="empty_wrap">
<image src="@/static/empty.png" mode=""></image>
<text>鏆傛棤鏁版嵁</text>
</view>
@@ -80,7 +81,7 @@
},
pagination: {
page: 1,
- capacity: 20
+ capacity: 40
},
isShowSelMem: false
@@ -89,7 +90,7 @@
onLoad(option) {
this.param = {
limitNum: option.limitNum,
- keyword: '',
+ queryParam: '',
startTime: dayjs(Number(option.startTime)).format('YYYY-MM-DD HH:mm:ss'),
endTime: dayjs(Number(option.endTime)).format('YYYY-MM-DD HH:mm:ss'),
}
@@ -109,7 +110,7 @@
this.$nextTick(() => {
this.$forceUpdate()
})
- }, 1000)
+ }, 500)
})
},
methods: {
@@ -148,13 +149,11 @@
pagination
} = this
userPagePost({
- model: {
- ...param
- },
- ...pagination,
+ ...param,
+ querySpecial: 1, type: 2, companyType: 1,workStatus:0
}).then(res => {
- this.memberList = res.data.records || []
+ this.memberList = res.data || []
this.memberList.forEach(i => {
const index = this.selList.findIndex(ite => ite.id === i.id)
i.checked = index > -1
@@ -269,7 +268,7 @@
left: 0;
width: 100%;
box-shadow: 0rpx 0rpx 6rpx 0rpx #b2b2b2;
- padding: 30rpx 30rpx 64rpx;
+ padding: 30rpx 30rpx 42rpx;
.sel_mem {
display: flex;
@@ -302,13 +301,16 @@
}
}
- .member_list {
+ .member_list {
+ height: calc( 100vh - 130rpx );
+ overflow: auto;
+ margin-top: 10rpx;
.line {
display: flex;
align-items: center;
border-bottom: 1rpx solid #e5e5e5;
padding: 30rpx 0;
-
+
.avatar {
width: 64rpx;
height: 64rpx;
--
Gitblit v1.9.3