diff --git a/pages/index/components/rateCharts.vue b/pages/index/components/rateCharts.vue
index 1d004bb..12e30a9 100644
--- a/pages/index/components/rateCharts.vue
+++ b/pages/index/components/rateCharts.vue
@@ -80,7 +80,7 @@ export default {
lineHeight: 25
},
title: {
- name: '分润占比',
+ name: '模式占比',
fontSize: 10,
color: "#A69E9F"
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d1a2be7..c098338 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -117,7 +117,7 @@
-
+
@@ -131,9 +131,30 @@
- 对客营收：{{showTableData.CashPay?$util.fmoney($util.getMoney(showTableData.CashPay),2):'-'}}
- 自营收入：{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[0].value),2) : '-'}}
- 外租收入：{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[1].value),2) : '-'}}
+
+ 对客销售：
+ {{showTableData.CashPay?$util.fmoney($util.getMoney(showTableData.CashPay),2):'-'}}
+
+
+ 自营销售：
+ {{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[0].value),2) : '-'}}
+
+
+ 便利店：
+ {{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[2].value),2) : '-'}}
+
+
+ 餐饮客房：
+ {{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[3].value),2) : '-'}}
+
+
+ 外租收入：
+ {{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[1].value),2) : '-'}}
+
+
+ 商铺租赁：
+ {{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[4].value),2) : '-'}}
+
@@ -277,28 +298,31 @@
+ 对客销售/亿元
累计
- 对客营收/万元
- {{showTableData.YearRevenueAmount?numeral(showTableData.YearRevenueAmount/10000).format('0,0.00'):''}}
+ {{showTableData.YearRevenueAmount?$util.getMoney(showTableData.YearRevenueAmount/100000000):''}}
+ {{showTableData.YearRevenueAddNumber?$util.getMoney(showTableData.YearRevenueAddNumber / 100000000):''}}
{{showTableData.YearRevenueAdd?`${showTableData.YearRevenueAdd>0?'+':''}${showTableData.YearRevenueAdd}%`:'-'}}
- 累计
- 营业收入/万元
+ 营业收入/亿元
+ 除税累计
- {{showTableData.YearAccountRoyalty?numeral(showTableData.YearAccountRoyalty/10000).format('0,0.00'):''}}
- {{showTableData.YearAccountAdd?`${showTableData.YearAccountAdd>0?'+':''}${showTableData.YearAccountAdd}%`:'-'}}
+ {{showTableData.YearAccountRoyalty?$util.getMoney(showTableData.YearAccountRoyalty/100000000):''}}
+ {{showTableData.YearAccountAddNumber?$util.getMoney(showTableData.YearAccountAddNumber / 100000000):''}}
+ {{showTableData.YearAccountAdd?`${showTableData.YearAccountAdd>0?'+':''}${showTableData.YearAccountAdd}%`:'-'}}
-
-
+
+
+
@@ -377,8 +401,8 @@
-
-
+
+
查看更多
@@ -517,7 +541,7 @@
-
+
-
长款金额/元
@@ -1543,6 +1567,7 @@ export default {
nowMonth:0,// 当前的月份
swiperList:[],// 滑动块有多少项
selectMonth:0,//选择的月份
+ selectMonthIndex:0,//选择的月份第几个
useInfo:{},//用户信息
showRealBox:false,// 是否显示对客营收的完整数据
yesObj:{},// 昨日营收数据
@@ -1709,12 +1734,15 @@ export default {
}
}
this.swiperList = swiperList
+ console.log('this.swiperList',this.swiperList)
// 顶部卡片滚动的第几个
this.selectDetail = this.handleGetSwiperIndex(this.lastDay)
// 拿到选择日期的月份
this.nowMonth = date.getMonth() + 1
// 默认选择的月份
this.selectMonth = date.getMonth() + 1
+ this.selectMonthIndex = y > 2023? 12+date.getMonth() + 1:date.getMonth() + 1
+ console.log('this.selectMonth',this.selectMonth)
// 设置顶部时间选择器的开始时间 因为不能选去年数据 所以只能从当前日期的年份开始计算
this.startDate = `${date.getFullYear()}-01`
@@ -2390,6 +2418,8 @@ export default {
this.showRateChart = false
if (!this.stopSwiper){
this.selectMonth = e.detail.current>11?(e.detail.current + 1)%12===0?12:(e.detail.current + 1)%12:e.detail.current + 1
+
+ this.selectMonthIndex = e.detail.current
this.selectDetail = e.detail.current
console.log('this.selectMonth',this.selectMonth)
console.log('this.selectDetail',this.selectDetail)
@@ -2635,6 +2665,7 @@ export default {
}
this.profitSharingList = shareList
+ console.log('result.BusinessTypeList',result.BusinessTypeList)
this.typeList = result.BusinessTypeList
this.revenueMoney = result.BusinessTypeList[0].showValue
this.externalMoney = result.BusinessTypeList[1].showValue
@@ -2666,10 +2697,16 @@ export default {
this.showTableData = result.MonthRevenueModel
console.log('result.MonthRevenueModel',result.MonthRevenueModel)
- // 对客营收的同比增长
+ // 对客营收的增幅
this.showTableData.YearRevenueAdd = (((this.showTableData.YearRevenueAmount - this.showTableData.YearRevenueYOY) / this.showTableData.YearRevenueYOY)*100).toFixed(2)
- // 营业收入的同比增长
+ // 对客营收的增长
+ this.showTableData.YearRevenueAddNumber = this.showTableData.YearRevenueAmount - this.showTableData.YearRevenueYOY
+ // 营业收入的增幅
this.showTableData.YearAccountAdd = (((this.showTableData.YearAccountRoyalty - this.showTableData.YearAccountRoyaltyYOY) / this.showTableData.YearAccountRoyaltyYOY)*100).toFixed(2)
+ // 营业收入的增长
+ this.showTableData.YearAccountAddNumber = this.showTableData.YearAccountRoyalty - this.showTableData.YearAccountRoyaltyYOY
+
+
if (this.showTableData.RevenueYOY){
this.showTableData.add = Number(((this.showTableData.CashPay-this.showTableData.RevenueYOY)/this.showTableData.RevenueYOY*100).toFixed(2))
this.showTableData.add = this.showTableData.add>0?'+'+this.showTableData.add:this.showTableData.add
@@ -3306,6 +3343,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
font-weight: 600;
margin-left: 6px;
position: relative;
+ z-index:21;
.noticeIcon{
width: 32rpx;
height: 32rpx;
@@ -3320,7 +3358,22 @@ $iphoneHeight: env(safe-area-inset-bottom);
background: #fff;
border-radius: 10rpx;
box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21);
- z-index:9;
+ z-index:21;
+ width: 360rpx;
+ .field{
+ text-align: right;
+ display: flex;
+ .label{
+ display: inline-block;
+ width: 160rpx;
+ text-align: left;
+ box-sizing: border-box;
+ }
+ .value{
+ width: 200rpx;
+ text-align: right;
+ }
+ }
}
}
.staticIcon{
@@ -3697,6 +3750,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
.itemTop{
display: flex;
align-items: center;
+ justify-content: space-between;
margin-bottom: 8rpx;
.itemType{
font-family: PingFangSC, PingFang SC;
diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue
index db04e28..fd0a5c8 100644
--- a/pages/revenueStatistics/index.vue
+++ b/pages/revenueStatistics/index.vue
@@ -82,7 +82,7 @@
便利店
餐饮客房
外包
- 餐商铺租赁
+ 商铺租赁
@@ -143,15 +143,23 @@
营收明细
- /万元
+ /万元 (除税)
-
+
+
+
+
+
+
+
类别
- 自营 (除税)
- 便利店 (除税)
- 餐饮客房 (除税)
+ 自营
+ 便利店
+ 餐饮客房
+ 外包
+ 商铺租赁
@@ -728,7 +736,7 @@ export default {
if (res && res.length>0){
let everyTop = {}// 每一块顶部内容的汇总对象
let revenueList = [{},{},{},{},{}]// 对客营收
- let accountList = [{},{},{}]// 营业收入
+ let accountList = [{},{},{},{},{}]// 营业收入
res.forEach(item=>{
if (item.ServerpartName==='累计'){
everyTop = item
@@ -739,7 +747,7 @@ export default {
}else if(item.SPRegionTypeId===2){
// SPRegionTypeId===2 外包
revenueList[3] = {...item.RevenueINC, type:1}
- // accountList[3] = {...item.AccountINC, type:1}
+ accountList[3] = {...item.AccountINC, type:1}
}else if(item.ServerpartId===1){
revenueList[1] = {...item.RevenueINC, type:2}
accountList[1] = {...item.AccountINC, type:2}
@@ -748,11 +756,12 @@ export default {
accountList[2] = {...item.AccountINC,type:2}
}else if(item.ServerpartId===3){
revenueList[4] = {...item.RevenueINC,type:2}
- // accountList[4] = {...item.AccountINC,type:2}
+ accountList[4] = {...item.AccountINC,type:2}
}
})
this.topDetail = everyTop
this.pageRevenueList = revenueList
+ console.log('accountList',accountList)
this.pageAccountList = accountList
}
},
@@ -1423,6 +1432,7 @@ export default {
line-height: 40rpx;
text-align: left;
font-style: normal;
+ white-space: nowrap;
margin: 32rpx 0;
}
.secondLabel{
diff --git a/pages/revenueStatistics/servicePartList.vue b/pages/revenueStatistics/servicePartList.vue
index 221c9d2..dd4359d 100644
--- a/pages/revenueStatistics/servicePartList.vue
+++ b/pages/revenueStatistics/servicePartList.vue
@@ -11,7 +11,7 @@
- 服务区明细
+ 服务区排名
@@ -39,7 +39,7 @@
{{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }}
- {{type===3?'/万辆':'/万元'}}
+ {{type===3?'/万辆':'/万元'+`${type===2?' (除税)':''}`}}