From fd52f2e123860fdfe54e85ddd6b40a8c771e1b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Thu, 22 Sep 2022 09:26:10 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=E4=BA=BA=E5=91=98=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/learun-app/organize-picker.vue |  7 ++-
 .../learun-app/organize-single-item.vue       | 56 +++++++++++++++++--
 .../components/learun-app/organize-tree.vue   |  2 +-
 .../MeetingManagement/single.vue              |  3 +-
 .../pages/common/select-organize-multiple.vue | 34 ++++++++---
 5 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue
index 1bf856f2a..586450ed4 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue	
@@ -7,7 +7,12 @@
 
   <!-- #ifndef MP-DINGTALK -->
   <l-label @click="click" :arrow="!readonly" :required="required" :title="title">
-    {{ display || displayPlaceholder }}
+    <!-- {{ display || displayPlaceholder }} -->
+	<view style="white-space: normal;min-height: 54px;display: flex;align-items: center;justify-content: right;">
+		<view style="line-height: 24px;">
+			{{ display || displayPlaceholder }}
+		</view>
+	</view>
   </l-label>
   <!-- #endif -->
 </template>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-single-item.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-single-item.vue
index f54e083f2..0b16a5c3d 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-single-item.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-single-item.vue	
@@ -10,32 +10,80 @@
     ></image>
 
     <!-- 名称 -->
-    <text class="tree-item-title">{{ item.name }}</text>
+    <text class="tree-item-title">{{ item.name + (item.mobile ? '(' +item.mobile + ')' : "")  }}</text>
 
     <!-- 用户标签 -->
     <l-tag :line="tagColor" size="sm" class="margin-left-sm">{{ tagName }}</l-tag>
+	
+	<uni-view v-if="item.type === 'user' && item.mobile" class="margin-left-sm sm line-gray cu-tag" style="z-index: 1;" @tap="copy(item.mobile)">复制</uni-view>
 
     <!-- 如果开启选择按钮显示，并且级别符合，则显示按钮 -->
     <view v-if="button" class="tree-item-action">
-      <l-button @click="$emit('buttonClick', item)" line="green" size="sm">选择</l-button>
+	  <l-button v-if="!selectIds.includes(item.id)" @click="itemClick(item)" line="green" size="sm">选择</l-button>
+	  <l-button v-else @click="itemClick(item)" line="blue" size="sm">取消选择</l-button>
     </view>
   </view>
 </template>
 
 <script>
+import uniCopy from "@/common/js/uni-copy.js"
 export default {
   name: 'l-organize-single-item',
 
   props: {
     item: {},
-    button: {}
+    button: {},
+	value:{},
+  },
+  
+  data(){
+	  return{
+		selectIds:[],
+	  }
+  },
+  
+  created() {
+  	this.init()
   },
 
   methods: {
+	init(){
+		if(this.value){
+			this.selectIds = this.value.split(",")
+		}
+	},
     // 点击事件
     click(e) {
       this.$emit('click', e)
-    }
+    },
+	itemClick(root){
+		if(this.selectIds.indexOf(root.id) !== -1){
+			this.selectIds.splice(this.selectIds.indexOf(root.id),1)
+		}else{
+			this.selectIds.push(root.id)
+		}
+		this.$emit('buttonClick', root)
+	},
+	
+	copy(mobile){
+		uniCopy({
+			content:mobile,
+			success:(res)=>{
+				uni.showToast({
+					title: "复制手机号成功~",
+					icon: 'none',
+					duration:3000,
+				})
+			},
+			error:(e)=>{
+				uni.showToast({
+					title: e,
+					icon: 'none',
+					duration:3000,
+				})
+			}
+		})
+	}
   },
 
   computed: {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue
index d1f65275a..1a25c8b3c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue	
@@ -29,7 +29,7 @@
         {{ tagName }}
       </l-tag>
 	  
-	  <!-- <uni-view v-if="root.type === 'user' && mobile" class="margin-left-sm sm line-gray cu-tag" style="z-index: 1;" @tap="copy(mobile)">复制</uni-view> -->
+	  <uni-view v-if="root.type === 'user' && mobile" class="margin-left-sm sm line-gray cu-tag" style="z-index: 1;" @tap="copy(mobile)">复制</uni-view>
 
       <!-- 开启按钮显示且级别对应，则显示按钮 -->
       <view v-if="button && root.type === level" class="tree-item-action">
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue
index 9a24d1307..069dbc3c2 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue	
@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="page">
     <view v-if="ready">
       <l-input
@@ -32,6 +32,7 @@
         :readonly="!edit"
         type="user"
         title="会议记录者"
+		multiple
       />
       <l-textarea
         @input="setValue('MeetingManagement.Content', $event)"
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue
index 4051cea59..c97355c75 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue	
@@ -2,24 +2,28 @@
   <view id="contact" class="page">
     <!-- 顶部搜索栏 -->
 	<view class="topSearch">
-		<l-banner v-model="searchText" :placeholder="placeholder" type="search" noSearchButton fill fixed />
-		<view class="">
+		<!-- <view style="padding-top: 54px;"> -->
+			<l-banner v-model="searchText" :placeholder="placeholder" type="search" noSearchButton fill />
+		<!-- </view> -->
+		<view>
 			<view class="pearson">
 				已选择人员：{{names||'暂无'}}
 			</view>
 			<view style="display: flex;justify-content: center;">
-				<view class="cu-btn sm line-green" @tap="itemConfirm" style="font-size: 16px;">
+				<view class="cu-btn sm line-red" @tap="itemClear" style="font-size: 16px;margin: 4px;">
+					清空选择
+				</view>
+				<view class="cu-btn sm line-green" @tap="itemConfirm" style="font-size: 16px;margin: 4px;">
 					确定选择
 				</view>
 			</view>
 		</view>
-		
 	</view>
 
     <!-- 树形列表 -->
-    <l-organize-tree v-if="type && !searchText" @buttonClick="itemClick" :level="type" :root="root" button :value="ids" />
+    <l-organize-tree v-if="type && !searchText && refreshFlag" @buttonClick="itemClick" :level="type" :root="root" button :value="ids" />
     <!-- 如果用户输入了搜索关键字，只列出用户 -->
-    <view v-else-if="type" class="user-item-list">
+    <view v-else-if="type && refreshFlag" class="user-item-list">
       <l-organize-single-item v-for="item of searchList" @buttonClick="itemClick" :key="item.id" :item="item" button :value="ids" />
     </view>
   </view>
@@ -36,6 +40,7 @@ export default {
       root: { type: 'company', id: '0' },
 	  items:[],
 	  ids:'',
+	  refreshFlag:true,
     }
   },
 
@@ -89,10 +94,20 @@ export default {
 		}
 		return arr
 	},
+	
+	itemClear(){
+		this.items = []
+		this.ids = ''
+		this.refreshFlag = false
+		this.$nextTick(()=>{
+			this.refreshFlag = true
+		})
+	},
 
     // 某一项被点击，触发事件
     itemClick(item) {
 	  this.items = this.findItem(this.items,item)
+	  this.ids = this.items.map(t=>t.id).toString()
       // this.EMIT('select-organize', item)
       // this.NAV_BACK()
     },
@@ -129,13 +144,14 @@ export default {
 </script>
 
 <style lang="scss">
-page {
-  padding-top: 100rpx;
-}
+// page {
+//   padding-top: 100rpx;
+// }
 .topSearch{
 	.pearson{
 		color: #606266;
 		line-height: 32px;
+		padding: 6px 8px;
 	}
 }
 </style>