From 97e1b9d6c8d7da0891aa7a1e00116b4b14e1b942 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 05 七月 2024 18:22:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/staff/vehicle/applePeo.vue |   52 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/h5/pages/staff/vehicle/applePeo.vue b/h5/pages/staff/vehicle/applePeo.vue
index a39eada..ec74350 100644
--- a/h5/pages/staff/vehicle/applePeo.vue
+++ b/h5/pages/staff/vehicle/applePeo.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="main_app">
+  <view class="main_app" :class="{ popupShow: isShowSelMem }">
     <view class="search_inp df_ac">
       <image
         class="mr12 search"
@@ -17,14 +17,12 @@
     <view class="member_list">
       <view v-for="(item, index) in memberList" :key="item.id" class="line">
         <image
-          :src="
-            item.faceImgFull
-              ? item.faceImgFull
-              : require('@/static/logo@2x.png')
-          "
+          v-if="item.faceImgFull"
+          :src="item.faceImgFull"
           class="avatar"
           mode=""
         ></image>
+        <view v-else class="avatar">{{ item.name.slice(0, 1) }}</view>
         <view class="content">
           <view class="info">
             <text class="name">{{ item.name }}</text>
@@ -65,19 +63,19 @@
           mode=""
         ></image>
       </view>
-      <view class="btn" @click="onSubmit">纭({{ selList.length }}/20)</view>
+      <view class="btn" @click="onSubmit">纭</view>
     </view>
     <!--  -->
     <u-popup
       :show="isShowSelMem"
       :round="12"
       mode="bottom"
-      @close="isShowSelMem = false"
+      @close="closeModal"
     >
       <view class="modal">
         <view class="modal_header">
           <text class="status">宸查�夋嫨锛歿{ selList.length }}浜�</text>
-          <text class="btn" @click="isShowSelMem = false">纭</text>
+          <text class="btn" @click="subSelMem">纭</text>
         </view>
         <view class="modal_mem_list">
           <view class="line" v-for="(item, i) in selList" :key="i">
@@ -96,7 +94,7 @@
               </view>
               <view class="depart">{{ item.componey }}</view>
             </view>
-            <view class="btn" @click="handleRemove(item)">绉婚櫎</view>
+            <view class="btn" @click="handleRemove(i)">绉婚櫎</view>
           </view>
         </view>
       </view>
@@ -143,13 +141,13 @@
   },
   methods: {
     initData() {
-      const { param, pagination } = this
+      const { param } = this
       findTypeMemberInfo({
         // model: {
         name: param.name,
         // },
         type: '2',
-        ...pagination
+        companyType: 1,
       }).then(res => {
         this.memberList = res.data || []
         this.memberList.forEach(i => {
@@ -165,6 +163,23 @@
       this.$eventBus.$emit('applePeo', this.selList)
       uni.navigateBack()
     },
+    closeModal() {
+      this.selList = this.memberList.filter(i => i.checked)
+      this.isShowSelMem = false
+    },
+    subSelMem() {
+      const { selList, memberList } = this
+      memberList.forEach(ite => {
+        ite.checked = false
+        selList.forEach(item => {
+          if (ite.id === item.id) {
+            ite.checked = true
+          } else { }
+        })
+      })
+      this.isShowSelMem = false
+      this.$forceUpdate()
+    },
     changeMem(item, index) {
       // this.memberList.forEach(mem => {
       //   if(item.id === mem.id){
@@ -175,13 +190,8 @@
       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);
+    handleRemove(i) {
+      this.selList.splice(i, 1)
       this.$forceUpdate()
     },
   }
@@ -191,10 +201,12 @@
 <style lang="scss">
 .modal {
   padding: 40rpx 30rpx;
+  max-height: 1000rpx;
   .modal_header {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    padding-bottom: 20rpx;
     .status {
       font-weight: 600;
     }
@@ -203,6 +215,8 @@
     }
   }
   .modal_mem_list {
+    max-height: 860rpx;
+    overflow: auto;
     .line {
       display: flex;
       align-items: center;

--
Gitblit v1.9.3