From 3ad1d07510e3928e380174394b12ef3fc1871a95 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Thu, 7 Aug 2025 17:10:18 +0800
Subject: [PATCH] no message

---
 api/person.js         |  4 ++++
 root/person/marge.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/api/person.js b/api/person.js
index 3e32ae9..d1b0271 100644
--- a/api/person.js
+++ b/api/person.js
@@ -5,6 +5,10 @@ let personInfo = {// 用户信息模块
 	
 	person_getMargeRecord: "/yishoudan/agency/merge/get",// 获取合并记录
 	person_getGroup:'/yishoudan/agency/getAgencyByAdminTel',// 根据管理员手机号查团队
+	person_addApply:'/yishoudan/agency/merge/add',// 申请合并
+	person_applyTrue:'/yishoudan/agency/merge/agree',// 通过
+	person_applyFalse:'/yishoudan/agency/reject',// 驳回
+	person_applyNum:'/yishoudan/agency/merge/countApply',// 查询待处理数量
 }
 
 export default personInfo;
\ No newline at end of file
diff --git a/root/person/marge.vue b/root/person/marge.vue
index 09bb4f9..ea77991 100644
--- a/root/person/marge.vue
+++ b/root/person/marge.vue
@@ -53,6 +53,21 @@
 							</view>
 						</view>
 					</view>
+					<view class="result-obj" style="padding: 12px 0 0 16px;" v-if="modalApplyData.resultList && modalApplyData.resultList.length > 0">
+						<u-radio-group v-model="modalApplyData.selectResult" 
+													 @change="radioGroupChange"
+													 :wrap='true'
+													 :active-color='themeColor'
+						>
+							<u-radio 
+								@change="handleSelect" 
+								v-for="(item, index) in modalApplyData.resultList" :key="index" 
+								:name="item.agencyId"
+							>
+								{{item.agencyName || '-'}}
+							</u-radio>
+						</u-radio-group>
+					</view>
 					<view>
 						<view class="g_pt_12 g_pb_8 g_pl_20 g_c_6">备注</view>
 						<textarea class="weui-input g_flex_1 g_fs_16"
@@ -68,7 +83,7 @@
 							<g-button type='default' class="g_w_all" size='small' btnText='取消' @clickBtn='modalApplyData.isShow = false'></g-button>
 						</view>
 						<view class="g_flex_row_center" style="width: 50%;">
-							<g-button type='primary' size='small' btnText='提交'></g-button>
+							<g-button type='primary' size='small' btnText='提交' @clickBtn='submitApply'></g-button>
 						</view>
 					</view>
 					<view class="g_h_20"></view>
@@ -89,6 +104,7 @@ export default {
 	},
 	data() {
 		return {
+			themeColor: getApp().globalData.themeColor,
 			globalData: getApp().globalData,
 			cdnBaseImg: this.G.store().cdnBaseImg,
 			localBaseImg: this.G.store().localBaseImg,
@@ -109,7 +125,8 @@ export default {
 				isShow:false,
 				tel:'',
 				desp:'',
-				result:[]
+				resultList:[],
+				selectResult:''
 			}
 		};
 	},
@@ -138,7 +155,8 @@ export default {
 				isShow:true,
 				tel:'',
 				desp:'',
-				result:[],
+				resultList:[],
+				selectResult:''
 			}
 		},
 		handleSearch(){
@@ -154,6 +172,41 @@ export default {
 				tel:that.modalApplyData.tel
 			},(res)=>{
 				console.log('团队res',res)
+				that.modalApplyData.resultList = res;
+				that.modalApplyData.selectResult = '';
+			})
+		},
+		handleSelect(e){
+			console.log('选择团队',e)
+			this.modalApplyData.selectResult = e;
+		},
+		submitApply(){
+			let that = this;
+			if(!that.modalApplyData.selectResult){
+				uni.showToast({
+					icon:'none',
+					title:'请选择要合并的团队'
+				})
+				return false;
+			}
+			if(!that.modalApplyData.desp){
+				uni.showToast({
+					icon:'none',
+					title:'请输入备注'
+				})
+				return false;
+			}
+			that.G.Post(that.api.person_addApply,{
+				sourceAgencyId:uni.getStorageSync("apply-userinfo").agencyId,
+				targetAgencyId:that.modalApplyData.selectResult,
+				desp:that.modalApplyData.desp
+			},(res)=>{
+				uni.showToast({
+					icon:'success',
+					title:'申请成功'
+				})
+				that.modalApplyData.isShow = false;
+				uni.navigateBack();
 			})
 		}
 	},