caoliancun/wx_oms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into zyj

Browse Source 
# Conflicts:
#	api/sy.js
#	salesRanking/page/enterpriseDetails/enterpriseDetails.vue
This commit is contained in:
zhangyouji
2023-10-18 13:37:27 +08:00
parent bf2ac62a0e a09c18f0b5
commit 872c6f71d6
2 changed files with 258 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
salesRanking/page/enterpriseDetails/enterpriseDetails.vue
View File

@@ -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>
@@ -48,45 +52,48 @@
:class=" chartSeleIndex==index?'selechartSeleBar_item':'chartSeleBar_item' ">{{item.lable}}</view>
</view>
<view class="chart_scoll">
<swiper @change="swiperChange" :current='chartSeleIndex' class="swiper" :interval="1000"
:duration="1000">
<swiper-item @tap.stop=''>
<view class="swiper-item">
<view style="height:75%;">
<qiunDataCharts :canvas2d='true' canvasId='canvasIdw' inScrollView="true" type="area"
:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}"
:chartData="Line" />
</view>
<view
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>
<view> <text class="numberoli">{{detailsData.siteDayBalance|price}}</text> ￥</view>
</view>
<view class="swiper-item" v-if="chartSeleIndex == 0">
<view style="height:75%;">
<qiunDataCharts :canvas2d='true' canvasId='canvasIdw' type="area"
:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}" :chartData="Line" />
</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>
<view> <text class="numberoli">{{detailsData.siteDayBalance|price}}</text> ￥</view>
</view>
</view>
<view class="swiper-item" v-if="chartSeleIndex == 1">
<view style="height:75%;">
<qiunDataCharts :canvas2d='true' canvasId='canvasIdt' type="area"
:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}}}" :chartData="LineTwo" />
</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">{{chartsData.rechargeAmountOnTheDay|price}}</text> ￥
</view>
</swiper-item>
<swiper-item>
<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="LineTwo" />
</view>
<view
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>
</view>
</view>
<view class="swiper-item" v-if="chartSeleIndex == 2">
<view style="height:75%;">
<qiunDataCharts :canvas2d='true' canvasId='canvasIdx' type="area"
:opts="{extra:{area:{type:'curve',addLine:true,gradient:true}},enableScroll:true,xAxis:{itemCount:7}}"
:chartData="oneMonthLine" :ontouch="true" />
</view>
<view v-if="oneMonthData"
style="height: 25%; display: flex; justify-content: space-around; align-items: center;">
<view class="swiper-item_table">今日</view>
<view> <text class="numberoli">{{oneMonthData.todaySalesRose.toFixed(2)}}</text> L
</view>
</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> <text class="numberoli">{{oneMonthData.siteDayBalance|price}}</text> ￥</view>
</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">
@@ -155,16 +162,17 @@
},
data() {
return {
routerIndex:true,
routerIndex: true,
enterpriseData: null,
isShow: {
date: false
},
dedata: null,
chartsData: null,
detailsData: null,
oneMonthData: null,
income: 0,
quantity: 0,
detailsData: null,
chartSeleBarData: [{
lable: '近五日动销',
value: 0
@@ -175,43 +183,46 @@
chartSeleIndex: 0,
Line: {},
LineTwo: {},
oneMonthLine: {},
distributeData:{},
totalAmount:0,
outTotalAmount:0
}
},
onLoad(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;
if (e.jsData) {
this.dedata = JSON.parse(e.jsData);
this.getdata(JSON.parse(e.jsData));
this.getDistributeCount(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: {
getTouchMove(e) {
// console.log('e',e)
},
datePopupChange(e) {
sy[(this.routerIndex ? 'queryBusinessIncome':'queryEnterpriseIncome')]({
[((this.routerIndex ? 'siteId':'companyId'))]: this.dedata.id,
endTime: e[1].split(' ')[0]+' 23:59:59',
sy[(this.routerIndex ? 'queryBusinessIncome' : 'queryEnterpriseIncome')]({
[((this.routerIndex ? 'siteId' : 'companyId'))]: this.dedata.id,
endTime: e[1],
startTime: e[0]
}).then(res => {
this.enterpriseData = res.data
@@ -231,9 +242,9 @@
this.outTotalAmount = res.data.outTotalAmount ==null ? 0 : res.data.outTotalAmount
})
}
},
ishowFn() {
this.isShow.date = true
@@ -242,13 +253,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)
})
@@ -260,12 +271,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)
})
@@ -276,10 +287,11 @@
data: res.data.money
}]
}
}).catch(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 => {
@@ -298,17 +310,44 @@
this.totalAmount = res.data.totalAmount ==null ? 0 : res.data.totalAmount
this.outTotalAmount = res.data.outTotalAmount ==null ? 0 : res.data.outTotalAmount
})
if (this.routerIndex) {
this.chartSeleBarData.push({
lable: '当月动销',
value: 2
})
// 近一个月动销 仅油站动销展示
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]}`)
let money = (item.money + '').includes('.') ? item.money.toFixed(2) : item
.money
moneyArr.push(money)
})
this.oneMonthData = res.data
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;
@@ -316,7 +355,7 @@
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
@@ -345,7 +384,7 @@
},
swiperChange(e) {
this.chartSeleIndex = e.detail.current
// this.chartSeleIndex = e.detail.current
},
chartSeleBarFn(item, index) {
this.chartSeleIndex = index
@@ -356,15 +395,21 @@
<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;
}
.swiper-item {
width: 100%;
}
.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;