diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue index 0b2dd35..53abf7d 100644 --- a/pages/everdayRenven/AnhuiIndex.vue +++ b/pages/everdayRenven/AnhuiIndex.vue @@ -94,7 +94,7 @@ {{childItem.data}}/{{childItem.flow}} {{childItem.LargeVehicle_Count}}/{{childItem.MediumVehicle_Count}}/{{childItem.MinVehicle_Count}} - + @@ -481,6 +481,7 @@ } }); this.headMsg = totalData + console.log(this.headMsg) // 饼图分析及数据条形分析 const [progressList, pieList] = this.getProgressData(busniessTypePie, totalData.cashPay) this.modelProgress = progressList @@ -1070,20 +1071,25 @@ overflow: auto; -webkit-overflow-scrolling: touch; } - .bayonet-cell-area li{ - width: 100%; - } - .bayonet-cell-area li .server,.bayonet-cell-area li .carType{ - width: 30%; - display: inline-block; - text-align: center; - } - .bayonet-cell-area li .type{ - width: 40%; - display: inline-block; - text-align: center; - } - + .bayonet-cell-area li{ + width: 100%; + } + .bayonet-cell-area li .server{ + width: 30%; + display: inline-block; + text-align: left; + padding-left: 15rpx; + } + .bayonet-cell-area li .type{ + width: 35%; + display: inline-block; + text-align: center; + } + .bayonet-cell-area li .carType{ + width: 30%; + display: inline-block; + text-align: right; + } .bayonet-cell-area li:nth-child(2n+1):before { content: ''; @@ -1347,19 +1353,25 @@ .operation-cl-unit1 { width: 100%; font-size: 26rpx; - display: flex; - justify-content: space-between; + display: flex; + justify-content: space-between; } - .operation-cl-unit1 .type{ - width: 40%; - display: inline-block; - text-align: center; - } - .operation-cl-unit1 .server,.operation-cl-unit1 .carType{ - width: 30%; - display: inline-block; - text-align: center; - } + .operation-cl-unit1 .server{ + width: 30%; + display: inline-block; + text-align: left; + padding-left: 30rpx; + } + .operation-cl-unit1 .type{ + width: 40%; + display: inline-block; + text-align: left; + } + .operation-cl-unit1 .carType{ + width: 30%; + display: inline-block; + text-align: center; + } .operation-c-list .progress { width: 288rpx; diff --git a/pages/everdayRenven/components/anhHead.vue b/pages/everdayRenven/components/anhHead.vue index c0b8867..319fd25 100644 --- a/pages/everdayRenven/components/anhHead.vue +++ b/pages/everdayRenven/components/anhHead.vue @@ -52,7 +52,7 @@
- 分润门店 + 分润门店: {{headMsg.shareShopCount}}个 @@ -60,7 +60,7 @@
- 驿达分润 + 驿达分润: {{ $util.fmoney(headMsg.royaltyPrice) }}元 @@ -71,6 +71,28 @@
-->
+
+
+
+ 万佳配送订单: + + {{headMsg.deliverBillCount}}单 + +
+
+
+
+ 采购金额: + + {{ $util.fmoney(headMsg.deliverPrice) }}元 + +
+ +
+
diff --git a/pages/everdayRenven/components/anhuiYestodayRevenueData.js b/pages/everdayRenven/components/anhuiYestodayRevenueData.js index 85cdb68..5585925 100644 --- a/pages/everdayRenven/components/anhuiYestodayRevenueData.js +++ b/pages/everdayRenven/components/anhuiYestodayRevenueData.js @@ -20,10 +20,17 @@ const methods = { Statistics_Month: obj.month , Province_Code: obj.ProvinceCode , pushProvinceCode: obj.ProvinceCode , - Serverpart_ID: obj.ServerpartIds ? obj.ServerpartIds : '', + Serverpart_ID: obj.GroupType != 1020 ? obj.ServerpartIds : '', SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '', // Revenue_Include: 1 } + const requestParamasBudget = { + Statistics_Date: obj.time , + Statistics_Month: obj.month , + Province_Code: obj.ProvinceCode , + pushProvinceCode: obj.ProvinceCode , + Serverpart_ID: obj.ServerpartIds ? obj.ServerpartIds : '' + } this.provinceCode = obj.ProvinceCode // 营收数据 const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas) @@ -38,13 +45,17 @@ const methods = { if (tradeData.Result_Code != 100) return // 计划营收金额 - const budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamas) + const budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamasBudget) if (budgetAmount.Result_Code != 100) return // 移动支付分账数据 const mobileShare = await request.$webGet('CommercialApi/Revenue/GetMobileShare', requestParamas) if (mobileShare.Result_Code != 100) return + // 万佳商城配送数据 + const mallDeliver = await request.$webGet('CommercialApi/Revenue/GetMallDeliver', requestParamas) + if (mallDeliver.Result_Code != 100) return + // 片区车流量 const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas) if (bayonetCount.Result_Code != 100) return @@ -55,7 +66,7 @@ const methods = { } return _this.getReginList(data.Result_Data.List, busniessCounts.Result_Data.List, tradeData.Result_Data.List, budgetAmount.Result_Data.List, - bayonetCount.Result_Data.List, mobileShare.Result_Data) + bayonetCount.Result_Data.List, mobileShare.Result_Data, mallDeliver.Result_Data) // [reginList, totalData, busniessTypePie, busniessTradePie] }, @@ -235,7 +246,7 @@ const methods = { } return [ totalShow, busniessTypePie, busniessTradePie,busniessTradeFathPie ] }, - getReginList(data, shopCountList,tradeList,budgetAmount,bayonetCount, mobileShare) { + getReginList(data, shopCountList,tradeList,budgetAmount,bayonetCount, mobileShare, mallDeliver) { let _this = this let totalShow = {} // 总营收数据统计 @@ -320,6 +331,12 @@ const methods = { totalShow.subRoyaltyPrice = mobileShare.SubRoyalty_Price totalShow.ticketFee = mobileShare.Ticket_Fee } + // 获取移动支付分账数据 + if (mallDeliver) { + totalShow.deliverBillCount = mallDeliver.DeliverBill_Count + totalShow.deliverPrice = mallDeliver.Deliver_Price + totalShow.deliverRate = mallDeliver.Deliver_Rate + } // 片区车流量数据 bayonetCount.map(async (n, index) => { bayonetPie = _this.getBayonetPie('Serverpart_Name', n, bayonetPie)