Merge branch 'feature/GFRS-232【待确定】业绩查询' into dev

This commit is contained in:
huichao
2020-07-29 09:38:56 +08:00
3 changed files with 52 additions and 43 deletions

View File

@@ -65,7 +65,7 @@
</div>
</div>
</div>
<div v-if="flagGo=='4'" class="ml15">今日休息</div>
<div v-if="flagGo=='4'" class="ml15">{{text2}}</div>
</div>
</template>
<script>
@@ -174,12 +174,15 @@ export default {
this.offWorkTime = this.offWorkTime.split(' ')[1]
this.text1 = '早退'
}
if(this.flagGo=="4"){
this.text2='今日休息'
}
}
})
}else{
this.flagGo="2"
this.flagOff="3"
this.text1='打卡'
this.flagGo="4"
this.flagOff="4"
this.text2='打卡记录'
this.count='0'
this.amount='0'
this.offWorkTime=''
@@ -227,13 +230,16 @@ export default {
if (this.flagOff == '3') {
this.offWorkTime = this.offWorkTime.split(' ')[1]
this.text1 = '早退'
}
if(this.flagGo=="4"){
this.text2='今日休息'
}
}
})
}else{
this.flagGo="2"
this.flagOff="3"
this.text1='打卡'
this.flagGo="4"
this.flagOff="4"
this.text2='打卡记录'
this.count='0'
this.amount='0'
this.offWorkTime=''

View File

@@ -75,7 +75,7 @@
<table class="main-table bg-white">
<tr v-for="(item1,index1) in list" :key="index1">
<td>
<div class="name" >{{item1.name}}</div>
<div class="text-center" >{{item1.name}}</div>
</td>
<td>
<div class="name">{{item1.cbbb}}</div>
@@ -104,7 +104,6 @@ import { Popup, DatetimePicker, Sticky } from 'vant'
import { getBranchInfos, getPerformanceDetail } from '@/api/ebiz/performance/performance'
import utils from '@/assets/js/utils/date-utils'
export default {
name: 'attendance',
components: {
[Popup.name]: Popup,
[DatetimePicker.name]: DatetimePicker,
@@ -202,7 +201,7 @@ export default {
// console.log(this.agentCode)
let code = {
date: this.dateTime,
groupList: this.arr1,
groupList: [1,2,3],
}
// console.log(code)
getPerformanceDetail(code).then((res) => {

View File

@@ -70,18 +70,21 @@
<div class="red">{{zcbf}}</div>
</div>
</div>-->
<div class="h50 bg-white content mh-auto fs13 fw500 mt5" v-if="isShow">
<div v-if="isShow">
<div class="h50 bg-white content mh-auto fs13 fw500 mt5" >
<div class="pl10 pr10 pt15 flex justify-content-s align-items-c">
<div>本月预收标保</div>
<div class="red">{{ysbb}}</div>
</div>
</div>
<div class="h50 bg-white content mh-auto fs13 fw500 mt5" v-if="isShow">
<div class="h50 bg-white content mh-auto fs13 fw500 mt5" >
<div class="pl10 pr10 pt15 flex justify-content-s align-items-c">
<div>本月预收件数</div>
<div class="red">{{ysjs}}</div>
</div>
</div>
</div>
<!-- <div class="h50 bg-white content mh-auto fs13 fw500 mt5" v-if="isShow">
<div class="pl10 pr10 pt15 flex justify-content-s align-items-c">
<div>本月预收FYC</div>
@@ -89,13 +92,17 @@
</div>
</div>-->
</div>
<div v-if="mask1" class="h40 bg-red absolute bottom0 footer text-center fs14 fw500 white" @click="checkTeam(obj)" >查看团队业绩</div>
<div >
<div class="h40 bg-red absolute bottom0 footer text-center fs13 fw500 white" v-if="mask1" @click="checkTeam(obj)">
{{footerText}}
</div>
</div>
</div>
</template>
<script>
import { getBaseAgentInfo, getPerformanceHeader, getPerformanceDetail, getHeader } from '@/api/ebiz/performance/performance'
import utils from '@/assets/js/utils/date-utils'
import { Popup, DatetimePicker } from 'vant'
import { Popup, DatetimePicker,Button } from 'vant'
export default {
name: 'performance',
components: {
@@ -121,7 +128,7 @@ export default {
ysjs: '',
cfyc: '0.00',
zcbf: '0.00',
ysbb: '0.00',
ysbb: '',
yfyc: '0.00',
timeCode: '',
mask: '',
@@ -131,10 +138,19 @@ export default {
code: '',
isShowImg: true,
buName:'',
mask1:true
mask1:false,
footerText:''
}
},
created() {
if(this.mask=="1"){
this.getPerformanceDetailC()
}
this.formatDate1()
this.getBaseAgentInfo1()
if (this.code !== '') {
this.getHeader1()
}
setTimeout(() => {
// eslint-disable-next-line no-undef
EWebBridge.webCallAppInJs('webview_right_button', {
@@ -146,17 +162,7 @@ export default {
],
})
}, 2000)
if (this.code == '') {
// this.getPerformanceHeader1()
}
if(this.mask=="1"){
this.getPerformanceDetailC()
}
this.formatDate1()
this.getBaseAgentInfo1()
if (this.code !== '') {
this.getHeader1()
}
},
mounted() {
window.appCallBack = this.appCallBack
@@ -245,11 +251,14 @@ export default {
(this.areaCode = res.areaCode)
if (this.agentGrade.slice(0, 2) == 'A1') {
this.mask1 = false
this.footerText=''
}else if (this.agentGrade.slice(0, 2) == 'A2') {
this.mask1 = true
this.footerText='查看团队业绩'
;(this.obj.unitName = this.unitName), (this.obj.code = this.branchCode)
} else if (this.agentGrade.slice(0, 2) == 'A3') {
this.mask1 = true
this.footerText='查看团队业绩'
;(this.obj.unitName = this.saleArea), (this.obj.code = this.deptCode)
} else if (this.agentGrade.slice(0, 2) == 'A4') {
}
@@ -308,6 +317,7 @@ export default {
console.log("我已经离开了!");
window.localStorage.removeItem('parmas1');
window.localStorage.removeItem('parmas2');
window.localStorage.removeItem('obj1')
},
}
</script>
@@ -322,14 +332,8 @@ export default {
width: 100%;
line-height: 40px;
}
.footer1 {
width: 100%;
line-height: 40px;
}
[v-cloak] {
:footer([v-cloak]) {
display:none !important;
}
.content1 {
width: 100%;