wangxia 3 months ago
commit c6ebf37f81

@ -2,6 +2,13 @@ let personInfo = {// 用户信息模块
merchantManagement_todayData: "/yishoudan/statistics/agency/teamWithGroup",// 获取今日数据 merchantManagement_todayData: "/yishoudan/statistics/agency/teamWithGroup",// 获取今日数据
person_feedback: "/daotian/feedback/add",// 反馈与建议 person_feedback: "/daotian/feedback/add",// 反馈与建议
person_feedbackList: "/daotian/feedback/list",// 反馈与建议 person_feedbackList: "/daotian/feedback/list",// 反馈与建议
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; export default personInfo;

@ -97,6 +97,15 @@
{ // { //
"root": "root/person", "root": "root/person",
"pages": [ "pages": [
{
"path": "marge",
"style": {
"navigationBarTitleText": "合并团队",
"backgroundColor": "#ededed",
"backgroundColorTop": "#ededed",
"backgroundColorBottom": "#ededed"
}
},
{ {
"path": "todayData", "path": "todayData",
"style": { "style": {

@ -0,0 +1,356 @@
<template>
<view class="p-person-marge g_w_all g_h_all g_bg_f_5 g_kuaishou">
<view class="g_bg_f sticky" :style="{ boxShadow: '0px 4px 4px 0px rgba(218, 218, 218, 0.5)' }">
<u-tabs bg-color="transparent"
:list="menuList"
:is-scroll="false"
:current="menuActive"
:active-color="globalData.themeColor"
bar-width="64"
bar-height="6"
@change="handleUpdateMenu"
font-size="32"
duration="0.05"
height="76"
></u-tabs>
</view>
<!-- 收到的 -->
<div class="m-recives-obj" v-if="menuActive == 0">
<view v-if="recivesRecord && recivesRecord.length == 0"
class="g_flex_column_center" style="padding-top: 130px;"
>
<g-empty />
</view>
<view v-if="recivesRecord && recivesRecord.length > 0"
class="g_flex_column_center m-rlist"
>
<view class="" style="height: 10px;">
</view>
<view class="g_flex_row_between m-item g_h_60"
v-for="(item,index) in recivesRecord" :key="index"
>
<view class="avatar-obj g_flex_none g_flex_column_center" style="height: 60px;overflow: hidden;border-radius: 50%;">
<image src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/APP/default.svg" alt=""
mode="widthFix" style="width: 40px;border-radius: 50%;"
/>
</view>
<view class="info-obj g_flex_1 g_flex_column_center" style="margin: 0 10px;">
<view class="g_ell_1 g_fs_16 g_fw_600">
{{item.targetAgency.agencyName}}
</view>
<view class="g_ell_1 g_fs_14" style="color: #666;margin-top: 8px;">
{{item.desp || '-'}}
</view>
</view>
<view class="status-obj g_flex_none g_flex_column_center" >
<view class="g_flex_row_end">
<g-button type='primary' size='mini' btnText='通过' @clickBtn='handleSet(item,1)'></g-button>
<g-button type='delete' size='mini' btnText='拒绝' style="margin-left: 12px;" @clickBtn='handleSet(item,0)'></g-button>
</view>
</view>
</view>
</view>
</div>
<!-- 申请/发起 -->
<view class="m-applys-obj" v-if="menuActive == 1">
<view class="m-aform g_flex_row_start g_h_60"
@click="openApply"
>
<view class="g_flex_none g_flex_c label">
<i class="iconfont icon-jia1 icon"></i>
</view>
<view class="g_flex_1 g_flex_column_center value">申请合并</view>
</view>
<div class="m-alist">
<view v-if="applysRecord && applysRecord.length == 0"
class="g_flex_column_center" style="padding-top: 130px;"
>
<g-empty />
</view>
<view v-if="applysRecord && applysRecord.length > 0"
class="g_flex_column_center as"
>
<view class="g_flex_row_between m-item g_h_60"
v-for="(item,index) in applysRecord" :key="index"
>
<view class="avatar-obj g_flex_none g_flex_column_center" style="height: 60px;overflow: hidden;border-radius: 50%;">
<image src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/APP/default.svg" alt=""
mode="widthFix" style="width: 40px;border-radius: 50%;"
/>
</view>
<view class="info-obj g_flex_1 g_flex_column_center" style="margin: 0 10px;">
<view class="g_ell_1 g_fs_16 g_fw_600">
{{item.targetAgency.agencyName}}
</view>
<view class="g_ell_1 g_fs_14" style="color: #666;margin-top: 8px;">
{{item.desp || '-'}}
</view>
</view>
<view class="status-obj g_flex_none g_flex_column_center" >
<view v-if="item.state == 0" style="color: orange;font-size: 16px;"></view>
<view v-if="item.state == 1" style="color: green;font-size: 16px;"></view>
<view v-if="item.state == 2" style="color: red;font-size: 16px;"></view>
</view>
</view>
</view>
</div>
</view>
<u-popup v-model="modalApplyData.isShow" mode="bottom" border-radius="14" width="80%" :closeable='true'>
<view style="max-height: calc(100vh - 200px);overflow-y: auto;">
<view class="g_flex_c g_h_40 g_fs_16">申请合并</view>
<view>
<view>
<view class="g_pb_8 g_pl_20 g_c_6">手机号</view>
<view class="g_flex_row_start">
<view class="g_flex_1 g_flex_column_center">
<u-input v-model="modalApplyData.tel"
placeholder="请输入"
type="number"
maxlength="11"
style="width: calc(100% - 64px); z-index: 0;background-color: #ededed;border-radius: 6px;margin: 0 auto;padding: 0 16px;"
></u-input>
</view>
<view class="g_flex_none g_flex_column_center g_mr_16">
<g-button type='primary' size='mini' btnText='查询' @clickBtn='handleSearch'></g-button>
</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"
placeholder="请输入备注"
v-model="modalApplyData.desp"
placeholder-style="color:#999"
auto-height
style="min-height: 137px; width: calc(100% - 64px); z-index: 0;background-color: #ededed;border-radius: 6px;padding: 16px;margin: 0 auto;"
></textarea>
</view>
<view class="g_flex_row_center g_p_16">
<view class="g_flex_row_center" style="width: 50%;">
<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='提交' @clickBtn='submitApply'></g-button>
</view>
</view>
<view class="g_h_20"></view>
</view>
</view>
</u-popup>
</view>
</template>
<script>
export default {
onReady() {
this.G.setNavStyle();
},
onShareAppMessage() {
return this.G.shareFun();
},
data() {
return {
themeColor: getApp().globalData.themeColor,
globalData: getApp().globalData,
cdnBaseImg: this.G.store().cdnBaseImg,
localBaseImg: this.G.store().localBaseImg,
svgBaseImg: this.G.store().svgBaseImg,
menuList: [
{
name: "我收到的",
tip: "0",
},
{
name: "我发起的",
tip: "1",
},
],
menuActive: 0,
modalApplyData:{
isShow:false,
tel:'',
desp:'',
resultList:[],
selectResult:''
},
applysRecord:[],
recivesRecord:[],
};
},
onShow() {
let that = this;
that.getList();
},
methods: {
getList(){
let that = this,
params = {
}
that.G.Get(that.api.person_getMargeRecord,params,(res)=>{
console.log('合并记录:',res);
that.applysRecord = res.applys;
that.recivesRecord = res.recives;
})
},
handleUpdateMenu(e){
console.log(e)
let that = this;
that.menuActive = e;
},
openApply(){
let that = this;
that.modalApplyData = {
isShow:true,
tel:'',
desp:'',
resultList:[],
selectResult:''
}
},
handleSearch(){
let that = this;
if(!that.modalApplyData.tel){
uni.showToast({
icon:'none',
title:'请输入手机号'
})
return false;
}
that.G.Get(that.api.person_getGroup,{
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();
})
},
handleSet($data,$type){
let that = this;
if($type == 1){
//
uni.showModal({
content:'确认通过吗?',
success(res) {
if(res.confirm){
that.G.Get(that.api.person_applyTrue + '/' + $data.id,{},()=>{
uni.showToast({
icon:'success',
title:'已通过'
});
that.getList();
})
}
}
})
}else{
//
uni.showModal({
content:'确认拒绝吗?',
success(res) {
if(res.confirm){
that.G.Get(that.api.person_applyFalse + '/' + $data.id,{},()=>{
uni.showToast({
icon:'error',
title:'已拒绝'
});
that.getList();
})
}
}
})
}
}
},
};
</script>
<style lang="less">
.p-person-marge{
.m-applys-obj{
.m-aform{
width: calc(100% - 52px);
margin: 10px auto;
background-color: #fff;
padding: 0 16px;
border-radius: 8px;
.label{
.icon{
font-size: 20px;
}
}
.value{
margin-left: 10px;
font-size: 16px;
}
}
}
.m-alist{
.m-item{
&:first-child{
margin-top: 0 !important;
}
}
}
.m-item{
width: calc(100% - 52px);
margin: 0px auto 10px;
background-color: #fff;
padding: 0 16px;
border-radius: 8px;
}
}
</style>

@ -17,6 +17,21 @@
@clickItem="teamSet" @clickItem="teamSet"
/> />
</view> </view>
<view class="g_mt_10 g_position_rela">
<div class="g_w_8 g_h_8 g_radius_50 g_bg_f0a g_position_abso" style="right: 18px; top: 10px" v-if="readed && readed > 0"></div>
<g-panel-form-item
:list="[
{
icon: '',
label: '合并团队',
result: readed && readed > 0 ? readed : '',
path: '',
tip: 'margeGroup',
},
]"
@clickItem="goMarge"
/>
</view>
<view class="g_mt_10"> <view class="g_mt_10">
<g-panel-form-item :isDisabled="isAdmin ? 0 : 1" class="g_mb_10" :list="companyConfig" @clickItem="handleItemClick"> </g-panel-form-item> <g-panel-form-item :isDisabled="isAdmin ? 0 : 1" class="g_mb_10" :list="companyConfig" @clickItem="handleItemClick"> </g-panel-form-item>
</view> </view>
@ -114,6 +129,7 @@ export default {
}, },
data() { data() {
return { return {
readed:false,
isAdmin: uni.getStorageSync("apply-userinfo").admin, isAdmin: uni.getStorageSync("apply-userinfo").admin,
userInfo: uni.getStorageSync("apply-userinfo"), userInfo: uni.getStorageSync("apply-userinfo"),
teamSetShow: false, teamSetShow: false,
@ -131,6 +147,7 @@ export default {
}, },
onShow() { onShow() {
console.log("企业资料 show"); console.log("企业资料 show");
this.getNum()
}, },
created() { created() {
var that = this; var that = this;
@ -160,6 +177,12 @@ export default {
// } // }
}, },
methods: { methods: {
getNum(){
let that = this;
that.G.Get(that.api.person_applyNum,{},(res)=>{
that.readed = res;
})
},
save() { save() {
let that = this; let that = this;
let subObj = { let subObj = {
@ -205,6 +228,7 @@ export default {
}); });
} }
that.resetInfo(); that.resetInfo();
that.getNum()
}); });
}, },
resetInfo() { resetInfo() {
@ -341,7 +365,11 @@ export default {
// }); // });
// } // }
}, },
goMarge(){
uni.navigateTo({
url:'/root/person/marge'
})
},
teamSet() { teamSet() {
this.teamSetShow = true; this.teamSetShow = true;
}, },

Loading…
Cancel
Save