|
@@ -40,10 +40,13 @@
|
40
|
40
|
<div class="flex" style="flex:1">
|
41
|
41
|
<img class="memberImg" :src="item1.avatar" alt="">
|
42
|
42
|
<div class="memberInfo">
|
43
|
|
- <div class="name">{{item1.name}}</div>
|
|
43
|
+ <div class="name">
|
|
44
|
+ {{item1.name}}
|
|
45
|
+ <span :class="['status-tag', item1.is_active == 0 ? 'disabled' : '']">{{ item1.is_active == 1 ? '已激活' : '未激活' }}</span>
|
|
46
|
+ </div>
|
44
|
47
|
<div class="other">部门:{{ item1.corp_name }}</div>
|
45
|
|
- <div v-if="item1.active_desc" class="other">
|
46
|
|
- <span>状态:{{ item1.active_desc }}</span>
|
|
48
|
+ <div v-if="item1.active_desc === '即将过期'" class="other">
|
|
49
|
+ <span>{{ item1.active_desc }}</span>
|
47
|
50
|
<span v-if="item1.expire_time">({{ item1.expire_time.slice(0, 10) }})</span>
|
48
|
51
|
</div>
|
49
|
52
|
</div>
|
|
@@ -77,10 +80,13 @@
|
77
|
80
|
<div class="flex" style="flex:1">
|
78
|
81
|
<img class="memberImg" :src="item.avatar" alt="">
|
79
|
82
|
<div class="memberInfo">
|
80
|
|
- <div class="name">{{item.user_name}}</div>
|
|
83
|
+ <div class="name">
|
|
84
|
+ {{item.user_name}}
|
|
85
|
+ <span :class="['status-tag', item.is_active == 0 ? 'disabled' : '']">{{ item.is_active == 1 ? '已激活' : '未激活' }}</span>
|
|
86
|
+ </div>
|
81
|
87
|
<div class="other">部门:{{item.corp_name}}</div>
|
82
|
|
- <div v-if="item.active_desc" class="other">
|
83
|
|
- <span>状态:{{ item.active_desc }}</span>
|
|
88
|
+ <div v-if="item.active_desc === '即将过期'" class="other">
|
|
89
|
+ <span>{{ item.active_desc }}</span>
|
84
|
90
|
<span v-if="item.expire_time">({{ item.expire_time.slice(0, 10) }})</span>
|
85
|
91
|
</div>
|
86
|
92
|
</div>
|
|
@@ -167,7 +173,6 @@ export default {
|
167
|
173
|
let res = []
|
168
|
174
|
if (this.selectUser && this.selectUser.length) {
|
169
|
175
|
this.selectUser.forEach(currentUser => {
|
170
|
|
- console.log('currentUser => ', currentUser)
|
171
|
176
|
const userInfo = {
|
172
|
177
|
user_id: currentUser.user_id,
|
173
|
178
|
user_name: currentUser.name,
|
|
@@ -176,6 +181,7 @@ export default {
|
176
|
181
|
corpid: currentUser.corpid,
|
177
|
182
|
active_desc: currentUser.active_desc,
|
178
|
183
|
expire_time: currentUser.expire_time,
|
|
184
|
+ is_active: currentUser.is_active,
|
179
|
185
|
}
|
180
|
186
|
if (res && !res.length) { // 构造第一条数据 => 插入res中
|
181
|
187
|
res.push({
|
|
@@ -448,7 +454,7 @@ export default {
|
448
|
454
|
</script>
|
449
|
455
|
<style lang="scss" scoped>
|
450
|
456
|
.propoverItem {
|
451
|
|
- width: 310px;
|
|
457
|
+ width: 330px;
|
452
|
458
|
flex: 1;
|
453
|
459
|
height: 100%;
|
454
|
460
|
.allMember {
|
|
@@ -576,6 +582,16 @@ export default {
|
576
|
582
|
color: #333333;
|
577
|
583
|
font-size: 13px;
|
578
|
584
|
line-height: 18px;
|
|
585
|
+ .status-tag {
|
|
586
|
+ background-color: #00B38A;
|
|
587
|
+ color: #fff;
|
|
588
|
+ border-radius: 4px;
|
|
589
|
+ font-size: 12px;
|
|
590
|
+ padding: 0 1px;
|
|
591
|
+ &.disabled {
|
|
592
|
+ background-color: #B3B2B2;
|
|
593
|
+ }
|
|
594
|
+ }
|
579
|
595
|
}
|
580
|
596
|
.other {
|
581
|
597
|
color: #898d92;
|