From 0dcc3ce98341f8a15a17610d6eab9ebc514f1201 Mon Sep 17 00:00:00 2001
From: yyy <2605810609@qq.com>
Date: Tue, 11 Mar 2025 09:41:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=9C=BA=E5=A2=9E=E5=8A=A0=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E5=95=86=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/business.js                               |   6 +
 components/ba-tree-picker/ba-tree-picker.vue  |  12 +-
 components/transfer/transfer.vue              | 261 +++++++++---------
 .../pages/business/businessDetails.vue        |  46 ++-
 pages/components/pages/contract/index.vue     |   2 +-
 .../pages/customer/customerDetails.vue        |   3 +-
 6 files changed, 179 insertions(+), 151 deletions(-)

diff --git a/api/business.js b/api/business.js
index d56d96a..66ddf50 100644
--- a/api/business.js
+++ b/api/business.js
@@ -55,4 +55,10 @@ export function getStoreProductInfo(data) {
 	return api.get(`/product/store-product/info/${data.id}`, data, {
 		login: false
 	})
+}
+
+export function transferBusiness(data) {
+	return api.post('/crm/business/transfer', data, {
+		login: false
+	})
 }
\ No newline at end of file
diff --git a/components/ba-tree-picker/ba-tree-picker.vue b/components/ba-tree-picker/ba-tree-picker.vue
index c890000..9ca98e3 100644
--- a/components/ba-tree-picker/ba-tree-picker.vue
+++ b/components/ba-tree-picker/ba-tree-picker.vue
@@ -29,8 +29,8 @@
 									<view v-else-if="!item.isLastLevel&&!item.isShowChild" class="switch-off"
 										:style="{'border-top-color':switchColor}">
 									</view>
-									<view v-else class="item-last-dot" :style="{'border-top-color':switchColor}">
-									</view>
+									<!-- <view v-else class="item-last-dot" :style="{'border-top-color':switchColor}">
+									</view> -->
 								</view>
 								<view class="uni-flex-item" @tap.stop="_onItemSelect(item, index)">
 									<view class="item-name"> {{item.name+(item.childCount?"("+item.childCount+")":'')}}
