diff --git a/pages/center/Piabodata/Employeesstatistics.vue b/pages/center/Piabodata/Employeesstatistics.vue index 6c2850a..d714c8e 100644 --- a/pages/center/Piabodata/Employeesstatistics.vue +++ b/pages/center/Piabodata/Employeesstatistics.vue @@ -504,6 +504,7 @@ tabtimetap(index, text) { if (index == 3) { this.totalTimeShow = true; + this.screenShow = false } else { this.screenShow = false this.showTimeText = text @@ -571,7 +572,7 @@ .boxtittab { width: 100%; flex-direction: column; - + border: none; .tabbox { width: 100%; } diff --git a/pages/center/Piabodata/StaffAnalysis.vue b/pages/center/Piabodata/StaffAnalysis.vue index c231734..b12611a 100644 --- a/pages/center/Piabodata/StaffAnalysis.vue +++ b/pages/center/Piabodata/StaffAnalysis.vue @@ -621,6 +621,7 @@ tabtimetap(index, text) { if (index == 3) { this.totalTimeShow = true; + this.screenShow = false } else { this.screenShow = false this.showTimeText = text @@ -709,7 +710,7 @@ .boxtittab { width: 100%; flex-direction: column; - + border: none; .tabbox { width: 100%; } diff --git a/pages/center/Piabodata/Theteamcompared.vue b/pages/center/Piabodata/Theteamcompared.vue index c8c4543..49b735b 100644 --- a/pages/center/Piabodata/Theteamcompared.vue +++ b/pages/center/Piabodata/Theteamcompared.vue @@ -545,6 +545,7 @@ tabtimetap(index, text) { if (index == 3) { this.totalTimeShow = true; + this.screenShow = false } else { this.screenShow = false this.showTimeText = text @@ -955,7 +956,7 @@ .boxtittab { width: 100%; flex-direction: column; - + border: none; .tabbox { width: 100%; } diff --git a/pages/center/Piabodata/TrendAnalysis.vue b/pages/center/Piabodata/TrendAnalysis.vue index 845a2a2..09b0e7b 100644 --- a/pages/center/Piabodata/TrendAnalysis.vue +++ b/pages/center/Piabodata/TrendAnalysis.vue @@ -111,9 +111,8 @@ - + {{lopanobj.name}} @@ -323,7 +322,8 @@ accountId: '', //顾问ids marketingId: '', //二级销讲id deptId: "", //部门id - showStatus: 0 + showStatus: 0, + marketingBusiness: '', }, linetype: "line", lineOptsect: {}, //图表数据 @@ -524,6 +524,9 @@ }, init() { + if (this.marketingBusiness) { + this.pamect.marketingBusiness = this.marketingBusiness + } this.$u.post("/cusLvStatistics/lyAndcp", this.pamect).then(data => { this.pamect.lastStartDate = data.lastStartDate; this.pamect.lastEndDate = data.lastEndDate; @@ -722,6 +725,9 @@ series: [] }; this.linetype = "line"; + if (this.marketingBusiness) { + this.pamect.marketingBusiness = this.marketingBusiness + } this.$u.post("/cusLvStatistics/teamOrOneValueShow", this.pamect).then(data => { if (this.pamect.showStatus == 0) { that.lineOptsect = { @@ -1133,7 +1139,8 @@ //获取团队列表 getuanduilist() { this.$u.post("/cusLvStatistics/findAllDeptIdByHouseId ", { - houseId: this.pamect.houseId + houseId: this.pamect.houseId, + marketingBusiness: this.marketingBusiness, }).then(data => { this.selectlist4 = [{ value: "", @@ -1170,6 +1177,9 @@ }; this.linetype = "line"; this.$forceUpdate() + if (this.marketingBusiness) { + this.pamect.marketingBusiness = this.marketingBusiness + } this.$u.post("/cusLvStatistics/teamOrOneValueShowByDept", this.pamect).then(data => { if (this.Selecttuanduiobj.id == "") { var newlist = []; diff --git a/pages/center/Piabodata/Userinsightinto.vue b/pages/center/Piabodata/Userinsightinto.vue index b864b02..ef1263a 100644 --- a/pages/center/Piabodata/Userinsightinto.vue +++ b/pages/center/Piabodata/Userinsightinto.vue @@ -341,6 +341,7 @@ tabtimetap(index, text) { if (index == 3) { this.totalTimeShow = true; + this.screenShow = false } else { this.screenShow = false this.showTimeText = text @@ -391,7 +392,7 @@ .boxtittab { width: 100%; flex-direction: column; - + border: none; .tabbox { width: 100%; } diff --git a/pages/center/Piabodata/index.vue b/pages/center/Piabodata/index.vue index 80890c9..a26df53 100644 --- a/pages/center/Piabodata/index.vue +++ b/pages/center/Piabodata/index.vue @@ -635,6 +635,7 @@ tabtimetap(index, text) { if (index == 3) { this.totalTimeShow = true; + this.screenShow = false } else { this.screenShow = false this.showTimeText = text @@ -783,6 +784,7 @@ .boxtittab { width: 100%; flex-direction: column; + border: none; .tabbox { width: 100%; diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index 9d2ff2e..de95e77 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -84,23 +84,53 @@ - - - {{item.agentName || '--'}} - 代接待 + + + + {{item.agentName}} + 代接待 + {{item.receptionStatusName || ''}} + + + + {{item.validInvalidName||''}} + + 违禁接待 + | + + 未标记 + 已标记 + + + 无录音 + - - - - - 客户:{{item.name || '--'}} | - {{item.visitRecord || '0'}}次到访 + + {{item.createTime}} | {{item.mm || '0'}}min + + + 客户:{{item.name || '--'}} + 销讲业务:{{ item.marketingBusinessName || '--' }} + + + + {{item.visitRecord|| 0}} + 访问次数 + + + {{item.wordFraction||0}}% + 挖掘执行 + + + {{item.wordFinishFraction|| 0}}% + 挖掘成功 + + + {{item.fraction|| 0}}% + 销讲执行率 - {{item.fraction || '0'}}% - - - {{item.createTime}} | {{item.mm || 0}}min + @@ -1350,117 +1380,147 @@ .tabactive1 { padding-bottom: 100rpx; - .content-tips { - background: #fff; - padding: 0 30rpx; - box-sizing: border-box; - overflow: hidden; - margin-bottom: 20rpx; - border-bottom: 20rpx solid #f8f8f8; - .content-first { - margin-top: 19rpx; + .content-tips { + background: #fff; + box-sizing: border-box; + overflow: hidden; + margin: 0 0 20rpx 0; + padding: 30rpx; + + .content-first { + display: flex; + justify-content: space-between; + + .left { display: flex; - justify-content: space-between; + align-items: center; - .left { - display: flex; + .img { + width: 52rpx; + height: 52rpx; + background: #FFFFFF; + border: 1px solid #C9C9C9; + border-radius: 50%; + text-align: center; + line-height: 52rpx; + } - .img { - width: 52rpx; - height: 52rpx; - background: #FFFFFF; - border: 1px solid #C9C9C9; - border-radius: 50%; - text-align: center; - line-height: 52rpx; - margin-right: 20rpx; - } + .name { + font-weight: 600; + color: #333333; + margin-right: 10rpx; + font-size: 30rpx; + } - .name { - font-weight: 600; - color: #333333; - // margin-left: 20rpx; - margin-top: 11rpx; - } + .status { + width: 110rpx; + height: 42rpx; + background: #FFF9F5; + border-radius: 4rpx; + font-size: 26rpx; + font-weight: 400; + color: #EC8D49; + line-height: 42rpx; + text-align: center; + margin: 0 10rpx; + } - .status { - width: 110rpx; - height: 42rpx; - background: #FFF9F5; - border-radius: 4rpx; - font-size: 26rpx; - font-weight: 400; - color: #EC8D49; - line-height: 42rpx; - text-align: center; - margin-left: 19rpx; - margin-top: 11rpx; - } + .normal-status { + color: red; } + } - .right { - display: flex; - margin-top: 11rpx; + .right { + display: flex; + margin-top: 11rpx; - .point { - width: 12rpx; - height: 12rpx; - background: #2B6EFF; - border-radius: 50%; - margin-right: 9rpx; - margin-top: 16rpx; + .point { + width: 12rpx; + height: 12rpx; + background: #2B6EFF; + border-radius: 50%; + margin-right: 9rpx; + margin-top: 16rpx; - } } } + } + .content-sec { + display: flex; + justify-content: space-between; + margin: 24rpx 0; - .content-sec { - display: flex; - justify-content: space-between; - margin-top: 19rpx; + .left { + flex-grow: 1; + height: 40rpx; + font-size: 28rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #333333; + line-height: 40rpx; + } - .left { - display: flex; + .right { + flex-shrink: 0; + width: 340rpx; + height: 40rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #333333; + line-height: 40rpx; + text-align: right; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + } - .cus { - font-size: 30rpx; - font-weight: 400; - color: #666666; - line-height: 30rpx; - } + .content-time { + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #333333; + line-height: 40rpx; + padding: 20rpx 0 24rpx; + border-bottom: 1px solid #E0E0E0; + } - .arriveNum { - font-size: 30rpx; - font-weight: 400; - line-height: 30rpx; - margin-left: 10rpx; - } - } + .content-last { + display: flex; + justify-content: space-around; - .right { - width: 192rpx; - height: 46rpx; - background: #F4F8FD; - border-radius: 6rpx; - text-align: center; - line-height: 46rpx; + .cont-item { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + + .count { + height: 42rpx; + font-size: 30rpx; + font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #2671E2; + color: #000000; + line-height: 42rpx; + margin-bottom: 16rpx; } - } - .content-last { - margin: 30rpx 0; - font-size: 30rpx; - font-weight: 400; - color: #666666; - line-height: 30rpx; + .text { + height: 32rpx; + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #666666; + line-height: 32rpx; + } } - } } + + } .tabactive2 { .tab2-tips { diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index 06f0702..96a273e 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -74,7 +74,7 @@ 客户:{{item.name || '--'}} - {{ item.marketingBusinessName }} + 销讲业务:{{ item.marketingBusinessName || '--' }} @@ -462,7 +462,7 @@ wajueVal: [], // 需求挖掘 xiaojiangVal: [], //销讲执行率 jiedaiVal: [], // 接待时长 - validInvalid: '' ,// 录音标识 + validInvalid: '', // 录音标识 marketingBusiness: '', // 选中销讲业务id , }, freeList: [], //顾问 @@ -1040,7 +1040,7 @@ margin: 24rpx 0; .left { - flex: 1; + flex-grow: 1; height: 40rpx; font-size: 28rpx; font-family: PingFangSC-Medium, PingFang SC; @@ -1050,7 +1050,8 @@ } .right { - flex: 1; + flex-shrink: 0; + width: 340rpx; height: 40rpx; font-size: 28rpx; font-family: PingFangSC-Regular, PingFang SC; @@ -1058,6 +1059,9 @@ color: #333333; line-height: 40rpx; text-align: right; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } } diff --git a/pages/mine/selectBuilding.vue b/pages/mine/selectBuilding.vue index f36161a..a76dabe 100644 --- a/pages/mine/selectBuilding.vue +++ b/pages/mine/selectBuilding.vue @@ -43,8 +43,14 @@ name: data.propertyName } uni.setStorageSync("buildingID", lopan); - uni.navigateBack({ - delta: -1 + this.$u.post('/user/addLoginCount', { houseId: data.id}).then(res=> { + uni.navigateBack({ + delta: -1 + }) + }).catch(() => { + uni.navigateBack({ + delta: -1 + }) }) }, init(e) {