From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
h5/pages/staff/vehicle/applePeo.vue | 152 +++++++++++++++++++++++++++++++-------------------
1 files changed, 93 insertions(+), 59 deletions(-)
diff --git a/h5/pages/staff/vehicle/applePeo.vue b/h5/pages/staff/vehicle/applePeo.vue
index 2f62cce..52d13c5 100644
--- a/h5/pages/staff/vehicle/applePeo.vue
+++ b/h5/pages/staff/vehicle/applePeo.vue
@@ -15,30 +15,40 @@
/>
</view>
<view class="member_list">
- <checkbox-group v-model="selList" @change="changeMem">
- <view v-for="item in memberList" :key="item.id" class="line">
- <image
- :src="
- item.faceImgFull
- ? item.faceImgFull
- : require('@/static/logo@2x.png')
- "
- class="avatar"
- mode=""
- ></image>
- <view class="content">
- <view class="info">
- <text class="name">{{ item.name }}</text>
- <!-- <text class="tag">tag</text> -->
- </view>
- <view class="depart">{{ item.companyName }}</view>
+ <view v-for="(item, index) in memberList" :key="item.id" class="line">
+ <image
+ :src="
+ item.faceImgFull
+ ? item.faceImgFull
+ : require('@/static/logo@2x.png')
+ "
+ class="avatar"
+ mode=""
+ ></image>
+ <view class="content">
+ <view class="info">
+ <text class="name">{{ item.name }}</text>
+ <!-- <text class="tag">tag</text> -->
</view>
- <label>
- <checkbox :checked="item.checked" :value="String(item.id)" class="checkbox" />
- </label>
- <text></text>
+ <view class="depart">{{ item.companyName }}</view>
</view>
- </checkbox-group>
+ <image
+ @click="changeMem(item, index)"
+ v-if="item.checked"
+ src="@/static/meeting/icon/ic_choose_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 class="empty"></view>
</view>
<!-- -->
@@ -55,7 +65,7 @@
mode=""
></image>
</view>
- <view class="btn" @click="onSubmit">纭({{selList.length}}/20)</view>
+ <view class="btn" @click="onSubmit">纭({{ selList.length }}/20)</view>
</view>
<!-- -->
<u-popup
@@ -100,59 +110,80 @@
data() {
return {
memberList: [],
- selList: [],
param: {},
+ selList: [],
- isShowSelMem: false
+ isShowSelMem: false,
+ pagination: {
+ capacity: 20,
+ page: 1
+ },
}
},
onLoad() {
this.initData()
},
- methods: {
- onSubmit() {
- this.$eventBus.$emit('applePeo', this.selList)
- uni.navigateBack()
- },
- changeMem(e) {
- const arr = e.detail.value
- let arrTemp = arr.map(item => {
- let obj = {}
- this.memberList.forEach(ite => {
- if (item == ite.id) {
- obj.name = ite.name.split('-')[0]
- obj.componey = ite.name.split('-')[1] || ''
- obj.id = ite.id
+ onReachBottom() {
+ // if(){}
+ },
+ mounted() {
+ this.$eventBus.$on('applePeoDetail', (res) => {
+ res.forEach(item => {
+ this.memberList.forEach(mem => {
+ if (item.id === mem.id) {
+ mem.checked = !mem.checked
}
})
- return obj
})
- this.selList = arrTemp
- // this.$forceUpdate()
- },
- handleRemove(item) {
- const selIndex = this.selList.findIndex(i => i.id === item.id)
- this.selList.splice(selIndex, 1)
- this.memberList.forEach(ite => {
- if(item.id === ite.id){
- ite.checked = false
- }
+ this.selList = this.memberList.filter(i => i.checked)
+ this.$nextTick(() => {
+ this.$forceUpdate()
})
- // console.log(this.memberList);
- this.$forceUpdate()
- },
+ })
+ },
+ methods: {
initData() {
- const { param } = this
+ const { param, pagination } = this
findTypeMemberInfo({
+ // model: {
name: param.name,
- type: '2'
+ // },
+ type: '2',
+ ...pagination
}).then(res => {
this.memberList = res.data || []
this.memberList.forEach(i => {
i.checked = false
})
})
- }
+ },
+ onSubmit() {
+ if (this.selList.length === 0) return uni.showToast({
+ title: '璇峰厛閫夋嫨浜哄憳',
+ icon: 'none'
+ })
+ this.$eventBus.$emit('applePeo', this.selList)
+ uni.navigateBack()
+ },
+ changeMem(item, index) {
+ // this.memberList.forEach(mem => {
+ // if(item.id === mem.id){
+ // item.checked = !item.checked
+ // }
+ // })
+ item.checked = !item.checked
+ this.selList = this.memberList.filter(i => i.checked)
+ this.$forceUpdate()
+ },
+ handleRemove(item) {
+ this.memberList.forEach(ite => {
+ if (item.id === ite.id) {
+ ite.checked = false
+ }
+ })
+ // console.log(this.memberList);
+ this.$forceUpdate()
+ },
}
};
</script>
@@ -168,7 +199,7 @@
font-weight: 600;
}
.btn {
- color: #279baa;
+ color: $uni-color-primary;
}
}
.modal_mem_list {
@@ -225,7 +256,7 @@
align-items: center;
.members {
width: 500rpx;
- color: #4d98a7;
+ color: $uni-color-primary;
white-space: nowrap;
overflow: hidden; //鏂囨湰瓒呭嚭闅愯棌
text-overflow: ellipsis;
@@ -240,7 +271,7 @@
width: 690rpx;
height: 88rpx;
line-height: 88rpx;
- background: #279baa;
+ background: $uni-color-primary;
border-radius: 44rpx;
color: #fff;
text-align: center;
@@ -282,6 +313,9 @@
}
}
}
+ .checked {
+ width: 48rpx;
+ }
}
.empty {
width: 100%;
--
Gitblit v1.9.3