From 5ec7e9d36e0736da4cd6ed1c5cedd563405197c7 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Wed, 20 Sep 2023 17:02:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/sy.js                                     | 216 +++++++++---------
 .../enterpriseDetails/enterpriseDetails.vue   | 168 +++++++++-----
 2 files changed, 219 insertions(+), 165 deletions(-)

diff --git a/api/sy.js b/api/sy.js
index 996ee4d..ac078c2 100644
--- a/api/sy.js
+++ b/api/sy.js
@@ -2,109 +2,115 @@ import request from '@/utils/request'
 const service_name = "oil-user"
 const group_name = "sysCustomerInfo"
 export default {
-  findOilSiteDesc (data) {
-     return request({
-       url: `/oil-finance/oilOrderInfo/findOilSiteDesc`,
-       method: 'post',
-	   data:data
-     })
-   },
-   findCustomerName (data) {
-      return request({
-        url: `/oil-user/sysCustomerInfo/findCustomerName`,
-        method: 'post',
-   	   data:data
-      })
-    },
-	findSiteMovingPinVo (data) {
-	   return request({
-	     url: `/oil-finance/oilOrderInfo/findSiteMovingPinVo`,
-	     method: 'get',
-		   params:data
-	   })
-	 },
-	 findEnterpriSemovingPinVo (data) {
-	    return request({
-	      url: `/oil-finance/oilOrderInfo/findEnterpriSemovingPinVo`,
-	      method: 'get',
-	 	   params:data
-	    })
-	  },
-	  queryRechargeCompanyFiveDays (data) {
-	     return request({
-	       url: `/oil-finance/oilCompanyAccountReverse/queryRechargeCompanyFiveDays`,
-	       method: 'get',
-	  	   params:data
-	     })
-	   },
-	   queryTheRevenueContributionOfGasStations (data) {
-	      return request({
-	        url: `/oil-finance/oilOrderInfo/queryTheRevenueContributionOfGasStations`,
-	        method: 'post',
-	   	   data:data
-	      })
-	    },
-	   queryEnterpriseIncome (data) {
-	      return request({
-	        url: `/oil-finance/oilOrderInfo/queryEnterpriseIncome`,
-	        method: 'get',
-	   	    params:data
-	      })
-	    },
-	 checkTheFiveDayRechargeAmount (data) {
-	    return request({
-	      url: `/oil-finance/siteChannelAccountReverse/checkTheFiveDayRechargeAmount`,
-	      method: 'get',
-	 	   params:data
-	    })
-	  },
-	  queryTheOrderOfTheEnterpriseGasStation (data) {
-	     return request({
-	       url: `/oil-finance/oilOrderInfo/queryTheOrderOfTheEnterpriseGasStation`,
-	       method: 'post',
-	  	   data:data
-	     })
-	   },
-	  queryBusinessIncome (data) {
-	     return request({
-	       url: `/oil-finance/oilOrderInfo/queryBusinessIncome`,
-	       method: 'get',
-	  	   params:data
-	     })
-	   },
-	   inquireAboutCorporateContributions (data) {
-	      return request({
-	        url: `/oil-finance/oilOrderInfo/inquireAboutCorporateContributions`,
-	        method: 'post',
-	   	   data:data
-	      })
-	    },
-		queryGasStationRechargeRecords (data) {
-		   return request({
-		     url: `/oil-finance/siteChannelAccountReverse/queryGasStationRechargeRecords`,
-		     method: 'post',
-			   data:data
-		   })
-		 },
-		 findEnterpriseRechargeRecord (data) {
-		    return request({
-		      url: `/oil-finance/oilCompanyAccountReverse/findEnterpriseRechargeRecord`,
-		      method: 'post',
-		 	   data:data
-		    })
-		  },
-		 queryGasStationBusinessOrders (data) {
-		    return request({
-		      url: `/oil-finance/oilOrderInfo/queryGasStationBusinessOrders`,
-		      method: 'post',
-		 	   data:data
-		    })
-		  },
-		  findEnterpriseDesc (data) {
-		     return request({
-		       url: `/oil-finance/oilOrderInfo/findEnterpriseDesc`,
-		       method: 'post',
-		  	   data:data
-		     })
-		   }
+	findOilSiteDesc(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/findOilSiteDesc`,
+			method: 'post',
+			data: data
+		})
+	},
+	findCustomerName(data) {
+		return request({
+			url: `/oil-user/sysCustomerInfo/findCustomerName`,
+			method: 'post',
+			data: data
+		})
+	},
+	findSiteMovingPinVo(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/findSiteMovingPinVo`,
+			method: 'get',
+			params: data
+		})
+	},
+	findEnterpriSemovingPinVo(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/findEnterpriSemovingPinVo`,
+			method: 'get',
+			params: data
+		})
+	},
+	queryRechargeCompanyFiveDays(data) {
+		return request({
+			url: `/oil-finance/oilCompanyAccountReverse/queryRechargeCompanyFiveDays`,
+			method: 'get',
+			params: data
+		})
+	},
+	queryTheRevenueContributionOfGasStations(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/queryTheRevenueContributionOfGasStations`,
+			method: 'post',
+			data: data
+		})
+	},
+	queryEnterpriseIncome(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/queryEnterpriseIncome`,
+			method: 'get',
+			params: data
+		})
+	},
+	checkTheFiveDayRechargeAmount(data) {
+		return request({
+			url: `/oil-finance/siteChannelAccountReverse/checkTheFiveDayRechargeAmount`,
+			method: 'get',
+			params: data
+		})
+	},
+	queryTheOrderOfTheEnterpriseGasStation(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/queryTheOrderOfTheEnterpriseGasStation`,
+			method: 'post',
+			data: data
+		})
+	},
+	queryBusinessIncome(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/queryBusinessIncome`,
+			method: 'get',
+			params: data
+		})
+	},
+	inquireAboutCorporateContributions(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/inquireAboutCorporateContributions`,
+			method: 'post',
+			data: data
+		})
+	},
+	queryGasStationRechargeRecords(data) {
+		return request({
+			url: `/oil-finance/siteChannelAccountReverse/queryGasStationRechargeRecords`,
+			method: 'post',
+			data: data
+		})
+	},
+	findEnterpriseRechargeRecord(data) {
+		return request({
+			url: `/oil-finance/oilCompanyAccountReverse/findEnterpriseRechargeRecord`,
+			method: 'post',
+			data: data
+		})
+	},
+	queryGasStationBusinessOrders(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/queryGasStationBusinessOrders`,
+			method: 'post',
+			data: data
+		})
+	},
+	findEnterpriseDesc(data) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/findEnterpriseDesc`,
+			method: 'post',
+			data: data
+		})
+	},
+	findMonthlySiteMovingPinVo(id) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/findMonthlySiteMovingPinVo?siteId=${id}`,
+			method: 'get'
+		})
+	}
 }
diff --git a/salesRanking/page/enterpriseDetails/enterpriseDetails.vue b/salesRanking/page/enterpriseDetails/enterpriseDetails.vue
index 2f51c4a..0a47b16 100644
--- a/salesRanking/page/enterpriseDetails/enterpriseDetails.vue
+++ b/salesRanking/page/enterpriseDetails/enterpriseDetails.vue
@@ -4,14 +4,17 @@
 			<view class="flex jb ac">
 				<view>
 					<view class="flex ">
-						<uni-icons v-if="routerIndex" color="#2866ff" custom-prefix="iconfont" type="iconjiayou" size="20"></uni-icons>
-						<image v-if="!routerIndex" style="width: 60rpx; height: 60rpx;" src="../../../static/selegs.png"></image>
+						<uni-icons v-if="routerIndex" color="#2866ff" custom-prefix="iconfont" type="iconjiayou"
+							size="20"></uni-icons>
+						<image v-if="!routerIndex" style="width: 60rpx; height: 60rpx;"
+							src="../../../static/selegs.png"></image>
 						<view class="header_text_left">
 							<view class="text_ov">{{routerIndex?dedata.siteName:dedata.companyName}}</view>
-							<view  class="small_text text_ov ">{{dedata.id}}</view>
+							<view class="small_text text_ov ">{{dedata.id}}</view>
 						</view>
-						<view  v-if="!routerIndex" :style="{background:dedata.parentMark=='0'?'':'#BC853B'}" class="list_item_tip">
-						{{dedata.parentMark=='0'?'总公司':'子公司'}}
+						<view v-if="!routerIndex" :style="{background:dedata.parentMark=='0'?'':'#BC853B'}"
+							class="list_item_tip">
+							{{dedata.parentMark=='0'?'总公司':'子公司'}}
 						</view>
 					</view>
 					<view class="flex header_text_top ">
@@ -24,10 +27,11 @@
 					</view>
 				</view>
 				<view v-if="routerIndex" class="t-icon">
-					<image style="width: 100%;height: 100%;" :src="dedata.siteImages?dedata.siteImages: '../../../static/selegs.png' " mode=""></image>
+					<image style="width: 100%;height: 100%;"
+						:src="dedata.siteImages?dedata.siteImages: '../../../static/selegs.png' " mode=""></image>
 				</view>
 			</view>
-			<view @click="jump(2)" class="account">
+			<view @click="jump(2)" class="account" v-if="detailsData">
 				<view class="yuan"></view>
 				<view>
 					<view style="text-align: center;">账户余额</view>
@@ -50,14 +54,14 @@
 			<view class="chart_scoll">
 				<swiper @change="swiperChange" :current='chartSeleIndex' class="swiper" :interval="1000"
 					:duration="1000">
-					<swiper-item @tap.stop=''>
+					<!-- <swiper-item @tap.stop=''>
 						<view class="swiper-item">
 							<view style="height:75%;">
-								<qiunDataCharts  :canvas2d='true' canvasId='canvasIdw' inScrollView="true" type="area"
+								<qiunDataCharts :canvas2d='true' canvasId='canvasIdw' inScrollView="true" type="area"
 									:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}"
 									:chartData="Line" />
 							</view>
-							<view
+							<view v-if="detailsData"
 								style="height: 25%; display: flex; justify-content: space-around; align-items: center;">
 								<view class="swiper-item_table">今日</view>
 								<view> <text class="numberoli">{{detailsData.todaySalesRose.toFixed(2)}}</text> L</view>
@@ -72,21 +76,42 @@
 									:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}"
 									:chartData="LineTwo" />
 							</view>
-							<view
+							<view v-if="chartsData"
 								style="height: 25%; display: flex; justify-content: space-around; align-items: center;">
 								<view class="swiper-item_table">今日</view>
-								<!-- <view> <text class="numberoli">2987.5</text> L</view> -->
-								<view> <text class="numberoli">{{chartsData.rechargeAmountOnTheDay|price}}</text> ￥</view>
+								<view> <text class="numberoli">{{chartsData.rechargeAmountOnTheDay|price}}</text> ￥
+								</view>
 							</view>
 						</view>
-					</swiper-item>
+					</swiper-item> -->																														
+					<swiper-item>
+						
+					</swiper-item>					
 				</swiper>
+				
+				
+				
 				<!-- <view style="height: 70%;width: 100%; padding: 20rpx 0;">
 					<qiun-data-charts type="area" :opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}" :chartData="Line" />
 				</view> -->
 			</view>
+			
+			<view class="swiper-item">
+				<view style="height:75%;">
+					<qiunDataCharts :canvas2d='true' canvasId='canvasIdt' inScrollView="true" type="area"
+						:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}"
+						:chartData="oneMonthLine" />
+				</view>
+				<view
+					style="height: 25%; display: flex; justify-content: space-around; align-items: center;">
+					<view class="swiper-item_table">今日</view>
+					<view> <text class="numberoli">{{}}</text> L</view>
+					<view> <text class="numberoli">{{}}</text> ￥</view>
+				</view>
+			</view>
+			
 			<view class="footer">
-				<view @click="ishowFn()" class="footer_title">{{dedata.startTime|timeProcessing}} -
+				<view @click="ishowFn()" class="footer_title" v-if="dedata">{{dedata.startTime|timeProcessing}} -
 					{{dedata.endTime|timeProcessing}}
 				</view>
 				<view @click="jump(1)" class="footer_item">
@@ -131,7 +156,7 @@
 		},
 		data() {
 			return {
-				routerIndex:true,
+				routerIndex: true,
 				enterpriseData: null,
 				isShow: {
 					date: false
@@ -147,45 +172,46 @@
 				}, {
 					lable: '近五次充值',
 					value: 1
+				},{
+					lable: '近一月动销',
+					value: 2
 				}],
 				chartSeleIndex: 0,
 				Line: {},
-				LineTwo: {}
+				LineTwo: {},
+				oneMonthLine:{}
 			}
 		},
 		onLoad(e) {
-			console.log(e)
-			
+
 			let routes = getCurrentPages();
 			let routerIndex = routes[(routes.length - 2)].$page.fullPath.indexOf('?') != -1 ?
 				routes[(routes.length - 2)].$page.fullPath.split('?')[0].split('/')[routes[(routes.length - 2)]
 					.$page.fullPath.split('?')[0].split('/').length - 1] :
 				routes[(routes.length - 2)].$page.fullPath.split('/')[routes[(routes.length - 2)].$page
 					.fullPath.split('/').length - 1];
-					this.routerIndex= routerIndex =='enterpriseIndex'?false:true;
-					console.log(routerIndex)
-					console.log(this.routerIndex)
-					if (e.jsData) {
-						this.dedata = JSON.parse(e.jsData);
-						this.getdata(JSON.parse(e.jsData));
-					}
+			// 仅用于判断是从油站动销还是企业动销跳入
+			this.routerIndex = routerIndex == 'enterpriseIndex' ? false : true;
+			if (e.jsData) {
+				this.dedata = JSON.parse(e.jsData);
+				this.getdata(JSON.parse(e.jsData));
+			}
 		},
-		filters:{
-			timeProcessing(e){
-				return e?e.split(' ')[0]:e
+		filters: {
+			timeProcessing(e) {
+				return e ? e.split(' ')[0] : e
 			},
-			price(e=0.00){
-				// if(!e) e=0.00;
+			price(e = 0.00) {
 				return convertW.convertW(e)
 			},
-			distinguish(e){
-				return this.routerIndex ?e.siteName:e.companyName
+			distinguish(e) {
+				return this.routerIndex ? e.siteName : e.companyName
 			}
 		},
 		methods: {
 			datePopupChange(e) {
-				sy[(this.routerIndex ? 'queryBusinessIncome':'queryEnterpriseIncome')]({
-					[((this.routerIndex ? 'siteId':'companyId'))]: this.dedata.id,
+				sy[(this.routerIndex ? 'queryBusinessIncome' : 'queryEnterpriseIncome')]({
+					[((this.routerIndex ? 'siteId' : 'companyId'))]: this.dedata.id,
 					endTime: e[1],
 					startTime: e[0]
 				}).then(res => {
@@ -204,13 +230,13 @@
 
 			},
 			getdata(e) {
-				sy[(this.routerIndex ? 'findSiteMovingPinVo':'findEnterpriSemovingPinVo')]({
-					[((this.routerIndex ? 'siteId':'companyId'))]:e.id
+				sy[(this.routerIndex ? 'findSiteMovingPinVo' : 'findEnterpriSemovingPinVo')]({
+					[((this.routerIndex ? 'siteId' : 'companyId'))]: e.id
 				}).then(res => {
 					if (res.code !== 20000) return
 					this.detailsData = res.data
 					let arr = []
-					this.detailsData.createTime.forEach((item,index) => {
+					this.detailsData.createTime.forEach((item, index) => {
 						arr.push(`${item.split('-')[1]}/${item.split('-')[2]}`)
 						this.detailsData.money[index] = this.detailsData.money[index].toFixed(2)
 					})
@@ -222,12 +248,12 @@
 						}]
 					}
 				})
-				sy[(this.routerIndex ? 'checkTheFiveDayRechargeAmount':'queryRechargeCompanyFiveDays')]({
-					[((this.routerIndex ? 'siteId':'companyId'))]:e.id
+				sy[(this.routerIndex ? 'checkTheFiveDayRechargeAmount' : 'queryRechargeCompanyFiveDays')]({
+					[((this.routerIndex ? 'siteId' : 'companyId'))]: e.id
 				}).then(res => {
 					this.chartsData = res.data
 					let arrtwo = []
-					res.data.createTime.forEach((item,index) => {
+					res.data.createTime.forEach((item, index) => {
 						arrtwo.push(`${item.split('-')[1]}/${item.split('-')[2]}`)
 						res.data.money[index] = res.data.money[index].toFixed(2)
 					})
@@ -238,11 +264,11 @@
 							data: res.data.money
 						}]
 					}
-				}).catch(e=>{
-					console.log(e,'///')
+				}).catch(e => {
+					console.log(e, '///')
 				})
-				sy[(this.routerIndex ? 'queryBusinessIncome':'queryEnterpriseIncome')]({
-					[((this.routerIndex ? 'siteId':'companyId'))]: e.id,
+				sy[(this.routerIndex ? 'queryBusinessIncome' : 'queryEnterpriseIncome')]({
+					[((this.routerIndex ? 'siteId' : 'companyId'))]: e.id,
 					endTime: e.endTime,
 					startTime: e.startTime
 				}).then(res => {
@@ -251,26 +277,46 @@
 					this.quantity = res.data.orderNumber
 					console.log(res, '收入')
 				})
+				if(this.routerIndex) {
+					// 近一个月动销 仅油站动销展示
+					sy.findMonthlySiteMovingPinVo(e.id).then(res => {
+						let dateArr = []
+						let moneyArr = []
+						res.data.siteMovingPins.forEach(item => {
+							let date = item.createTime.split('-')
+							dateArr.push(`${date[1]}-${date[2]}`)
+							moneyArr.push(item.money.toFixed(2))
+						})
+						this.oneMonthLine = {
+							categories: dateArr,
+							series: [{
+								name: "金额",
+								data: moneyArr
+							}]
+						}
+					})
+ 				}
 			},
 			jump(e) {
-				this.dedata.routerIndex=this.routerIndex;
+				this.dedata.routerIndex = this.routerIndex;
 				switch (e) {
 					case 1:
 						uni.navigateTo({
 							url: '../contribution/contribution?jsData=' + JSON.stringify(Object.assign(this
 								.dedata, {
-									  liters: this.enterpriseData.liters,
-									   enterpriseContributionAmount: this.enterpriseData.enterpriseContributionAmount,
-										...this.detailsData
+									liters: this.enterpriseData.liters,
+									enterpriseContributionAmount: this.enterpriseData
+										.enterpriseContributionAmount,
+									...this.detailsData
 								}))
 						})
 						break;
 					case 2:
-					console.log(this.dedata,'rechargeRecordrechargeRecordrechargeRecordrechargeRecord')
+						console.log(this.dedata, 'rechargeRecordrechargeRecordrechargeRecordrechargeRecord')
 						uni.navigateTo({
 							url: '../rechargeRecord/rechargeRecord?jsData=' + JSON.stringify(Object.assign(this
 								.dedata, {
-									routerIndex:this.routerIndex,
+									routerIndex: this.routerIndex,
 									gasStationBalance: this.detailsData.gasStationBalance,
 									amountYesterday: this.detailsData.amountYesterday,
 									...this.detailsData
@@ -298,15 +344,17 @@
 
 <style scoped>
 	@import url("./enterpriseDetails.css");
-.list_item_tip{
-	padding: 11rpx 14rpx;
-	background-color:#9F43CC;
-	color: #FFFFFF;
-	font-size: 16rpx;
-	width: fit-content;
-	margin: 0 auto;
-	height: fit-content;
-}
+
+	.list_item_tip {
+		padding: 11rpx 14rpx;
+		background-color: #9F43CC;
+		color: #FFFFFF;
+		font-size: 16rpx;
+		width: fit-content;
+		margin: 0 auto;
+		height: fit-content;
+	}
+
 	.t-icon {
 		width: 95rpx !important;
 		height: 95rpx !important;