@@ -15,7 +17,7 @@
{{ single }}
-
@@ -82,6 +84,22 @@ export default {
bgColor: '180deg, #459FFF 0%, #473AFF 100%',
bgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/formatPortraitBIBg.svg',//背景图片路径
page:'/pages/commercialBI/formatPortrait',
+
+ detailBoxBg:'linear-gradient(136deg, #F7F3FF 0%, #FFFFFF 100%);',
+ topLeftBg:'linear-gradient(180deg, rgba(69, 159, 255, 0.2) 0%, rgba(71, 58, 255, 0.2) 100%)',// 类别背景
+ topLeftColor:'#473DFF',// 类别文字颜色
+ iconObj:{
+ car:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carFormat.svg',
+ charge:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/chargeFormat.svg',
+ bady:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/badyFormat.svg',
+ guestRoom:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/guestFormat.svg'
+ },
+ haveIconObj:{
+ have:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/haveFormat.svg',
+ noHave:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/noHaveFormat.svg'
+ },
+
+
time: '',//跳转携带的时间
menu: {},//手机配置信息
fillDegreeList:[],//业态充盈度
@@ -102,6 +120,7 @@ export default {
single:'',//显示时间
thisMonth:'',//几月
endData:'', // 结束时间
+ haveFun:{}
}
},
onLoad(option) {
@@ -145,6 +164,8 @@ export default {
// this.getConsumLevelList()
//品牌指数列表
this.getBrandInfoList()
+ // 服务区基本信息
+ this.getServiceInfo()
},
onUnload() {
this.$util.addUserBehavior()
@@ -187,6 +208,21 @@ export default {
this.getFillDegreeList()
//品牌指数列表
this.getBrandInfoList()
+ // 服务区基本信息
+ this.getServiceInfo()
+ },
+ //获取服务区基本信息
+ async getServiceInfo(){
+ let req = {
+ ServerpartId:this.serviceInfo.Serverpart_ID
+ }
+ const total = await request.$webGet('CommercialApi/BaseInfo/GetServerpartInfo',req)
+ this.haveFun = {
+ car:total.Result_Data.HASPILOTLOUNGE,
+ charge:total.Result_Data.HASCHARGE ,
+ bady:total.Result_Data.HASMOTHER ,
+ gusetHome:total.Result_Data.HASGUESTROOM
+ }
},
async changeLabel(item){
console.log('item',item)
diff --git a/pages/commercialBI/managePortrait.vue b/pages/commercialBI/managePortrait.vue
index 313cfd2..8c045a2 100644
--- a/pages/commercialBI/managePortrait.vue
+++ b/pages/commercialBI/managePortrait.vue
@@ -211,6 +211,7 @@ export default {
bgColor: '180deg, #996CFF 0%, #5D43F8 100%',
bgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/managePortraitBg.svg',//背景图片路径
page:'/pages/commercialBI/managePortrait',
+
detailBoxBg:'linear-gradient(136deg, #F3EFFE 0%, #FFFFFF 100%);',
topLeftBg:'linear-gradient(180deg, rgba(153, 108, 255, 0.2) 0%, rgba(93, 67, 248, 0.2) 100%)',// 类别背景
topLeftColor:'#6347F9',// 类别文字颜色
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f4bb880..1c450f6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -27,10 +27,10 @@
-
+
-
+
@@ -122,6 +122,12 @@
+
+
+ 商家欠款
+
+
@@ -1250,7 +1256,7 @@ export default {
this.$util.toNextRoute('navigateTo', `/pages/commercialBI/specialCase`)
},
handleGoProject(){
- this.$util.toNextRoute('navigateTo', `/pages/projectProfitSharing/index`)
+ this.$util.toNextRoute('navigateTo', `/pages/projectProfitSharing/index?noShowTab=${true}&type=${2}`)
},
//门店上传后面感叹号的点击事件
handleStoreUpload(){
@@ -2304,7 +2310,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
background: rgba(254, 192, 168,0.8);
.top{
width: 100%;
- height: 700rpx;
+ height: 690rpx;
background: linear-gradient(135deg, #FFE5CA 0%, #FFFFFF 29%, #FFFFFF 69%, #FFDCD5 100%);
border-bottom-right-radius: 32rpx;
border-bottom-left-radius: 32rpx;
@@ -2423,7 +2429,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
.newBox{
width: 100%;
box-sizing: border-box;
- padding: 32rpx 16rpx;
+ padding: 32rpx 16rpx 0;
//background: linear-gradient(135deg, #FFE3BA 0%, #FFF5E5 40%, #FFF1DB 78%, #FFDABC 100%); border-radius: 16rpx;
margin-top: 32rpx;
.progress{
@@ -2598,6 +2604,28 @@ $iphoneHeight: env(safe-area-inset-bottom);
}
}
}
+ .goBusiness{
+ width: 100%;
+ display: flex;
+ justify-content: flex-end;
+ .bussinessRight{
+ display: flex;
+ align-items: center;
+ .bussinessText{
+ font-size: 28rpx;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 400;
+ color: #A69E9F;
+ line-height: 40rpx;
+ margin: 0 4px;
+ }
+ .staticIcon{
+ width: 32rpx;
+ height: 32rpx;
+ opacity: 0.25;
+ }
+ }
+ }
}
}
}
diff --git a/pages/projectProfitSharing/index.vue b/pages/projectProfitSharing/index.vue
index fb98648..40f7d8b 100644
--- a/pages/projectProfitSharing/index.vue
+++ b/pages/projectProfitSharing/index.vue
@@ -5,7 +5,7 @@
-
+
{{ searchText }}
-
-
+
@@ -28,7 +28,7 @@
-
+
驿达应收
商家欠款
@@ -46,7 +46,7 @@
-
+
@@ -77,7 +77,7 @@
-
+
@@ -173,19 +173,30 @@ export default {
return {
searchText:'',// 搜索的时间
menu:{}, //手机参数,
+ lastDay:'',
statusBarHeight:'',
serviceInfo:{},// 当前服务区信息
selectTab: 1,
showList: [],// 显示的列表
+ realList:[],// 请求到真实的列表
otherData:{},// 接口返回的其他信息
settlement:{},// 结算模式的枚举
compactType:{},// 合同类型的枚举
searchField:0,// 排序字段
fieldList:[{label:'驿达到账',value:0},{label:'驿达入账',value:1},{label:'驿达差额',value:2}],
descType:'ascend',// 排序状态
+ showTab:true,// 是否显示选项卡
}
},
- onLoad(){
+ onLoad(query){
+ console.log('query',query)
+ console.log('query.noShowTab',typeof (query.noShowTab))
+ if (query.noShowTab==='true'){
+ this.showTab = false
+ }
+ if (query.type){
+ this.selectTab = Number(query.type)
+ }
let systemInfo = uni.getSystemInfoSync()
this.statusBarHeight = Number(systemInfo.statusBarHeight)
this.menu = uni.getMenuButtonBoundingClientRect()
@@ -194,21 +205,47 @@ export default {
},
onShow(){
this.fieldList = this.selectTab===1?[{label:'驿达到账',value:0},{label:'驿达入账',value:1},{label:'驿达差额',value:2}]:[{label:'商家到账',value:0},{label:'商家入账',value:1},{label:'商家应缴',value:2}]
- this.searchText = uni.getStorageSync('lastDay')
+ let lastDay = uni.getStorageSync('lastDay')
+ const date = new Date(lastDay)
+ const y = date.getFullYear()
+ let m = date.getMonth() + 1
+ if (m<10){
+ m = '0'+m
+ }
+ this.searchText = `${y}-${m}`
+ this.lastDay = uni.getStorageSync('lastDay')
this.serviceInfo = uni.getStorageSync('currentService')
this.handleGetPageData()
},
methods:{
+ handleChangeTime(e){
+ console.log('e',e)
+ const date = new Date(e.detail.value)
+ const y = date.getFullYear()
+ let m = date.getMonth() + 1
+ if (m<10){
+ m = '0'+m
+ }
+ this.searchText = `${y}-${m}`
+ this.handleGetPageData()
+ },
async handleGetPageData(){
// Finance/GetProjectSummary 是驿达应收
// Finance/GetProjectMerchantSummary 是商家欠款
uni.showLoading({
title: '正在加载...'
})
+ const date = new Date(this.searchText)
+ const y = date.getFullYear()
+ let m = date.getMonth() + 1
+ if (m<10){
+ m = '0'+m
+ }
const req = {
- StartDate: this.searchText,
- EndDate: this.searchText,
- ServerpartId:this.serviceInfo.Serverpart_ID,
+ // StartDate: `${y}-${m}-01`,
+ StartDate: this.lastDay,
+ EndDate: this.lastDay,
+ // ServerpartId:this.serviceInfo.Serverpart_ID,
CompactType:'340001'
}
if (this.selectTab===1){
@@ -218,16 +255,42 @@ export default {
console.log('showList',this.showList)
console.log('otherData',this.otherData)
uni.hideLoading()
+ this.$forceUpdate()
}else{
const data = await request.$webGet('EShangApiMain/Finance/GetProjectMerchantSummary',req)
let list = wrapTreeNode(data.Result_Data.List)
+ // this.realList = list
this.showList = list
this.otherData = data.Result_Data.OtherData
console.log('showList',this.showList)
console.log('otherData',this.otherData)
uni.hideLoading()
+ this.$forceUpdate()
}
},
+ // // 排序方法
+ // handleDescList(list){
+ // let descList = JSON.parse(JSON.stringify(list))
+ // console.log('descList',descList)
+ // if (this.searchField===0){
+ // //按照到账排序
+ // if (this.descType === 'ascend'){
+ // for (let i=0;i<=descList.length-1;i++){
+ // for (let j=0;j<=descList.length - i - 1;j++){
+ // if (descList[j] && descList[j + 1] && descList[j].ROYALTY_PRICE && descList[j+1].ROYALTY_PRICE){
+ // if (descList[j].ROYALTY_PRICE < descList[j+1].ROYALTY_PRICE){
+ // let temp = descList[j]
+ // descList[j] = descList[j + 1]
+ // descList[j + 1] = temp
+ // }
+ // }
+ // }
+ // }
+ // }else{
+ //
+ // }
+ // }
+ // },
//跳转到地图
handleGoSelectService() {
uni.navigateTo({
@@ -263,11 +326,11 @@ export default {
console.log('this.showList',this.showList)
},
// 显示第二层子集
- handleShowSecondChildren(obj,subObj){
+ handleShowSecondChildren(obj,subObj,index){
this.showList.forEach(item=>{
if (item.SPREGIONTYPE_NAME === obj.SPREGIONTYPE_NAME){
- item.children.forEach(subItem=>{
- if (subItem.SPREGIONTYPE_NAME === subObj.SPREGIONTYPE_NAME){
+ item.children.forEach((subItem,subIndex)=>{
+ if (subItem.SPREGIONTYPE_NAME === subObj.SPREGIONTYPE_NAME && index ===subIndex){
subItem.showChild = !subItem.showChild
}
})
@@ -465,6 +528,7 @@ export default {
.listBox{
padding-top: 24rpx;
.listItem{
+ width:calc(100% - 16rpx);
margin-bottom: 12px;
border: 1px solid #D9DBE0;
border-radius: 8px;
diff --git a/pages/revenue/expenditureDetail.vue b/pages/revenue/expenditureDetail.vue
index b149439..eb738d9 100644
--- a/pages/revenue/expenditureDetail.vue
+++ b/pages/revenue/expenditureDetail.vue
@@ -219,7 +219,7 @@ export default {
let m = date.getMonth()+1
this.thisYear = y
this.startDate = `${y}-07`
- this.endData = `${y}-10`
+ this.endData = `${y}-11`
this.single = `${y}-${ Number(query.month)}`
if (query.month){
diff --git a/pages/revenue/incomeDetail.vue b/pages/revenue/incomeDetail.vue
index 63e324c..6e0355f 100644
--- a/pages/revenue/incomeDetail.vue
+++ b/pages/revenue/incomeDetail.vue
@@ -141,7 +141,7 @@ export default {
let m = date.getMonth()+1
this.thisYear = y
this.startDate = `${y}-07`
- this.endData = `${y}-10`
+ this.endData = `${y}-11`
this.single = `${y}-${Number(query.month)}`
if (query.month){
@@ -217,7 +217,7 @@ export default {
const req = {
Month:`${y}${m}`
}
- const data = await request.$webGetTest('EShangApiMain/Budget/GetbudgetProjectReportInDynamic',req)
+ const data = await request.$webGet('EShangApiMain/Budget/GetbudgetProjectReportInDynamic',req)
console.log('data',data)
this.pageData = data.Result_Data
this.pageList = this.selectTab===1?data.Result_Data.supportList:data.Result_Data.otherList
diff --git a/pages/revenue/index.vue b/pages/revenue/index.vue
index 7ef733e..925ff11 100644
--- a/pages/revenue/index.vue
+++ b/pages/revenue/index.vue
@@ -38,9 +38,9 @@
{{ `${thisMonth}月累计收支比例` }}
?
- 成本比：本月成本 / 本月收入
+ 成本同比：本月成本 / 本月收入
本月收入：营业收入 + 营业外收入
- 支出比：累积支出 / 支出预计
+
本月支出=管理费用 + 销售费用 + 财务费用 + 营业外支出 + 税金及附加
@@ -147,8 +147,8 @@
利润总额完成率=本年累计/年度预算
{{ `(${currentResult.profitThisYear?$util.fmoney(currentResult.profitThisYear,2):'-'} / ${currentResult.profitBudgetThisYear?$util.fmoney(currentResult.profitBudgetThisYear,2):'-'})` }}
净利润完成度=本年净利润/净利润预算
{{ `(${currentResult.thisYearNetProfit?$util.fmoney(currentResult.thisYearNetProfit,2):'-'} / ${currentResult.thisYearNetProfitBudget?$util.fmoney(currentResult.thisYearNetProfitBudget,2):'-'})` }}
- 净利润预算=年度预算-年度预计所得税费用{{`(${currentResult.profitBudgetThisYear?$util.fmoney(currentResult.profitBudgetThisYear,2):'-'} - ${(currentResult.profitBudgetThisYearReal - currentResult.thisYearNetProfitBudgetReal).toFixed(2)})`}}
- 本年净利润=本年累计-本年累计所得税{{`(${currentResult.profitThisYear?$util.fmoney(currentResult.profitThisYear,2):'-'} - ${(currentResult.profitThisYearReal - currentResult.thisYearNetProfitReal).toFixed(2)})`}}
+ 净利润预算=年度预算-年度预计所得税费用{{`(${currentResult.profitBudgetThisYear?$util.fmoney(currentResult.profitBudgetThisYear,2):'-'} - ${'-'})`}}
+ 本年净利润=本年累计-本年累计所得税{{`(${currentResult.profitThisYear?$util.fmoney(currentResult.profitThisYear,2):'-'} - ${'-'})`}}
@@ -532,34 +532,48 @@
- 营业成本:{{currentResult.outList[0].thisYear}}万元，{{`${outFirst.toFixed(2)}%`}}
- 销售费用:{{currentResult.outList[1].thisYear}}万元，{{`${outSecond.toFixed(2)}%`}}
- 管理费用:{{currentResult.outList[2].thisYear}}万元，{{`${outThird.toFixed(2)}%`}}
- 财务费用:{{currentResult.outList[3].thisYear}}万元，{{`${outFourth.toFixed(2)}%`}}
+
+ {{item.name.split('小计')[0]}}:{{item.thisYear?$util.fmoney(item.thisYear):'-'}}万元，{{((item.thisYear / outAll)*100).toFixed(2)}}%
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1384,7 +1398,7 @@ export default {
Month:`${y}${m}`
}
// const data = await request.$webGet('EShangApiMain/Budget/GetbudgetProjectReport',req)
- const data = await request.$webGetTest('EShangApiMain/Budget/GetbudgetProjectReportDynamic',req)
+ const data = await request.$webGet('EShangApiMain/Budget/GetbudgetProjectReportDynamic',req)
this.currentResult = data.Result_Data
let sum = 0
console.log('this.currentResult',this.currentResult)
@@ -1393,10 +1407,21 @@ export default {
sum+=Number(item.thisYear)
})
this.outAll = sum
- this.outFirst = (Number(this.currentResult.outList[0].thisYear)/sum)*100
- this.outSecond = (Number(this.currentResult.outList[1].thisYear)/sum)*100
- this.outThird = (Number(this.currentResult.outList[2].thisYear)/sum)*100
- this.outFourth = (Number(this.currentResult.outList[3].thisYear)/sum)*100
+ this.currentResult.outList.forEach((item,index)=>{
+ if(index===0){
+ this.outFirst = (Number(item.thisYear)/sum)*100
+ }else if(index===1){
+ this.outSecond = (Number(item.thisYear)/sum)*100
+ }else if(index===2){
+ this.outThird = (Number(item.thisYear)/sum)*100
+ }else if (index===3){
+ this.outFourth = (Number(item.thisYear)/sum)*100
+ }
+ })
+
+ // this.outSecond = (Number(this.currentResult.outList[1].thisYear)/sum)*100
+ // this.outThird = (Number(this.currentResult.outList[2].thisYear)/sum)*100
+ // this.outFourth = (Number(this.currentResult.outList[3].thisYear)/sum)*100
}
uni.hideLoading()
},
@@ -2839,7 +2864,7 @@ export default {
overflow: hidden;
background: #F9DCC2;
position: relative;
- .first,.second,.third,.fourth{
+ .first,.second,.third,.fourth,.item{
position: absolute;
top: 0;
height: 100%;
diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue
index 48beb45..b91e169 100644
--- a/pages/revenueStatistics/index.vue
+++ b/pages/revenueStatistics/index.vue
@@ -29,16 +29,50 @@
驿达营收
+ 驿达入账收入
- {{pageDataObj.OwnerRevenue?$util.fmoney(pageDataObj.OwnerRevenue/10000,2):'0.00'}}
+
+ {{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}}
总计/万元
-
+
+
+
+ 入账合计
+ /万元
+
+ {{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}}
+
+
+
+ {{ item.name }}
+ {{item.value?$util.fmoney(item.value/10000,2):'0.00'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 入账合计
- /万元
-
- {{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}}
-
-
-
- {{ item.name }}
- {{item.value?$util.fmoney(item.value/10000,2):'0.00'}}
-
-
@@ -153,56 +154,24 @@
商家营收
+ 商家入账收入
- {{pageDataObj.MerchantRevenue?$util.fmoney(pageDataObj.MerchantRevenue/10000):"0.00"}}
+
+ {{MerchantSum.EntrySum?$util.fmoney(MerchantSum.EntrySum,2):'0.00'}}
总计/万元
-
-
-
- 到账合计
- /万元
-
- {{OwnerListSum.AcountSum?$util.fmoney(OwnerListSum.AcountSum,2):'0.00'}}
-
-
-
- {{ item.name }}
- {{item.value?$util.fmoney(item.value/10000):"0.00"}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
入账合计
/万元
- {{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}}
+ {{MerchantSum.EntrySum?$util.fmoney(MerchantSum.EntrySum,2):'0.00'}}
@@ -210,6 +179,39 @@
{{item.value?$util.fmoney(item.value/10000):"0.00"}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 到账合计
+ /万元
+
+ {{MerchantSum.AcountSum?$util.fmoney(MerchantSum.AcountSum,2):'0.00'}}
+
+
+
+ {{ item.name }}
+ {{item.value?$util.fmoney(item.value/10000):"0.00"}}
+
+
@@ -232,10 +234,10 @@
应收合计
+ 应缴费用
/万元
- {{OwnerListSum.ReceivableSum?$util.fmoney(OwnerListSum.ReceivableSum,2):'0.00'}}
+ {{MerchantSum.ReceivableSum?$util.fmoney(MerchantSum.ReceivableSum,2):'0.00'}}
@@ -486,33 +488,33 @@ export default {
let MerchantEntrySum = 0
let MerchantReceivableSum = 0
this.pageDataObj.OwnerList.AcountList.forEach(item=>{
- OwnerAcountSum+=(item.value)/10000
+ OwnerAcountSum+=Number(item.value)
})
this.pageDataObj.OwnerList.EntryList.forEach(item=>{
- OwnerEntrySum+=(item.value)/10000
+ OwnerEntrySum+=Number(item.value)
})
this.pageDataObj.OwnerList.ReceivableList.forEach(item=>{
- OwnerReceivableSum+=(item.value)/10000
+ OwnerReceivableSum+=Number(item.value)
})
this.pageDataObj.MerchantList.AcountList.forEach(item=>{
- MerchantAcountSum+=(item.value)/10000
+ MerchantAcountSum+=Number(item.value)
})
this.pageDataObj.MerchantList.EntryList.forEach(item=>{
- MerchantEntrySum+=(item.value)/10000
+ MerchantEntrySum+=Number(item.value)
})
this.pageDataObj.MerchantList.ReceivableList.forEach(item=>{
- MerchantReceivableSum+=(item.value)/10000
+ MerchantReceivableSum+=Number(item.value)
})
let OwnerListSum = {
- AcountSum:OwnerAcountSum,
- EntrySum:OwnerEntrySum,
- ReceivableSum:OwnerReceivableSum
+ AcountSum:this.$util.getMoney(OwnerAcountSum/ 10000),
+ EntrySum:this.$util.getMoney(OwnerEntrySum/ 10000),
+ ReceivableSum:this.$util.getMoney(OwnerReceivableSum / 10000)
}
let MerchantSum = {
- AcountSum:MerchantAcountSum,
- EntrySum:MerchantEntrySum,
- ReceivableSum:MerchantReceivableSum
+ AcountSum:this.$util.getMoney(MerchantAcountSum/ 10000),
+ EntrySum:this.$util.getMoney(MerchantEntrySum/ 10000),
+ ReceivableSum:this.$util.getMoney(MerchantReceivableSum/ 10000)
}
this.OwnerListSum = OwnerListSum
this.MerchantSum = MerchantSum
diff --git a/static/images/newCommercialBI/badyFormat.svg b/static/images/newCommercialBI/badyFormat.svg
new file mode 100644
index 0000000..78b678e
--- /dev/null
+++ b/static/images/newCommercialBI/badyFormat.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/static/images/newCommercialBI/carFormat.svg b/static/images/newCommercialBI/carFormat.svg
new file mode 100644
index 0000000..fe91ae0
--- /dev/null
+++ b/static/images/newCommercialBI/carFormat.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/static/images/newCommercialBI/chargeFormat.svg b/static/images/newCommercialBI/chargeFormat.svg
new file mode 100644
index 0000000..ba94ab3
--- /dev/null
+++ b/static/images/newCommercialBI/chargeFormat.svg
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/static/images/newCommercialBI/formatPortraitBIBg.svg b/static/images/newCommercialBI/formatPortraitBIBg.svg
new file mode 100644
index 0000000..dca3b14
--- /dev/null
+++ b/static/images/newCommercialBI/formatPortraitBIBg.svg
@@ -0,0 +1,139 @@
+
+
\ No newline at end of file
diff --git a/static/images/newCommercialBI/guestFormat.svg b/static/images/newCommercialBI/guestFormat.svg
new file mode 100644
index 0000000..4e4e5d8
--- /dev/null
+++ b/static/images/newCommercialBI/guestFormat.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/static/images/newCommercialBI/haveFormat.svg b/static/images/newCommercialBI/haveFormat.svg
new file mode 100644
index 0000000..88bc535
--- /dev/null
+++ b/static/images/newCommercialBI/haveFormat.svg
@@ -0,0 +1,17 @@
+
+
\ No newline at end of file
diff --git a/static/images/newCommercialBI/noHaveFormat.svg b/static/images/newCommercialBI/noHaveFormat.svg
new file mode 100644
index 0000000..b3a19ad
--- /dev/null
+++ b/static/images/newCommercialBI/noHaveFormat.svg
@@ -0,0 +1,17 @@
+
+
\ No newline at end of file
{{ `(${currentResult.profitThisYear?$util.fmoney(currentResult.profitThisYear,2):'-'} / ${currentResult.profitBudgetThisYear?$util.fmoney(currentResult.profitBudgetThisYear,2):'-'})` }}
{{ `(${currentResult.thisYearNetProfit?$util.fmoney(currentResult.thisYearNetProfit,2):'-'} / ${currentResult.thisYearNetProfitBudget?$util.fmoney(currentResult.thisYearNetProfitBudget,2):'-'})` }}