diff --git a/pages/center/Piabodata/Employeesstatistics.vue b/pages/center/Piabodata/Employeesstatistics.vue index 0e96a00..c631426 100644 --- a/pages/center/Piabodata/Employeesstatistics.vue +++ b/pages/center/Piabodata/Employeesstatistics.vue @@ -217,9 +217,9 @@ {{item.name.substring(0,4)}} - - - + + + {{item.zxl==null?0:item.zxl}}次 @@ -316,6 +316,10 @@ let index0 = this.newlisttabinfo4.result[0] let percent = num/(index0.zxl) * 100 return percent.toFixed(2) + }else if(this.newlisttabinfo5.result&&this.newlisttabinfo5.result.length&&type==5){ + let index0 = this.newlisttabinfo5.result[0] + let percent = num/(index0.zxl) * 100 + return percent.toFixed(2) }else{ return 0 } diff --git a/pages/center/consumer/newFollowup/newFollowup.vue b/pages/center/consumer/newFollowup/newFollowup.vue index 921f192..9767bb6 100644 --- a/pages/center/consumer/newFollowup/newFollowup.vue +++ b/pages/center/consumer/newFollowup/newFollowup.vue @@ -1,20 +1,17 @@ @@ -85,8 +81,11 @@ selectTipshow: false, buildingID: '', keyword: '', + stageIndex: '', screen: { - state: '0', + stageId: '', + stageCode: '', + stageName: '', con: "", level: '1' }, @@ -115,13 +114,18 @@ // this.getMyCustom() // this.getFreeList() this.getNewStatus() - this.getCustomerType(); }, methods: { - //选择顾问 + //最新状态 actionSelectCallback(e) { - this.screen.agentId = e[0].value; - this.screen.agentIdtext = e[0].label; + console.log(e) + this.screen.stageId = e[0].value; + this.screen.stageName = e[0].label; + this.stateList.forEach((item, index) => { + if (item.stageName == this.screen.stageName) { + this.screen.stageCode = item.stageCode + } + }) }, getCustomerType() { this.$u.get("/customer/queryKeyWords").then(res => { @@ -132,20 +136,24 @@ }) }, getNewStatus() { - var that = this; let premo = { houseId: uni.getStorageSync('buildingID').id } this.$u.post('/customer/getStage', premo) .then(res => { - res.map((item, index) => { - if (item.stageName == this.clientStageName) { - this.screen.state = index - } - }) + if(res&& res.length){ + res.forEach((item, index) => { + if (item.stageName == this.clientStageName) { + this.screen.stageId=res[index].id + this.screen.stageCode=res[index].stageCode + this.screen.stageName=res[index].stageName + } + }) this.stateList = res + }else{ + this.stateList = [] + } }) - }, checkbox(idx) { console.log(idx) @@ -183,16 +191,15 @@ }) // console.log(type) let param = { - "stageCode": this.stateList[this.screen.state].stageCode, - "stageName": this.stateList[this.screen.state].stageName, + "stageCode": this.screen.stageCode, + "stageName": this.screen.stageName, "remarks": this.screen.con, orgCode: this.orgCode, words, - // "settingTime":"", "agentRelationPo": { "customerId": this.customerId, "level": this.screen.level, - "state": this.stateList[this.screen.state].id + "state": this.screen.stageId } } this.$u.post('/customer/addZkDailyWorkRecord', param) @@ -214,40 +221,39 @@ } .screen { - // box-sizing: border-box; - // padding: 0 30rpx; background: #FFFFFF; .screen-counselor { display: flex; + align-items: center; height: 106rpx; - // padding: 40rpx 30rpx 36rpx 30rpx; - padding: 0 30rpx; box-sizing: border-box; - border-bottom: 1px solid #CCCCCC; + border-bottom: 1rpx solid #CCCCCC; + padding: 0 30rpx; .screen-text { - margin: 40rpx 0 36rpx 0; font-size: 30rpx; font-weight: 400; color: #333333; - line-height: 30rpx; + line-height: 106rpx; } .screen-sel { display: flex; - justify-content: space-between; + justify-content: flex-end; + align-items: center; width: 500rpx; margin-left: 60rpx; .screen-sel-img { - margin: 40rpx 0 36rpx 0; - width: 14rpx; - height: 30rpx; + flex-shrink: 0; + width: 12rpx; + height: 28rpx; } .screen-inp { - margin-top: 20rpx; + padding: 0 20rpx; + text-align: right; } } } diff --git a/pages/mine/details.vue b/pages/mine/details.vue index 84e1014..f49dd3d 100644 --- a/pages/mine/details.vue +++ b/pages/mine/details.vue @@ -1411,11 +1411,12 @@ .scroll-Y .text .content { margin-left: 30rpx; text-align: left; - padding: 0 20rpx; + padding: 15rpx 20rpx; + line-height: 42rpx; background: #f8f8f8; border-radius: 12rpx; max-width: 460rpx; - color: #999; + color: #505050; position: relative; .tankuangcss {