@@ -443,8 +443,8 @@
 	}
 
 	.tree-view {
+		padding: 20rpx 20rpx 20rpx 0;
 		flex: 1;
-		padding: 20rpx;
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
@@ -509,8 +509,10 @@
 	.item-icon {
 		display: flex;
 		align-items: center;
-		justify-content: center;
-		width: 40rpx;
+		justify-content: flex-end;
+		width: 80rpx;
+		height: 60rpx;
+		padding-right: 18rpx;
 	}
 
 	.item-label {
diff --git a/components/transfer/transfer.vue b/components/transfer/transfer.vue
index e6cb83e..4a2659b 100644
--- a/components/transfer/transfer.vue
+++ b/components/transfer/transfer.vue
@@ -1,16 +1,13 @@
 <template>
 	<view class="slot-content">
-		<uv-popup  mode="bottom" border-radius="38"  ref="showRef" >
+		<uv-popup mode="bottom" border-radius="38" ref="showRef">
 			<view class="popup-title">
-				<view class=""  style="width: 45px;">
-				</view>
-				<text class="">选择目标员工</text> 
-				<view class="" @click="selectShowClose3" style="width: 45px;">
-					<uv-icon name="close"  color="#909399" size="30"></uv-icon>
+				<text class="">选择目标员工</text>
+				<view class="close" @click="selectShowClose3">
+					<uv-icon name="close" color="#909399" size="22"></uv-icon>
 				</view>
 			</view>
-			<uv-search margin="30rpx 20rpx" shape="square" v-model="adminkeyword" :show-action="false" :clearabled="true"  placeholder="输入名称搜索" @change="adminSearch"></uv-search>
-			<scroll-view scroll-y style="height: 760rpx;width: 100%;" @scrolltolower="adminBottom">
+			<scroll-view scroll-y style="height: 760rpx;width: 100%;">
 				<view class="list">
 					<block v-if="userList.length > 0">
 						<view class="mb-4">
@@ -21,17 +18,17 @@
 								</view>
 							</view>
 						</view>
-						<uv-loadmore :status="adminStatus" ></uv-loadmore>
+						<uv-loadmore :status="adminStatus"></uv-loadmore>
 					</block>
-					<uv-empty text="暂无数据" v-else  margin-top="50" mode="list"></uv-empty>
+					<uv-empty text="暂无数据" v-else margin-top="50" mode="list"></uv-empty>
 				</view>
 			</scroll-view>
-			<view class="bottom_btn flex justify-end">
+			<view class="bottom_btn">
 				<view>
-					<uv-button customStyle="padding:0 80rpx;"  @click="selectShowClose3">取消</uv-button> 
+					<uv-button customStyle="padding:0 80rpx;" @click="selectShowClose3">取消</uv-button>
 				</view>
 				<view style="margin-left: 20rpx;">
-					<uv-button  color="#09b4f1" customStyle="padding:0 80rpx;" @click="onCliskDivert" >转移</uv-button>
+					<uv-button color="#09b4f1" customStyle="padding:0 80rpx;" @click="onCliskDivert">转移</uv-button>
 				</view>
 			</view>
 		</uv-popup>
@@ -39,138 +36,128 @@
 </template>
 
 <script setup>
-import {
-	ref,
-	unref,
-	computed,
-	defineEmits
-} from 'vue'
-import { onLoad,onShow ,onReady} from '@dcloudio/uni-app'
-import {
-  getSimpleUserList
-} from '@/api/user'
-const lastAdmin = ref(false)
-const adminStatus = ref('nomore')
-const adminkeyword = ref('')
-const pageSize = ref(10)
-const page = ref(1)
-const userList = ref([])
-const adminId = ref(0)
+	import {
+		ref,
+		unref,
+		computed,
+		defineEmits
+	} from 'vue'
+	import {
+		onLoad,
+		onShow,
+		onReady
+	} from '@dcloudio/uni-app'
+	import {
+		getAllUserList
+	} from '@/api/user'
+	const lastAdmin = ref(false)
+	const adminStatus = ref('nomore')
+	const pageSize = ref(10)
+	const page = ref(1)
+	const userList = ref([])
+	const adminId = ref(0)
 
-onShow(()=>{
-	getUserList()
-})
-
-const showRef = ref()
-const doopen = () => {
-	showRef.value.open()
-}
-
-const selectShowClose3 = () => {
-	unref(showRef).close()
-}
-
-defineExpose({ doopen,selectShowClose3 })
-
-const emit = defineEmits(['doTrans'])
-
-const onCliskDivert = () => {
- if(adminId.value == 0){
- 	  uni.showToast({
- 		title: '请先选择目标员工',
- 		icon: 'none',
- 		duration: 2000
- 	  })
- 	  return
- 	}
- emit('doTrans',adminId.value) 
-}
-
-const oncompany = (val) => {
-  adminId.value = val.id
-}
-
-const adminSearch = () => {
-  lastAdmin.value = false
-  getUserList()
-}
-
-const getUserList = async(isNextPage,pages) => {
-	await getSimpleUserList({
-		pageNo: page.value,
-		pageSize: pageSize.value,
-		username:adminkeyword.value,
-	}).then(res => {
-		if(res) {
-			// 不够一页
-			if (res.list.length < 10) {
-				adminStatus.value = 'nomore'
-			}
-			// 最后一页
-			if(res.list.length == 0) {
-				lastAdmin.value = true
-			} 
-			// 第二页开始
-			if(isNextPage) {
-				userList.value = userList.value.concat(res.list)
-				return 
-			}
-			userList.value = res.list
-		}
+	onShow(() => {
+		getUserList()
 	})
-}
 
-    // 滚动到底部加载更多
-const adminBottom = () => {
- //  if(this.lastAdmin || this.adminStatus == 'loading') return ;
- //  this.adminStatus = 'loading'
- //  setTimeout(() => {
-	// if(this.lastAdmin) return ;
-	// this.onSelectpage(true,++this.adminPage)
-	// if(this.companyList.length >= 10) this.adminStatus = 'loadmore';
-	// else this.adminStatus = 'loading';
- //  }, 1200)
-}
+	const showRef = ref()
+	const doopen = () => {
+		showRef.value.open()
+	}
 
+	const selectShowClose3 = () => {
+		unref(showRef).close()
+	}
 
+	defineExpose({
+		doopen,
+		selectShowClose3
+	})
+
+	const emit = defineEmits(['doTrans'])
+
+	const onCliskDivert = () => {
+		if (adminId.value == 0) {
+			uni.showToast({
+				title: '请先选择目标员工',
+				icon: 'none',
+				duration: 2000
+			})
+			return
+		}
+		emit('doTrans', adminId.value)
+	}
+
+	const oncompany = (val) => {
+		adminId.value = val.id
+	}
+
+	const getUserList = () => {
+		getAllUserList({
+			roleCodes: 'sale'
+		}).then(res => {
+			userList.value = res
+		})
+	}
 </script>
 
 <style lang="scss" scoped>
-.slot-content {
-	.search {
-		padding: 30rpx 25rpx;
-	}
-	.popup-title {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		position: relative;
-		font-size: 35rpx;
-		font-weight: 600;
-		text-align: center;
-		height: 50px;
-		padding-right: 25rpx;
-	}
-	.list {
-		padding-bottom: 45rpx;
-		.item {
-			padding: 0 25rpx;
-			justify-content: space-between;
-			height: 55px;
-			.title {
-				flex: 1;
-				font-size: 28rpx;
-				font-weight: 600;
-			}
-			.check-icon {
-				text-align: center;
-				width: 100rpx;
+	.slot-content {
+		.search {
+			padding: 30rpx 25rpx;
+		}
+
+		.popup-title {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: relative;
+			font-size: 35rpx;
+			font-weight: 600;
+			text-align: center;
+			height: 50px;
+
+			.close {
+				position: absolute;
+				right: 20rpx;
 			}
 		}
+
+		.list {
+			padding-bottom: 45rpx;
+
+			.item {
+				padding: 0 25rpx;
+				justify-content: space-between;
+				height: 80rpx;
+
+				.title {
+					flex: 1;
+					font-size: 28rpx;
+					font-weight: 600;
+				}
+
+				.check-icon {
+					text-align: center;
+					width: 100rpx;
+				}
+			}
+		}
+
+		.bottom_btn {
+			background-color: #fff;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			height: 140rpx;
+			box-shadow: rgba(0, 0, 0, 0.05) 0px 0px 0px 1px;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			padding-right: 26rpx;
+			box-sizing: border-box;
+		}
 	}
-	.bottom_btn {
-		text-align: right;
-		padding: 28rpx 10rpx 28rpx;
-	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/components/pages/business/businessDetails.vue b/pages/components/pages/business/businessDetails.vue
index f8cbd65..7cc7e98 100644
--- a/pages/components/pages/business/businessDetails.vue
+++ b/pages/components/pages/business/businessDetails.vue
@@ -109,6 +109,9 @@
 				<uv-button type="success" text="跟进" customStyle="padding:0 50rpx;" @click="onAdd">跟进</uv-button>
 			</view>
 		</view>
+
+		<ba-tree-picker ref="treePickerRef" :multiple='true' @select-change="userSelectChange" title="选择员工"
+			:localdata="userTreeList" valueKey="userId" textKey="nickname" childrenKey="items" confirmColor="#09b4f1" />
 	</view>
 </template>
 
@@ -128,17 +131,21 @@
 		getCustomer,
 		getCustomerDoOpen,
 		getRecordPage,
-		delCustomer
+		delCustomer,
+		getUserTreeList
 	} from '@/api/customer'
 	import {
 		getBusiness,
 		getBusinessProductListByBusinessId,
-		delBusiness
+		delBusiness,
+		transferBusiness
 	} from '@/api/business'
 	import {
 		formatDateTime,
 		prePage
 	} from '@/utils/util'
+	import baTreePicker from "@/components/ba-tree-picker/ba-tree-picker.vue"
+
 	const title = ref('商机详情')
 	const businessId = ref(0)
 	const business = ref({
@@ -160,13 +167,16 @@
 			icon: 'edit-pen',
 			show: true,
 		},
-
+		{
+			text: '转移商机',
+			icon: 'reload',
+			show: true,
+		},
 		{
 			text: '删除商机',
 			icon: 'trash',
 			show: true,
 		}
-
 	])
 	const recordList = ref([])
 	const productList = ref([])
@@ -199,12 +209,32 @@
 	})
 
 	onLoad((e) => {
-		console.log('e:', e)
 		businessId.value = e.id
-		console.log('businessId.value:', businessId.value)
 		getData()
+		getUserList()
 	})
 
+	// 树形选人员
+	const userTreeList = ref([])
+	const getUserList = () => {
+		getUserTreeList().then(res => {
+			userTreeList.value = res
+		})
+	}
+	const treePickerRef = ref()
+	const userSelectChange = async (userIds) => {
+		let data = await transferBusiness({
+			businessIds: [businessId.value],
+			ownerAdminIds: userIds
+		})
+		moreShowClose()
+		uni.showToast({
+			title: '操作成功',
+			icon: 'success',
+			duration: 2000
+		})
+	}
+
 	onShow(() => {
 		getData()
 		switch (current.value) {
@@ -266,6 +296,10 @@
 					url: '/pages/components/pages/business/add?id=' + business.value.id + '&type=edit'
 				});
 				break;
+			case "转移商机":
+				moreShowClose()
+				treePickerRef.value._show()
+				break;
 			case "删除商机":
 				unref(moreShowRef).close()
 				uni.showModal({
diff --git a/pages/components/pages/contract/index.vue b/pages/components/pages/contract/index.vue
index e050444..6624074 100644
--- a/pages/components/pages/contract/index.vue
+++ b/pages/components/pages/contract/index.vue
@@ -84,7 +84,7 @@
 	const oldScrollTop = ref(0)
 	const scrollTop = ref(-1)
 	const dataList = ref([])
-	const relation = ref(true)
+	const relation = ref('my')
 	const list = ref(
 		[{
 			name: '我的回款',
diff --git a/pages/components/pages/customer/customerDetails.vue b/pages/components/pages/customer/customerDetails.vue
index d39a60a..2b0f5b1 100644
--- a/pages/components/pages/customer/customerDetails.vue
+++ b/pages/components/pages/customer/customerDetails.vue
@@ -287,7 +287,7 @@
 		},
 		{
 			text: '转移客户',
-			icon: 'share',
+			icon: 'reload',
 			show: true,
 		},
 		{
@@ -404,7 +404,6 @@
 	})
 
 	const purchaseTotalFormat = computed(() => {
-		console.log('')
 		if (customer.value.purchaseTotal) {
 			let num;
 			if (customer.value.purchaseTotal > 9999) {