update
This commit is contained in:
parent
a24a43ba3c
commit
0d836a41d6
@ -80,7 +80,7 @@ export default {
|
||||
lineHeight: 25
|
||||
},
|
||||
title: {
|
||||
name: '分润占比',
|
||||
name: '模式占比',
|
||||
fontSize: 10,
|
||||
color: "#A69E9F"
|
||||
},
|
||||
|
||||
@ -117,7 +117,7 @@
|
||||
|
||||
<!-- ,height:loadMore?'200px':'38px'-->
|
||||
<div class="storeDetail" :style="{ top: menu.bottom + 13 + 'px',left:0 + 'px'}">
|
||||
<swiper class="detailBox" previous-margin="40rpx" next-margin="20rpx" :style="{height: loadMore?`1330rpx`:`710rpx`}" @change="handleChangeSelect" :current="selectDetail">
|
||||
<swiper class="detailBox" previous-margin="40rpx" next-margin="20rpx" :style="{height: loadMore?`1460rpx`:`710rpx`}" @change="handleChangeSelect" :current="selectDetail">
|
||||
<block v-for="(item,index) in swiperList" :key="index">
|
||||
<swiper-item :item-id="index" :data-item-id="index" :class="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)?'detailItemBox':'noSelectItemBox'">
|
||||
<view class="bigBox" v-if="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)">
|
||||
@ -131,9 +131,30 @@
|
||||
<view class="moreIcon" @click.stop="changeShowRealBox">
|
||||
<image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg"/>
|
||||
<view v-if="showRealBox" class="realBox" @click.stop="changeShowRealBox">
|
||||
<view><text class="label">对客营收：</text>{{showTableData.CashPay?$util.fmoney($util.getMoney(showTableData.CashPay),2):'-'}}</view>
|
||||
<view><text class="label">自营收入：</text>{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[0].value),2) : '-'}}</view>
|
||||
<view><text class="label">外租收入：</text>{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[1].value),2) : '-'}}</view>
|
||||
<view class="field">
|
||||
<view class="label">对客销售：</view>
|
||||
<view class="value">{{showTableData.CashPay?$util.fmoney($util.getMoney(showTableData.CashPay),2):'-'}}</view>
|
||||
</view>
|
||||
<view class="field">
|
||||
<view class="label">自营销售：</view>
|
||||
<view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[0].value),2) : '-'}}</view>
|
||||
</view>
|
||||
<view class="field">
|
||||
<view class="label" style="padding-left: 20rpx">便利店：</view>
|
||||
<view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[2].value),2) : '-'}}</view>
|
||||
</view>
|
||||
<view class="field">
|
||||
<view class="label" style="padding-left: 20rpx">餐饮客房：</view>
|
||||
<view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[3].value),2) : '-'}}</view>
|
||||
</view>
|
||||
<view class="field">
|
||||
<view class="label">外租收入：</view>
|
||||
<view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[1].value),2) : '-'}}</view>
|
||||
</view>
|
||||
<view class="field">
|
||||
<view class="label" style="padding-left: 20rpx">商铺租赁：</view>
|
||||
<view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[4].value),2) : '-'}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -277,28 +298,31 @@
|
||||
<view class="accountRevenue">
|
||||
<view class="accountItem" style="margin-bottom: 24rpx">
|
||||
<view class="itemTop">
|
||||
<view class="itemName">对客销售<span class="unit">/亿元</span></view>
|
||||
<view class="itemType">累计</view>
|
||||
<view class="itemName">对客营收<span class="unit">/万元</span></view>
|
||||
</view>
|
||||
<view class="itemBottom">
|
||||
<span class="revenueNum">{{showTableData.YearRevenueAmount?numeral(showTableData.YearRevenueAmount/10000).format('0,0.00'):''}}</span>
|
||||
<span class="revenueNum">{{showTableData.YearRevenueAmount?$util.getMoney(showTableData.YearRevenueAmount/100000000):''}}</span>
|
||||
<span class="revenueAdd" :style="{color:showTableData.YearRevenueAddNumber>0?'#E83944':showTableData.YearRevenueAddNumber<0?'#0E9976':''}">{{showTableData.YearRevenueAddNumber?$util.getMoney(showTableData.YearRevenueAddNumber / 100000000):''}}</span>
|
||||
<span class="revenueAdd" :style="{color:showTableData.YearRevenueAdd>0?'#E83944':showTableData.YearRevenueAdd<0?'#0E9976':''}">{{showTableData.YearRevenueAdd?`${showTableData.YearRevenueAdd>0?'+':''}${showTableData.YearRevenueAdd}%`:'-'}}</span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="accountItem">
|
||||
<view class="itemTop">
|
||||
<view class="itemType">累计</view>
|
||||
<view class="itemName">营业收入<span class="unit">/万元</span></view>
|
||||
<view class="itemName">营业收入<span class="unit">/亿元</span></view>
|
||||
<view class="itemType">除税累计</view>
|
||||
</view>
|
||||
<view class="itemBottom">
|
||||
<span class="revenueNum">{{showTableData.YearAccountRoyalty?numeral(showTableData.YearAccountRoyalty/10000).format('0,0.00'):''}}</span>
|
||||
<span class="revenueAdd" :style="{color:showTableData.YearRevenueAdd>0?'#E83944':showTableData.YearRevenueAdd<0?'#0E9976':''}">{{showTableData.YearAccountAdd?`${showTableData.YearAccountAdd>0?'+':''}${showTableData.YearAccountAdd}%`:'-'}}</span>
|
||||
<span class="revenueNum">{{showTableData.YearAccountRoyalty?$util.getMoney(showTableData.YearAccountRoyalty/100000000):''}}</span>
|
||||
<span class="revenueAdd" :style="{color:showTableData.YearAccountAddNumber>0?'#E83944':showTableData.YearAccountAddNumber<0?'#0E9976':''}">{{showTableData.YearAccountAddNumber?$util.getMoney(showTableData.YearAccountAddNumber / 100000000):''}}</span>
|
||||
<span class="revenueAdd" :style="{color:showTableData.YearAccountAdd>0?'#E83944':showTableData.YearAccountAdd<0?'#0E9976':''}">{{showTableData.YearAccountAdd?`${showTableData.YearAccountAdd>0?'+':''}${showTableData.YearAccountAdd}%`:'-'}}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="showMoreLoading">
|
||||
<image @click="handleShowMore" class="showMorenDown" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/downIconMore.png"/>
|
||||
<view class="showMoreLoading" v-if="!loadMore">
|
||||
<!-- <image @click="handleShowMore" class="showMorenDown" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/downIconMore.png"/>-->
|
||||
<image @click="handleChangeLoadMore" class="showMorenDown" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/downIconMore.png"/>
|
||||
</view>
|
||||
<!-- <view class="goBusiness">-->
|
||||
<!-- <!– @click="handleGoProject"–>-->
|
||||
@ -377,8 +401,8 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="bottom" v-if="!loadMore" @click="handleChangeLoadMore">-->
|
||||
<view class="bottom" v-if="false" @click="handleChangeLoadMore">
|
||||
<view class="bottom" v-if="!loadMore" @click="handleChangeLoadMore">
|
||||
<!-- <view class="bottom" v-if="false" @click="handleChangeLoadMore">-->
|
||||
<text class="searchText">查看更多</text>
|
||||
<image class="searchIcon" :style="{height:'16px',transform: loadMore?'rotate(180deg)':''}" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
|
||||
</view>
|
||||
@ -517,7 +541,7 @@
|
||||
<image v-if="loadMore" class="noShowMore" :style="{transform:`${loadMore?'rotate(-90deg)':''}`}" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
|
||||
</div>
|
||||
</view>
|
||||
<view class="detail" v-show="selectMonth===index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)">
|
||||
<view class="detail" v-if=false v-show="selectMonthIndex!==index+1 || selectMonthIndex !== ((index+1)%12===0?12:(index+1)%12)">
|
||||
<view class="detailItem">
|
||||
<p class="price">-</p>
|
||||
<p class="itemName">长款金额<text class="itemUnit">/元</text></p>
|
||||
@ -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;
|
||||
|
||||
@ -82,7 +82,7 @@
|
||||
<view class="secondLabel">便利店</view>
|
||||
<view class="secondLabel">餐饮客房</view>
|
||||
<view class="firstLabel">外包</view>
|
||||
<view class="secondLabel">餐商铺租赁</view>
|
||||
<view class="secondLabel">商铺租赁</view>
|
||||
</view>
|
||||
<scroll-view class="tableRight" scroll-x="true">
|
||||
<view class="labelBox">
|
||||
@ -143,15 +143,23 @@
|
||||
<view class="tableBox">
|
||||
<view class="tableTop">
|
||||
<span class="tableTitle">营收明细</span>
|
||||
<span class="tableUnit">/万元</span>
|
||||
<span class="tableUnit">/万元 (除税)</span>
|
||||
</view>
|
||||
|
||||
<view class="tableContent" style="height: 304rpx">
|
||||
<view class="tableContent" style="height: 440rpx">
|
||||
<view class="tableLeft">
|
||||
<!-- <view class="label">类别</view>-->
|
||||
<!-- <view class="firstLabel">自营 (除税)</view>-->
|
||||
<!-- <view class="firstLabel">便利店 (除税)</view>-->
|
||||
<!-- <view class="firstLabel">餐饮客房 (除税)</view>-->
|
||||
<!-- <view class="firstLabel">商铺租赁</view>-->
|
||||
|
||||
<view class="label">类别</view>
|
||||
<view class="firstLabel">自营 (除税)</view>
|
||||
<view class="firstLabel">便利店 (除税)</view>
|
||||
<view class="firstLabel">餐饮客房 (除税)</view>
|
||||
<view class="firstLabel">自营</view>
|
||||
<view class="secondLabel">便利店</view>
|
||||
<view class="secondLabel">餐饮客房</view>
|
||||
<view class="firstLabel">外包</view>
|
||||
<view class="secondLabel">商铺租赁</view>
|
||||
</view>
|
||||
<scroll-view class="tableRight" scroll-x="true">
|
||||
<view class="labelBox">
|
||||
@ -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{
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<view class="revenueDetailTitleBox">
|
||||
<view class="left">
|
||||
<!-- <span class="contentMonth">{{thisMonth?thisMonth+'月':'累计'}}</span>-->
|
||||
<span class="leftText">服务区明细</span>
|
||||
<span class="leftText">服务区排名</span>
|
||||
<!-- <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png"/>-->
|
||||
<!-- <text class="modalUnit">{{selectDateText || ''}}</text>-->
|
||||
</view>
|
||||
@ -39,7 +39,7 @@
|
||||
<view class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
|
||||
<view class="modalIndex"></view>
|
||||
<text class="modalText">{{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }}</text>
|
||||
<text class="modalUnit">{{type===3?'/万辆':'/万元'}}</text>
|
||||
<text class="modalUnit">{{type===3?'/万辆':'/万元'+`${type===2?' (除税)':''}`}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user