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

This commit is contained in:
huichao
2020-07-28 18:17:45 +08:00
2 changed files with 17 additions and 2 deletions

View File

@@ -167,9 +167,11 @@ export default {
this.text1 = '缺勤' this.text1 = '缺勤'
} }
if (this.flagGo == '2') { if (this.flagGo == '2') {
this.goWorkTime = this.goWorkTime.split(' ')[1]
this.text1 = '迟到' this.text1 = '迟到'
} }
if (this.flagOff == '3') { if (this.flagOff == '3') {
this.offWorkTime = this.offWorkTime.split(' ')[1]
this.text1 = '早退' this.text1 = '早退'
} }
} }
@@ -219,9 +221,11 @@ export default {
this.text1 = '缺勤' this.text1 = '缺勤'
} }
if (this.flagGo == '2') { if (this.flagGo == '2') {
this.offWorkTime = this.offWorkTime.split(' ')[1]
this.text1 = '迟到' this.text1 = '迟到'
} }
if (this.flagOff == '3') { if (this.flagOff == '3') {
this.offWorkTime = this.offWorkTime.split(' ')[1]
this.text1 = '早退' this.text1 = '早退'
} }
} }

View File

@@ -1,5 +1,5 @@
<template> <template>
<div> <div v-cloak>
<div <div
class="border-gb mt20 header mh-auto van-cell:not(:last-child)::after h50 flex align-items-c" class="border-gb mt20 header mh-auto van-cell:not(:last-child)::after h50 flex align-items-c"
> >
@@ -89,7 +89,7 @@
</div> </div>
</div>--> </div>-->
</div> </div>
<div class="h40 bg-red footer absolute bottom0 text-center fs14 fw500 white" @click="checkTeam(obj)" v-if="mask1">查看团队业绩</div> <div v-if="mask1" class="h40 bg-red absolute bottom0 footer text-center fs14 fw500 white" @click="checkTeam(obj)" >查看团队业绩</div>
</div> </div>
</template> </template>
<script> <script>
@@ -246,8 +246,10 @@ export default {
if (this.agentGrade.slice(0, 2) == 'A1') { if (this.agentGrade.slice(0, 2) == 'A1') {
this.mask1 = false this.mask1 = false
}else if (this.agentGrade.slice(0, 2) == 'A2') { }else if (this.agentGrade.slice(0, 2) == 'A2') {
this.mask1 = true
;(this.obj.unitName = this.unitName), (this.obj.code = this.branchCode) ;(this.obj.unitName = this.unitName), (this.obj.code = this.branchCode)
} else if (this.agentGrade.slice(0, 2) == 'A3') { } else if (this.agentGrade.slice(0, 2) == 'A3') {
this.mask1 = true
;(this.obj.unitName = this.saleArea), (this.obj.code = this.deptCode) ;(this.obj.unitName = this.saleArea), (this.obj.code = this.deptCode)
} else if (this.agentGrade.slice(0, 2) == 'A4') { } else if (this.agentGrade.slice(0, 2) == 'A4') {
} }
@@ -320,6 +322,15 @@ export default {
width: 100%; width: 100%;
line-height: 40px; line-height: 40px;
} }
.footer1 {
width: 100%;
line-height: 40px;
}
[v-cloak] {
display:none !important;
}
.content1 { .content1 {
width: 100%; width: 100%;
overflow-x: scroll; overflow-x: scroll;