Skip to content

C
CFFP-HB
Commit f8e22c23 by sunerhu
Options

修改邀请注册页面，--我的团队页面组件修改。 添加新树形表格组件。

parent 20ca0278
Showing with 356 additions and 197 deletions
api/api.ts
...@@ -233,6 +233,10 @@ export default { ...@@ -233,6 +233,10 @@ export default {
queryTeamDetail(params){ queryTeamDetail(params){
return request(`${cffpURL}/orgInfo/teamDetail`, "POST", params) return request(`${cffpURL}/orgInfo/teamDetail`, "POST", params)
}, },
// 团队业绩
queryTeamAchievement(params){
return request(`${cffpURL}/orgInfo/queryTeamAchievement`, "POST", params)
},
// 学习统计 // 学习统计
userStudyCount(params){ userStudyCount(params){
return request(`${cffpURL}/study/userStudyCount`, "POST", params) return request(`${cffpURL}/study/userStudyCount`, "POST", params)
......
components/myteam/myteam-table.vue
<template> <template>
<view class="concent-footer"> <view class="concent-footer">
<view class="content-box"> <view class="content-box">
<view class="content-box-title" v-for="item in datatitleList"> <view class="content-box-title" v-for="item in datatitleList">
<span class="title">{{item}}</span> <span class="title">{{item}}</span>
</view> </view>
</view> </view>
<!-- // 一级循环 --> <!-- // 一级循环 -->
<view class="content-sam-box"> <view class="content-sam-box">
<view class="" v-for="(pointItem,index) in dataList" :key="index"> <view class="" v-for="(pointItem,index) in dataList" :key="index">
<view class="" style="display: flex;"> <view class="" style="display: flex;border-bottom: 1px solid #F2F2F2; " v-if="felTyle == 'achievement'">
<view class="content-box-title" @click="subordinate(index,pointItem,1,tableone)">
<span>{{pointItem.areaCenterName || '暂无辖下组织'}}</span>
</view>
<view class="content-box-title" v-if="pointItem.levelName">
<span>{{pointItem.levelName}}</span>
</view>
<view class="content-box-title" v-if="pointItem.count !=null">
<span>{{pointItem.count}}</span>
</view>
</view>
<!-- <view class="" style="display: flex;" v-if="type == '2'">
<view class="content-box-title" v-if="pointItem.name"
@click="subordinate(index,pointItem,1,tableone)">
<span>{{pointItem.name}}</span>
</view>
<view class="content-box-title" v-if="pointItem.levelName">
<span>{{pointItem.levelName}}</span>
</view>
<view class="content-box-title"> <view class="content-box-title">
<span>{{pointItem.count}}</span> <view :class="index == 0 ?'cornermarker': index == 1 ? 'cornermarkertwo' : index == 2 ? 'cornermarkerthree' : 'cornermarkerother'">
<text style="font-size: 8px;">{{index + 1}}</text>
</view>
<span>{{pointItem.name }}</span>
</view> </view>
</view> --> <view class="content-box-title" style="margin-top: 10px;">
<!-- <view class="" style="display: flex;" v-if="type == '3'"> <span>{{pointItem.areaCenterName }}</span>
<view class="content-box-title" v-if="pointItem.org" @click="subordinate(index,pointItem)">
<span>{{pointItem.org}}</span>
</view> </view>
<view class="content-box-title" v-if="pointItem.levelName"> <view class="content-box-title" style="margin-top: 10px;">
<span>{{pointItem.levelName}}</span> <span>{{pointItem.orderNum }}</span>
</view> </view>
<view class="content-box-title" v-if="pointItem.name !=null"> <view class="content-box-title" style="margin-top: 10px;">
<span>{{pointItem.name}}</span> <span>{{pointItem.coursePrice}}</span>
</view> </view>
<view class="content-box-title" v-if="pointItem.referrer !=null"> <view class="content-box-title" style="margin-top: 10px;">
<span>{{pointItem.referrer}}</span> <span>{{pointItem.courseIncome}}</span>
</view>
</view> -->
<!-- 二级循环 -->
<view class="" v-if="table_index == index && this.tableone == true && pointItem.levelCode != 'A1'">
<view class="" v-for="(itq, index) in twoList" :key="index">
<view style="display: flex;">
<view class="content-box-title-a" @click="subordinate(index,itq,2,tabletwo)">
<span style="color: #FFFFFF;font-weight: 400;">{{itq.name}}</span>
</view>
<view class="content-box-title">
<!-- <span>{{itq.levelName}}</span> -->
</view>
<view class="content-box-title">
<span>{{itq.name}}</span>
</view>
</view>
<!-- 三级循环 -->
<view class="" v-if="twoindex == index && this.tabletwo == true ">
<view class="" v-for="(itm, index) in thList ">
<view class="" style="display: flex;">
<view class="content-box-title-two" @click="subordinate(index,itm,3,tablefour)">
<span>{{itm.name}}</span>
</view>
<view class="content-box-title">
<span>{{itm.levelName}}</span>
</view>
<view class="content-box-title">
<span>{{itm.courserNum}}</span>
</view>
</view>
<!-- 第四层关系-->
<view class="" v-if="foindex == index && this.tablefour == true ">
<view class="" v-for="(four, index) in fourList ">
<view class="" style="display: flex;">
<view class="content-box-title-a" style="margin-left: 30rpx;"
@click="subordinate(index,four,4,tablefour)">
<span>{{four.areaCenterName}}</span>
</view>
<view class="content-box-title">
<!-- <span>{{four.levelName}}</span> -->
</view>
<view class="content-box-title">
<span>{{four.count}}</span>
</view>
</view>
<view class="" v-if="fiveindex == index && this.tablefive == true ">
<view class="" v-for="(five, index) in fiveList ">
<view class="" style="display: flex;">
<view class="content-box-title-b"
@click="subordinate(index,itq,2,tabletwo)">
<span>{{five.name}}</span>
</view>
<view class="content-box-title">
<span>{{five.levelName}}</span>
</view>
<view class="content-box-title">
<span>{{five.courserNum}}</span>
</view>
</view>
<!-- <view class="" v-if="foindex == index && this.tablefour == true ">
<view class="" v-for="(four, index) in fourList ">
<view class="" style="display: flex;">
<view class="content-box-title"
@click="subordinate(index,itq,2,tabletwo)">
<span>{{four.name}}</span>
</view>
<view class="content-box-title">
<span>{{four.levelName}}</span>
</view>
<view class="content-box-title">
<span>{{four.courserNum}}</span>
</view>
</view>
</view>
</view> -->
</view>
</view>
</view>
</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -155,6 +53,10 @@ ...@@ -155,6 +53,10 @@
type: String, // 这里用来去区分是哪个页面传来的值 1直属团队 2.所辖团队 3.其他团队 type: String, // 这里用来去区分是哪个页面传来的值 1直属团队 2.所辖团队 3.其他团队
default: null default: null
}, },
felTyle: {
type: String,
default: null
}
}, },
name: "myteam-table", name: "myteam-table",
data() { data() {
...@@ -171,10 +73,10 @@ ...@@ -171,10 +73,10 @@
fourList: [], fourList: [],
tablefive: false, // 第五层收起 tablefive: false, // 第五层收起
fiveindex: '', fiveindex: '',
fiveList: [], fiveList: [],
tablesix: false, // 第六层收起 tablesix: false, // 第六层收起
sixindex: '', sixindex: '',
sixList: [], sixList: [],
}; };
}, },
mounted() { mounted() {
...@@ -197,23 +99,23 @@ ...@@ -197,23 +99,23 @@
api.queryTeamDetail(CffpOrgInfoReqVO).then(res => { api.queryTeamDetail(CffpOrgInfoReqVO).then(res => {
console.log(res, 88855) console.log(res, 88855)
if (res['success']) { if (res['success']) {
if (res.data.list.length == 0) { // if (res.data.list.length == 0) {
// uni.showToast({ // // uni.showToast({
// title: '暂无数据', // // title: '暂无数据',
// duration: 1000, // // duration: 1000,
// icon: 'none' // // icon: 'none'
// }); // // });
var list = [ // var list = [
{ // {
areaCenterName:'第五级', // areaCenterName:'第五级',
levelName:'d', // levelName:'d',
count: '25' // count: '25'
} // }
] // ]
this.ckopennextlevel(index, type, list) // this.ckopennextlevel(index, type, list)
} else { // } else {
this.ckopennextlevel(index, type, res.data.list) // this.ckopennextlevel(index, type, res.data.list)
} // }
} }
}) })
} else { } else {
...@@ -291,6 +193,47 @@ ...@@ -291,6 +193,47 @@
font-size: 13px; font-size: 13px;
} }
.cornermarker {
width: 10px;
color: #FFFFFF;
height: 10px;
background: #C50021;
margin: 0 10rpx 0 auto;
text-align: center;
line-height: 10px;
border-radius: 50%;
}
.cornermarkertwo {
width: 10px;
height: 10px;
color: #FFFFFF;
background: #FBB03B;
margin: 0 10rpx 0 auto;
text-align: center;
line-height: 10px;
border-radius: 50%;
}
.cornermarkerthree {
width: 10px;
color: #FFFFFF;
height: 10px;
background: #3161A8;
margin: 0 10rpx 0 auto;
text-align: center;
line-height: 10px;
border-radius: 50%;
}
.cornermarkerother {
width: 10px;
color: #FFFFFF;
height: 10px;
background: #D5DDE9;
margin: 0 10rpx 0 auto;
text-align: center;
line-height: 10px;
border-radius: 50%;
}
.concent-footer { .concent-footer {
margin: 0 5px; margin: 0 5px;
} }
......
components/myteam/time-picker.vue
...@@ -24,17 +24,18 @@ ...@@ -24,17 +24,18 @@
}; };
}, },
mounted() { mounted() {
if(this.fields == 'year'){ if(this.fields == "month"){
this.queryDate = new Date().getFullYear() this.queryDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}`
}else if (this.fields == 'month') { }else if (this.fields == "year") {
this.queryDate = new Date().getFullYear() - new Date().getMonth() + 1 this.queryDate = `${new Date().getFullYear()}`
console.log(this.queryDate, 'cak')
}else { }else {
return return false
} }
console.log(this.fields, 7747)
}, },
methods: { methods: {
bindDateChange: function(e) { bindDateChange: function(e) {
console.log(e, 444144)
this.$emit('change', e.detail.value) this.$emit('change', e.detail.value)
this.queryDate = e.detail.value this.queryDate = e.detail.value
}, },
......
components/myteam/uni-icons/icons.js 0 → 100644
export default {
"pulldown": "\ue588",
"refreshempty": "\ue461",
"back": "\ue471",
"forward": "\ue470",
"more": "\ue507",
"more-filled": "\ue537",
"scan": "\ue612",
"qq": "\ue264",
"weibo": "\ue260",
"weixin": "\ue261",
"pengyouquan": "\ue262",
"loop": "\ue565",
"refresh": "\ue407",
"refresh-filled": "\ue437",
"arrowthindown": "\ue585",
"arrowthinleft": "\ue586",
"arrowthinright": "\ue587",
"arrowthinup": "\ue584",
"undo-filled": "\ue7d6",
"undo": "\ue406",
"redo": "\ue405",
"redo-filled": "\ue7d9",
"bars": "\ue563",
"chatboxes": "\ue203",
"camera": "\ue301",
"chatboxes-filled": "\ue233",
"camera-filled": "\ue7ef",
"cart-filled": "\ue7f4",
"cart": "\ue7f5",
"checkbox-filled": "\ue442",
"checkbox": "\ue7fa",
"arrowleft": "\ue582",
"arrowdown": "\ue581",
"arrowright": "\ue583",
"smallcircle-filled": "\ue801",
"arrowup": "\ue580",
"circle": "\ue411",
"eye-filled": "\ue568",
"eye-slash-filled": "\ue822",
"eye-slash": "\ue823",
"eye": "\ue824",
"flag-filled": "\ue825",
"flag": "\ue508",
"gear-filled": "\ue532",
"reload": "\ue462",
"gear": "\ue502",
"hand-thumbsdown-filled": "\ue83b",
"hand-thumbsdown": "\ue83c",
"hand-thumbsup-filled": "\ue83d",
"heart-filled": "\ue83e",
"hand-thumbsup": "\ue83f",
"heart": "\ue840",
"home": "\ue500",
"info": "\ue504",
"home-filled": "\ue530",
"info-filled": "\ue534",
"circle-filled": "\ue441",
"chat-filled": "\ue847",
"chat": "\ue263",
"mail-open-filled": "\ue84d",
"email-filled": "\ue231",
"mail-open": "\ue84e",
"email": "\ue201",
"checkmarkempty": "\ue472",
"list": "\ue562",
"locked-filled": "\ue856",
"locked": "\ue506",
"map-filled": "\ue85c",
"map-pin": "\ue85e",
"map-pin-ellipse": "\ue864",
"map": "\ue364",
"minus-filled": "\ue440",
"mic-filled": "\ue332",
"minus": "\ue410",
"micoff": "\ue360",
"mic": "\ue302",
"clear": "\ue434",
"smallcircle": "\ue868",
"close": "\ue404",
"closeempty": "\ue460",
"paperclip": "\ue567",
"paperplane": "\ue503",
"paperplane-filled": "\ue86e",
"person-filled": "\ue131",
"contact-filled": "\ue130",
"person": "\ue101",
"contact": "\ue100",
"images-filled": "\ue87a",
"phone": "\ue200",
"images": "\ue87b",
"image": "\ue363",
"image-filled": "\ue877",
"location-filled": "\ue333",
"location": "\ue303",
"plus-filled": "\ue439",
"plus": "\ue409",
"plusempty": "\ue468",
"help-filled": "\ue535",
"help": "\ue505",
"navigate-filled": "\ue884",
"navigate": "\ue501",
"mic-slash-filled": "\ue892",
"search": "\ue466",
"settings": "\ue560",
"sound": "\ue590",
"sound-filled": "\ue8a1",
"spinner-cycle": "\ue465",
"download-filled": "\ue8a4",
"personadd-filled": "\ue132",
"videocam-filled": "\ue8af",
"personadd": "\ue102",
"upload": "\ue402",
"upload-filled": "\ue8b1",
"starhalf": "\ue463",
"star-filled": "\ue438",
"star": "\ue408",
"trash": "\ue401",
"phone-filled": "\ue230",
"compose": "\ue400",
"videocam": "\ue300",
"trash-filled": "\ue8dc",
"download": "\ue403",
"chatbubble-filled": "\ue232",
"chatbubble": "\ue202",
"cloud-download": "\ue8e4",
"cloud-upload-filled": "\ue8e5",
"cloud-upload": "\ue8e6",
"cloud-download-filled": "\ue8e9",
"headphones":"\ue8bf",
"shop":"\ue609"
}
pages.json
...@@ -361,8 +361,7 @@ ...@@ -361,8 +361,7 @@
"navigationBarTitleText": "学习统计", "navigationBarTitleText": "学习统计",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}
},
{ {
"path" : "pages/personalCenter/system/accontsetting", "path" : "pages/personalCenter/system/accontsetting",
"style" : "style" :
......
pages/invitationRegister/invitationRegister.vue
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<text>欢迎使用CFFP</text> <text>欢迎使用CFFP</text>
</view> </view>
<view class="inviteInfo"> <view class="inviteInfo">
<text>XXX邀请您申请为</text> <text>{{invitationName}}邀请您申请为</text>
<text>北京区域胜利服务中心事业伙伴</text> <text>{{areaName}}</text>
</view> </view>
<view class="register" @click="ckregister()"> <view class="register" @click="ckregister()">
<text>点击注册</text> <text>点击注册</text>
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
export default { export default {
data() { data() {
return { return {
areaName:'',
invitationName:''
} }
}, },
onLoad(options) { onLoad(options) {
...@@ -32,11 +33,14 @@ ...@@ -32,11 +33,14 @@
console.log(id) console.log(id)
api.queryById(id).then(res =>{ api.queryById(id).then(res =>{
console.log(res, 77414) console.log(res, 77414)
this.areaName = res.data.data.areaName
this.invitationName = res.data.data.invitationName
this.mobileNumber = res.data.data.mobileNumber
}) })
}, },
ckregister(){ ckregister(){
uni.navigateTo({ uni.navigateTo({
url:'/pages/invitationRegister/invitationlogin' url:'/pages/invitationRegister/invitationlogin?invitationName=' + this.invitationName + '&mobileNumber=' + this.mobileNumber
}) })
} }
} }
......
pages/invitationRegister/invitationlogin.vue
...@@ -48,12 +48,17 @@ ...@@ -48,12 +48,17 @@
remainTimes:60, remainTimes:60,
sendCodeHtml:'获取验证码', sendCodeHtml:'获取验证码',
form:{ form:{
name: '张麻花', name: '',
mobile: '18335619248', mobile: '',
code: '' code: ''
} }
} }
}, },
onLoad(option) {
console.log(option, 555)
this.form.name = option.invitationName
this.form.mobile = option.mobileNumber
},
methods:{ methods:{
sendMessage(){ sendMessage(){
const params = { const params = {
......
pages/inviteJoin/inviteJoin.vue
...@@ -27,6 +27,11 @@ ...@@ -27,6 +27,11 @@
</picker> </picker>
</text> </text>
</view> </view>
<view class="liBox" v-if="applyIdentity == 0">
<text>工作室名称：</text>
<text><input v-model="dataForm.b1Name" class="uni-input"
placeholder="工作室名称" /></text>
</view>
<view class="liBox"> <view class="liBox">
<text>所属组织：</text> <text>所属组织：</text>
<text> <text>
...@@ -92,6 +97,9 @@ ...@@ -92,6 +97,9 @@
<text v-else-if="item.approvalStatus=='3'" class="success">邀请成功</text> <text v-else-if="item.approvalStatus=='3'" class="success">邀请成功</text>
<text v-else class="fail">邀请失败</text> <text v-else class="fail">邀请失败</text>
</view> </view>
<view class="liBox-footer" v-if="item.approvalStatus == 0 || item.approvalStatus== '2'" @click="reinvite()">
<text>重新邀请</text>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -133,6 +141,7 @@ ...@@ -133,6 +141,7 @@
userId: '32', // 目前Id 为1 userId: '32', // 目前Id 为1
name: '', //姓名 name: '', //姓名
mobileNumber: '', //被邀请人手机号 mobileNumber: '', //被邀请人手机号
b1Name:'', // 工作室
partnerLevel: '', //被邀请人身份 partnerLevel: '', //被邀请人身份
hasCrossDistrict: '', //是否跨区邀请 hasCrossDistrict: '', //是否跨区邀请
areaId: '', //所属组织Id areaId: '', //所属组织Id
...@@ -192,7 +201,7 @@ ...@@ -192,7 +201,7 @@
return false return false
} }
} }
this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'A1' : 'B1' this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'B1' : 'A1'
this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0' this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0'
this.dataForm.areaId = this.queryorgList[this.index].areaId this.dataForm.areaId = this.queryorgList[this.index].areaId
this.dataForm.areaName = this.isCross == false ? this.queryorgList[this.index].areaName : '' this.dataForm.areaName = this.isCross == false ? this.queryorgList[this.index].areaName : ''
...@@ -215,6 +224,9 @@ ...@@ -215,6 +224,9 @@
closeShare() { closeShare() {
this.$refs.share.close() this.$refs.share.close()
}, },
reinvite(){
this.$refs.share.open()
},
uniShare(type) { uniShare(type) {
if (type === 1) { if (type === 1) {
uni.share({ uni.share({
...@@ -418,7 +430,16 @@ ...@@ -418,7 +430,16 @@
} }
} }
.liBox-footer{
width: 200rpx;
height: 50rpx;
color: #FFFFFF;
margin-top: 10rpx;
text-align: center;
line-height: 50rpx;
border-radius: 30rpx;
background: #20269B;
}
.popup-footer { .popup-footer {
color: #666; color: #666;
font-size: 36rpx; font-size: 36rpx;
...@@ -428,5 +449,6 @@ ...@@ -428,5 +449,6 @@
align-items: center; align-items: center;
padding-top: 36rpx; padding-top: 36rpx;
} }
} }
</style> </style>
pages/personalCenter/myTeam.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
} }
.liBox{ .liBox{
display: flex; display: flex;
margin: 10px 30px; margin: 50px 30px;
padding: 8px 0; padding: 8px 0;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #F2F2F2; border-bottom: 1px solid #F2F2F2;
......
pages/personalCenter/teamMembers/jurisdiction.vue
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
合计：{{item.rank}} 合计：{{item.rank}}
</view> </view>
<view class=""> <view class="">
<myteam-table :datatitleList="datatitleList" :dataList="raiseList" type="2"></myteam-table> <lazy-tree :datatitleList="datatitleList" :dataList="dataList" type="1"></lazy-tree>
<!-- <myteam-table :datatitleList="datatitleList" :dataList="raiseList" type="2"></myteam-table> -->
<!-- <view class="table-content"> <!-- <view class="table-content">
<span>辖下组织/成员</span> <span>辖下组织/成员</span>
<span>职级</span> <span>职级</span>
...@@ -29,7 +30,8 @@ ...@@ -29,7 +30,8 @@
</template> </template>
<script> <script>
import MyteamTable from '@/components/myteam/myteam-table.vue'; // import MyteamTable from '@/components/myteam/myteam-table.vue';
import lazyTree from '@/components/myteam/lazy-tree.vue';
export default { export default {
props:{ props:{
raiseList:{ raiseList:{
...@@ -37,7 +39,8 @@ ...@@ -37,7 +39,8 @@
} }
}, },
components:{ components:{
MyteamTable // MyteamTable
lazyTree
}, },
mounted() { mounted() {
this.dataList = this.raiseList this.dataList = this.raiseList
......
pages/personalCenter/teamMembers/members.vue
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
<view style="text-align: right;margin: 20px;"> <view style="text-align: right;margin: 20px;">
总合计：{{count}} 总合计：{{count}}
</view> </view>
<view class="table-content">
</view>
<view class=""> <view class="">
<myteam-table :datatitleList="datatitleList" :dataList="dataList" type="1"></myteam-table> <lazy-tree v-if="dataList" :datatitleList="datatitleList" :dataList="dataList" type="1"></lazy-tree>
<!-- <myteam-table :datatitleList="datatitleList" :dataList="dataList" type="1"></myteam-table> -->
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import MyteamTable from '@/components/myteam/myteam-table.vue'; // import MyteamTable from '@/components/myteam/myteam-table.vue';
import lazyTree from '@/components/myteam/lazy-tree.vue';
export default { export default {
props: { props: {
directList: { directList: {
...@@ -32,22 +32,23 @@ ...@@ -32,22 +32,23 @@
} }
}, },
components:{ components:{
MyteamTable lazyTree
}, },
data() { data() {
return { return {
datatitleList:['辖下组织/成员','职级','成员数量'], datatitleList:['辖下组织/成员','职级','成员数量'],
dataList: [] dataList: null
} }
}, },
mounted(){ mounted(){
// this.dataList = this.directList.map((x,index) => ({ // this.dataList = this.directList.map((x,index) => ({
// name:x.name, // areaCenterName:x.areaCenterName,
// levelName:x.levelName, // levelName:x.levelName,
// courserNum: x.courserNum // count: x.count,
// parentId: x.parentId? x.parentId : '0'
// })) // }))
this.dataList = this.directList this.dataList = this.directList
console.log(this.directList, 74852) console.log(this.dataList, 74852)
} }
} }
</script> </script>
......
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -61,7 +61,15 @@ ...@@ -61,7 +61,15 @@
this.levelName = res.data.orgInfo.levelName; this.levelName = res.data.orgInfo.levelName;
this.count = res.data.orgInfo.count; this.count = res.data.orgInfo.count;
this.directList = res['data']['directList']; this.directList = res['data']['directList'];
this.directList.forEach((x)=>{
this.$set(x, 'hasChildren' , true)
this.$set(x, 'children' , [])
})
this.raiseList = res['data']['raiseList']; this.raiseList = res['data']['raiseList'];
this.raiseList.forEach((x)=>{
this.$set(x, 'hasChildren', true)
this.$set(x, 'children' , [])
})
this.otherList = res['data']['other']; this.otherList = res['data']['other'];
} }
}) })
...@@ -92,6 +100,7 @@ ...@@ -92,6 +100,7 @@
height: 100%; height: 100%;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
padding-top: 50px;
.tabTitle { .tabTitle {
color: #666666; color: #666666;
......
pages/personalCenter/teamPerformance/teamPerformance.vue
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<view class="content"> <view class="content">
<view class="header"> <view class="header">
<view class="timeSelectContent"> <view class="timeSelectContent">
<time-picker v-if="fields" @change="change" :fields="fields"> <time-picker @change="change" fields="month">
</time-picker> </time-picker>
</view> </view>
<view class="timeSelectContent"> <!-- <view class="timeSelectContent">
<picker @change="bindPickerChange" :value="index" :range="array"> <picker @change="bindPickerChange" :value="index" :range="array">
<view class="uni-input">{{array[index] || "选择季度"}} </view> <view class="uni-input">{{array[index] || "选择季度"}} </view>
</picker> </picker>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<picker @change="mountdchange" :value="montdindex" :range="mountdList"> <picker @change="mountdchange" :value="montdindex" :range="mountdList">
<view class="uni-input"> {{mountdList[montdindex] || "选择月份"}} </view> <view class="uni-input"> {{mountdList[montdindex] || "选择月份"}} </view>
</picker> </picker>
</view> </view> -->
</view> </view>
<view class="content-btn"> <view class="content-btn">
<view class="" v-for="(item,index) in teamList" :key="index"> <view class="" v-for="(item,index) in teamList" :key="index">
...@@ -28,12 +28,17 @@ ...@@ -28,12 +28,17 @@
</view> </view>
<view class="classtotal"> <view class="classtotal">
<view class="classtotal-box"> <view class="classtotal-box">
<span class="totalsingular">666</span> <span v-if="totalOrder" class="totalsingular">￥{{totalOrder}}</span>
<p>总单数</p> <p>总单数</p>
</view> </view>
<view class="classtotal-box"> <view class="classtotal-box">
<span class="totalsingular">￥89.25.00</span> <span class="totalsingular">￥{{totalCoursePrice}}</span>
<p>销售额</p> <p>总销售额</p>
<p style="font-size: 5px;">温馨提示：业绩以最终核算为准</p>
</view>
<view class="classtotal-box">
<span class="totalsingular">￥{{totalIncome}}</span>
<p>总销售收入</p>
</view> </view>
</view> </view>
<view class="team"> <view class="team">
...@@ -44,17 +49,19 @@ ...@@ -44,17 +49,19 @@
<text>团队排名</text> <text>团队排名</text>
</view> </view>
<view class="team-c"> <view class="team-c" @click="sortswitch()">
<text>按单数排</text> <text v-if="teListsort == true">按销售额收入排序</text>
<text v-else>按销售额排序</text>
</view> </view>
</view> </view>
<view class=""> <view class="">
<myteam-table :datatitleList="datatitleList" :dataList="dataList"></myteam-table> <myteam-table :datatitleList="datatitleList" :dataList="dataList" felTyle="achievement"></myteam-table>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import api from "../../../api/api";
import TimePicker from '@/components/myteam/time-picker.vue'; import TimePicker from '@/components/myteam/time-picker.vue';
import MyteamTable from '@/components/myteam/myteam-table.vue'; import MyteamTable from '@/components/myteam/myteam-table.vue';
export default { export default {
...@@ -64,14 +71,17 @@ ...@@ -64,14 +71,17 @@
}, },
data() { data() {
return { return {
fields: 'year', datatitleList: ['姓名', '所属组织', '单数', '销售额', '销售收入'],
datatitleList: ['排名', '所属组织', '姓名', '单数', '销售额'],
teamList: ['直属团队', '所辖团队', '其他'], teamList: ['直属团队', '所辖团队', '其他'],
teamtype: 0, teamtype: 0,
montdindex: 0, montdindex: 0,
array: ['一季度', '二季度', '三季度', '四季度'], array: ['一季度', '二季度', '三季度', '四季度'],
mountdList: [], mountdList: [],
index: 0, index: 0,
totalOrder: Number, //总单数
totalCoursePrice: Number, // 总销售额
totalIncome: Number, //总销售收入
teListsort: true,
multiArray: [{ multiArray: [{
name: '', name: '',
id: 1 id: 1
...@@ -89,27 +99,18 @@ ...@@ -89,27 +99,18 @@
id: 4 id: 4
} }
], ],
dataList: [{ CffpOrgInfoReqVO: {
title: '所属组织1', userId: '1',
rank: 1, queryDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
name: 'sun', queryType: '',
recommend: '很好' courseOrPolicy: '1'
}, },
{ dataList: []
title: '所属组织2',
rank: 1,
name: 'sun',
recommend: '很好'
},
{
title: '所属组织3',
rank: 1,
name: 'sun',
recommend: '很好'
},
]
} }
}, },
onLoad() {
this.getqueryTeamAchievement()
},
methods: { methods: {
bindPickerChange(e) { bindPickerChange(e) {
this.index = e.detail.value this.index = e.detail.value
...@@ -130,12 +131,43 @@ ...@@ -130,12 +131,43 @@
break break
} }
}, },
// 获取列表数据
getqueryTeamAchievement() {
this.CffpOrgInfoReqVO.queryType = this.teamtype + 1
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
if (res) {
this.dataList = res.data.list
this.totalOrder = res.data.totalOrder
this.totalCoursePrice = res.data.totalCoursePrice
this.totalIncome = res.data.totalIncome
// var dataForm = {
// courseIncome: 20,
// coursePrice: 1455555555,
// orderNum: 2
// }
// this.dataList.push(dataForm)
}
})
},
sortswitch() {
this.teListsort = !this.teListsort
this.dataList.sort((a, b) => {
//排序基于的数据
if (this.teListsort == false) {
return b.courseIncome - a.courseIncome;
} else {
return b.coursePrice - a.coursePrice;
}
})
},
mountdchange(e) { mountdchange(e) {
this.montdindex = e.detail.value this.montdindex = e.detail.value
}, },
ckteam(e) { ckteam(e) {
this.teamtype = e this.teamtype = e
console.log(e, ) this.getqueryTeamAchievement()
}, },
// 这个是时间组件返回的时间值 // 这个是时间组件返回的时间值
change(time) { change(time) {
...@@ -215,7 +247,12 @@ ...@@ -215,7 +247,12 @@
flex: 1; flex: 1;
padding-top: 20px; padding-top: 20px;
text-align: center; text-align: center;
// border: 1px solid #20279B; // border: 1px solid #20279B;
p {
margin-top: 8px;
color: #666666;
}
} }
.totalsingular { .totalsingular {
...@@ -247,7 +284,6 @@ ...@@ -247,7 +284,6 @@
} }
.team-c { .team-c {
width: 72px;
height: 20px; height: 20px;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment