Skip to content

S
SuperMan
Commit 0839690c authored by youjie's avatar youjie
Browse files
Options

Merge branch 'master' into langEn

parents dcb425d1 642dee8a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2545 additions and 23 deletions
src/components/FinancialModule/DataAnalysis/allEchart.vue
View file @ 0839690c
<template>
<div style="height: 100%;">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="线路经营情况" name="1"></el-tab-pane>
<el-tab-pane label="公司经营情况" name="2"></el-tab-pane>
<el-tab-pane label="日本线常规团情况" name="3"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3" label="线路经营情况" name="1"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3" label="公司经营情况" name="2"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3" label="日本线常规团情况" name="3"></el-tab-pane>
<!-- <el-tab-pane label="购物佣金情况" name="4"></el-tab-pane> -->
</el-tabs>
<div class="query-box">
......@@ -17,6 +17,7 @@
v-model="msg.OutBranchId"
@change="getChange"
clearable
:disabled="PermissionState==2"
>
<el-option
:value="-1"
......@@ -38,6 +39,7 @@
clearable
v-model="msg.OutBranchIdList"
@change="getChange"
:disabled="PermissionState==2"
>
<!-- <el-option
:value="-1"
......@@ -209,7 +211,15 @@
<template v-if="activeName=='2'">
<div class="allEchartRow">
<twoIncomeChange :msgData="msg" :StatisticalData="StatisticalData"></twoIncomeChange>
<twoCurrentExpense :msgData="msg" :StatisticalData="StatisticalData"></twoCurrentExpense>
</div>
<div class="allEchartRow">
<twoWoolRateColumnarZZT :msgData="msg" :StatisticalData="StatisticalData"></twoWoolRateColumnarZZT>
<twoActualRateColumnarZZT :msgData="msg" :StatisticalData="StatisticalData"></twoActualRateColumnarZZT>
</div>
<div class="allEchartRow">
<twoChangeProportion :msgData="msg" :StatisticalData="StatisticalData"></twoChangeProportion>
<twoActualProfit :msgData="msg" :StatisticalData="StatisticalData"></twoActualProfit>
</div>
<div class="allEchartRow">
<twoWoolRateColumnar :msgData="msg" :StatisticalData="StatisticalData"></twoWoolRateColumnar>
......@@ -269,6 +279,10 @@ import twoIncomeChange from "./components/twoEchart/IncomeChange.vue";
import twoChangeProportion from "./components/twoEchart/ChangeProportion.vue";
import twoWoolRateColumnar from "./components/twoEchart/WoolRateColumnar.vue";
import twoActualRateColumnar from "./components/twoEchart/ActualRateColumnar.vue";
import twoActualProfit from "./components/twoEchart/ActualProfit.vue";
import twoCurrentExpense from "./components/twoEchart/CurrentExpense.vue";
import twoWoolRateColumnarZZT from "./components/twoEchart/WoolRateColumnarZZT.vue";
import twoActualRateColumnarZZT from "./components/twoEchart/ActualRateColumnarZZT.vue";
import threeIncomeChange from "./components/threeEchart/IncomeChange.vue";
import threeIncomeShare from "./components/threeEchart/IncomeShare.vue";
......@@ -296,6 +310,8 @@ export default {
twoIncomeChange,twoChangeProportion,
twoWoolRateColumnar,twoActualRateColumnar,
twoActualProfit,twoCurrentExpense,
twoWoolRateColumnarZZT,twoActualRateColumnarZZT,
threeIncomeChange,threeIncomeShare,
threeWoolRateChange,
......@@ -313,6 +329,7 @@ export default {
coinGetShow: false,
loading: false,
activeName: '1',
PermissionState: '0',//权限状态 1管理员级 2各公司负责人 3地接OP查询佣金
msg:{
startDate: '',
endDate: '',
......@@ -388,6 +405,25 @@ export default {
this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
this.msg.startDate = this.dateTime[0]
this.msg.endDate = this.dateTime[1]
let userInfo = this.getLocalStorage();
if(userInfo.RB_Group_id==2){
if(userInfo.RB_Branch_id==0||userInfo.RB_Branch_id==49){
this.PermissionState=1;
if(userInfo.RB_Post_Id==171){
this.PermissionState=3;//地接OP
this.activeName='4';
}
}
else{
//分公司的 看各自公司的数据 佣金暂时不开
this.PermissionState=2;
this.msg.OutBranchId=userInfo.RB_Branch_id;
this.msg.OutBranchIdList=[];
this.msg.OutBranchIdList.push(userInfo.RB_Branch_id);
}
}
this.financeinfo_post_GetList()
this.getQueryData()
this.getShops()
......@@ -503,6 +539,14 @@ export default {
this.coinGetShow = false
this.msg.StandardCurrencyId = 1
}
let userInfo = this.getLocalStorage();
if(this.PermissionState==2){
this.msg.OutBranchId=userInfo.RB_Branch_id;
this.msg.OutBranchIdList=[];
this.msg.OutBranchIdList.push(userInfo.RB_Branch_id);
}
this.getStatement()
this.$forceUpdate()
},
......
src/components/FinancialModule/DataAnalysis/components/fourEchart/IncomeChange.vue
View file @ 0839690c
......@@ -62,7 +62,6 @@ export default {
let titles = []
let Stocklegend = {}
let Newobj = {}
console.log(this.ShopData,'=====')
this.ShopData.forEach((x,indexs)=>{
let Name = `${x.Name}`
titles.push(Name)
......
src/components/FinancialModule/DataAnalysis/components/oneEchart/ActualRateColumnar.vue
View file @ 0839690c
......@@ -59,6 +59,11 @@ export default {
let titles = []
let Stocklegend = {}
let Newobj = {}
let barW =30; let labelShow=true;
if(this.LineAnalysisData.length >=3){barW=29;}
if(this.LineAnalysisData.length >=4){barW=23;labelShow=false;}
if(this.LineAnalysisData.length >=5){barW=19;labelShow=false;}
if(this.LineAnalysisData.length >=7){barW=16;labelShow=false;}
this.LineAnalysisData.forEach((x,indexs)=>{
let Name = `${x.Name}`
titles.push(Name)
......@@ -66,14 +71,14 @@ export default {
name: Name,
type: 'bar',
label: {
show: true,
show: labelShow,
position: 'top', // 在顶部显示
formatter: '{c}w' // 格式化金额，{c} 代表数据值
},
itemStyle:{
barBorderRadius: 5,
},
barWidth: 30,
barWidth: barW,
data: x.DetailList.map(y=>{return (y.Profit/10000).toFixed(2)}) // 绑定实时数据数组
}
datas.push(obj)
......
src/components/FinancialModule/DataAnalysis/components/oneEchart/WoolRateColumnar.vue
View file @ 0839690c
......@@ -59,6 +59,11 @@ export default {
let titles = []
let Stocklegend = {}
let Newobj = {}
let barW =30; let labelShow=true;
if(this.LineAnalysisData.length >=3){barW=29;}
if(this.LineAnalysisData.length >=4){barW=23;labelShow=false;}
if(this.LineAnalysisData.length >=5){barW=19;labelShow=false;}
if(this.LineAnalysisData.length >=7){barW=16;labelShow=false;}
this.LineAnalysisData.forEach((x,indexs)=>{
let Name = `${x.Name}`
titles.push(Name)
......@@ -66,14 +71,14 @@ export default {
name: Name,
type: 'bar',
label: {
show: true,
show: labelShow,
position: 'top', // 在顶部显示
formatter: '{c}w' // 格式化金额，{c} 代表数据值
},
itemStyle:{
barBorderRadius: 5,
},
barWidth: 30,
barWidth: barW,
data: x.DetailList.map(y=>{return (y.MaoLi/10000).toFixed(2)}) // 绑定实时数据数组
}
datas.push(obj)
......
src/components/FinancialModule/DataAnalysis/components/twoEchart/ActualProfit.vue 0 → 100644
View file @ 0839690c
<template>
<div class="echartsBox">
<div class="titleBox row">
<h3>实际利率变化趋势图</h3>
<div style="margin-left: 20px;">
</div>
</div>
<div style="background: #fff;">
<div id="ActualProfit" class="allMyEchartBox" ></div>
</div>
</div>
</template>
<script>
export default {
props:['msgData','StatisticalData'],
data() {
return {
MonthList: [],//月份列表
BranchAnalysisData: [],//各线路统计
colorList:['#089bab','#FFA171','#72b8ff','#ff9cc6','#7b78ff','#28cc90','#ee8fff','#5cf2ff','#ff9a00','#4fc4f7','#738eff','#b0edff',
'rgba(228,57,57,.9)','rgba(248,126,46,1)','rgba(252,196,34,.7)','#3DD948','#39CAE4','rgba(44,49,241,.6)','rgba(122,57,228,.5)','#E65FC1','#D0B478','#BABABA',
'rgba(228,57,57,.7)','rgba(247,154,44,.7)','rgba(255,246,11,.7)','rgba(61,217,72,.7)','rgba(57,202,228,.7)','rgba(44,49,241,.7)','rgba(122,57,228,.7)'],
}
},
created() {
window.addEventListener('resize', this.handleResize);
},
destroyed() {
window.removeEventListener('resize', this.handleResize);
},
watch: {
StatisticalData:{
handler(n,o){
this.MonthList = n.MonthList//月份列表
this.BranchAnalysisData = n.BranchAnalysisData//各线路统计
this.getEchart()
},
deep: true,
immediate: false,
}
},
mounted() {
},
methods: {
handleResize() {
location.reload()
},
getEchart(){
let datas = []
let titles = []
let Stocklegend = {}
let Newobj = {}
this.BranchAnalysisData.forEach((x,indexs)=>{
let Name = `${x.Name}`
titles.push(Name)
let obj = {
name: Name,
type: 'line',
showSymbol: true,
smooth: true,
symbolSize: 5,
label: {
show: true,
position: 'top', // 在顶部显示
formatter: '{c}%' // 格式化金额，{c} 代表数据值
},
data: x.DetailList.map(y=>{return y.ProfitRate}) // 绑定实时数据数组
}
datas.push(obj)
if(indexs>6){
let name=x.Name;
Newobj[name]=false;
}
Stocklegend=Newobj;
})
let chartDom = document.getElementById('ActualProfit','light');
let myChart = this.$echarts.init(chartDom);
let option
option = {
color:this.colorList,
legend: {
x:'left',
y:'bottom',
type:'scroll',
icon: "circle",
padding: [5, 30, 20, 30] ,
data: titles,
// selected: Stocklegend
},
grid: {
left: 15, // 默认10%，给24就挺合适的。
top: 30, // 默认60
right: 45, // 默认10%
bottom: 70, // 默认60
containLabel: true
},
xAxis: {
type: 'category',
boundaryGap: false,
nameTextStyle: {
fontWeight: 600,
fontSize: 18
},
axisLine: {
lineStyle: {
// 设置x轴颜色
color: "transparent"
}
},
axisLabel: {
textStyle: {
color: "#333333"
}
},
data: this.MonthList
},
yAxis : [
{
type : 'value',
axisLine: {
lineStyle: {
// 设置x轴颜色
color: "transparent",
width: 1,
}
},
axisLabel: {
textStyle: {
color: "#969696"
},
formatter: '{value}%',
margin: 20 // 标签距离y轴的距离为20
},
splitLine:{
show:true,
lineStyle:{
// type:'dashed'
color:'#EEEEEE',
}
}
}
],
tooltip: {
trigger: 'axis',
axisPointer: {
lineStyle: {
type: 'dashed',
color: "#ddd"
}
},
},
dataZoom: [
{
type: 'inside',
disabled: true
}
],
series:datas
}
myChart.setOption(option,true)
},
}
}
</script>
<style>
</style>
src/components/FinancialModule/DataAnalysis/components/twoEchart/ActualRateColumnar.vue
View file @ 0839690c
<template>
<div class="echartsBox">
<div class="titleBox row">
<h3>公司净利润变化趋势图</h3>
<h3>净利润变化趋势图</h3>
<div style="margin-left: 20px;">
......
src/components/FinancialModule/DataAnalysis/components/twoEchart/ActualRateColumnarZZT.vue 0 → 100644
View file @ 0839690c
<template>
<div class="echartsBox">
<div class="titleBox row">
<h3>实际利润变化趋势图</h3>
<div style="margin-left: 20px;">
</div>
</div>
<div style="background: #fff;">
<div id="ActualMyEchartC2" class="allMyEchartBox" ></div>
</div>
</div>
</template>
<script>
export default {
props:['msgData','StatisticalData'],
data() {
return {
MonthList: [],//月份列表
BranchAnalysisData: [],
colorList:['#089bab','#FFA171','#72b8ff','#ff9cc6','#7b78ff','#28cc90','#ee8fff','#5cf2ff','#ff9a00','#4fc4f7','#738eff','#b0edff',
'rgba(228,57,57,.9)','rgba(248,126,46,1)','rgba(252,196,34,.7)','#3DD948','#39CAE4','rgba(44,49,241,.6)','rgba(122,57,228,.5)','#E65FC1','#D0B478','#BABABA',
'rgba(228,57,57,.7)','rgba(247,154,44,.7)','rgba(255,246,11,.7)','rgba(61,217,72,.7)','rgba(57,202,228,.7)','rgba(44,49,241,.7)','rgba(122,57,228,.7)'],
}
},
created() {
window.addEventListener('resize', this.handleResize);
},
destroyed() {
window.removeEventListener('resize', this.handleResize);
},
watch: {
StatisticalData:{
handler(n,o){
this.MonthList = n.MonthList//月份列表
this.BranchAnalysisData = n.BranchAnalysisData//各成本统计
this.getEchart()
},
deep: true,
immediate: false,
}
},
mounted() {
},
methods: {
handleResize() {
location.reload()
},
getEchart(){
let datas = []
let titles = []
let Stocklegend = {}
let Newobj = {}
let barW = 30;
if(this.BranchAnalysisData.length >=2){barW=28;}
if(this.BranchAnalysisData.length >=3){barW=27;}
if(this.BranchAnalysisData.length >=4){barW=22;}
if(this.BranchAnalysisData.length >=5){barW=17;}
if(this.BranchAnalysisData.length >=7){barW=15;}
this.BranchAnalysisData.forEach((x,indexs)=>{
let Name = `${x.Name}`
titles.push(Name)
let obj = {
name: Name,
type: 'bar',
label: {
show: true,
position: 'top', // 在顶部显示
formatter: '{c}w' // 格式化金额，{c} 代表数据值
},
itemStyle:{
barBorderRadius: 5,
},
barWidth: barW,
data: x.DetailList.map(y=>{return (y.Profit/10000).toFixed(2)}) // 绑定实时数据数组
}
datas.push(obj)
if(indexs>6){
let name=x.Name;
Newobj[name]=false;
}
Stocklegend=Newobj;
})
let chartDom = document.getElementById('ActualMyEchartC2','light');
let myChart = this.$echarts.init(chartDom);
let option
option = {
color:this.colorList,
legend: {
x:'left',
y:'bottom',
type:'scroll',
icon: "circle",
padding: [5, 30, 20, 30] ,
data: titles,
// selected: Stocklegend
},
grid: {
left: 15, // 默认10%，给24就挺合适的。
top: 30, // 默认60
right: 45, // 默认10%
bottom: 70, // 默认60
containLabel: true
},
xAxis: {
type: 'category',
boundaryGap: false,
nameTextStyle: {
fontWeight: 600,
fontSize: 18
},
axisLine: {
lineStyle: {
// 设置x轴颜色
color: "transparent"
}
},
axisLabel: {
textStyle: {
color: "#333333"
}
},
data: this.MonthList
},
yAxis : [
{
type : 'value',
axisLine: {
lineStyle: {
// 设置x轴颜色
color: "transparent",
width: 1,
}
},
axisLabel: {
textStyle: {
color: "#969696"
},
formatter: '{value}w',
margin: 20 // 标签距离y轴的距离为20
},
splitLine:{
show:true,
lineStyle:{
// type:'dashed'
color:'#EEEEEE',
}
}
}
],
tooltip: {
trigger: 'axis',
axisPointer: {
lineStyle: {
type: 'dashed',
color: "#ddd"
}
}
},
dataZoom: [
{
type: 'inside',
disabled: true
}
],
series:datas
}
myChart.setOption(option,true)
},
}
}
</script>
<style>
</style>
src/components/FinancialModule/DataAnalysis/components/twoEchart/ChangeProportion.vue
View file @ 0839690c
<template>
<div class="echartsBox">
<div class="titleBox text-center row">
<h3>公司毛利变化趋势图</h3>
<h3>毛利率变化趋势图</h3>
<div style="margin-left: 20px;">
......@@ -85,9 +85,9 @@ export default {
label: {
show: true,
position: 'top', // 在顶部显示
formatter: '{c}w' // 格式化金额，{c} 代表数据值
formatter: '{c}%' // 格式化金额，{c} 代表数据值
},
data: x.DetailList.map(y=>{return (y.MaoLi/10000).toFixed(2)}) // 绑定实时数据数组
data: x.DetailList.map(y=>{return y.MaoLiRate}) // 绑定实时数据数组
}
datas.push(obj)
if(indexs>6){
......@@ -151,7 +151,7 @@ export default {
textStyle: {
color: "#969696"
},
formatter: '{value}w',
formatter: '{value}%',
margin: 20 // 标签距离y轴的距离为20
},
splitLine:{
......
src/components/FinancialModule/DataAnalysis/components/twoEchart/CurrentExpense.vue 0 → 100644
View file @ 0839690c
<template>
<div class="echartsBox">
<div class="titleBox row">
<h3>管销费用变化趋势图</h3>
<div style="margin-left: 20px;">
</div>
</div>
<div style="background: #fff;">
<div id="CurrentExpense" class="allMyEchartBox" ></div>
</div>
</div>
</template>
<script>
export default {
props:['msgData','StatisticalData'],
data() {
return {
MonthList: [],//月份列表
BranchAnalysisData: [],//各线路统计
colorList:['#089bab','#FFA171','#72b8ff','#ff9cc6','#7b78ff','#28cc90','#ee8fff','#5cf2ff','#ff9a00','#4fc4f7','#738eff','#b0edff',
'rgba(228,57,57,.9)','rgba(248,126,46,1)','rgba(252,196,34,.7)','#3DD948','#39CAE4','rgba(44,49,241,.6)','rgba(122,57,228,.5)','#E65FC1','#D0B478','#BABABA',
'rgba(228,57,57,.7)','rgba(247,154,44,.7)','rgba(255,246,11,.7)','rgba(61,217,72,.7)','rgba(57,202,228,.7)','rgba(44,49,241,.7)','rgba(122,57,228,.7)'],
}
},
created() {
window.addEventListener('resize', this.handleResize);
},
destroyed() {
window.removeEventListener('resize', this.handleResize);
},
watch: {
StatisticalData:{
handler(n,o){
this.MonthList = n.MonthList//月份列表
this.BranchAnalysisData = n.BranchAnalysisData//各线路统计
this.getEchart()
},
deep: true,
immediate: false,
}
},
mounted() {
},
methods: {
handleResize() {
location.reload()
},
getEchart(){
let datas = []
let titles = []
let Stocklegend = {}
let Newobj = {}
this.BranchAnalysisData.forEach((x,indexs)=>{
let Name = `${x.Name}`
titles.push(Name)
let obj = {
name: Name,
type: 'line',
showSymbol: true,
smooth: true,
symbolSize: 5,
label: {
show: true,
position: 'top', // 在顶部显示
formatter: '{c}w' // 格式化金额，{c} 代表数据值
},
data: x.DetailList.map(y=>{return (y.GXFY/10000).toFixed(2)}) // 绑定实时数据数组
}
datas.push(obj)
if(indexs>6){
let name=x.Name;
Newobj[name]=false;
}
Stocklegend=Newobj;
})
let chartDom = document.getElementById('CurrentExpense','light');
let myChart = this.$echarts.init(chartDom);
let option
option = {
color:this.colorList,
legend: {
x:'left',
y:'bottom',
type:'scroll',
icon: "circle",
padding: [5, 30, 20, 30] ,
data: titles,
// selected: Stocklegend
},
grid: {
left: 15, // 默认10%，给24就挺合适的。
top: 30, // 默认60
right: 45, // 默认10%
bottom: 70, // 默认60
containLabel: true
},
xAxis: {
type: 'category',
boundaryGap: false,
nameTextStyle: {
fontWeight: 600,
fontSize: 18
},
axisLine: {
lineStyle: {
// 设置x轴颜色
color: "transparent"
}
},
axisLabel: {
textStyle: {
color: "#333333"
}
},
data: this.MonthList
},
yAxis : [
{
type : 'value',
axisLine: {
lineStyle: {
// 设置x轴颜色
color: "transparent",
width: 1,
}
},
axisLabel: {
textStyle: {
color: "#969696"
},
formatter: '{value}w',
margin: 20 // 标签距离y轴的距离为20
},
splitLine:{
show:true,
lineStyle:{
// type:'dashed'
color:'#EEEEEE',
}
}
}
],
tooltip: {
trigger: 'axis',
axisPointer: {
lineStyle: {
type: 'dashed',
color: "#ddd"
}
},
},
dataZoom: [
{
type: 'inside',
disabled: true
}
],
series:datas
}
myChart.setOption(option,true)
},
}
}
</script>
<style>
</style>
src/components/FinancialModule/DataAnalysis/components/twoEchart/WoolRateColumnar.vue
View file @ 0839690c
<template>
<div class="echartsBox">
<div class="titleBox row">
<h3>公司营业利润变化趋势图</h3>
<h3>营业利润变化趋势图</h3>
<div style="margin-left: 20px;">
......
src/components/FinancialModule/DataAnalysis/components/twoEchart/WoolRateColumnarZZT.vue 0 → 100644
View file @ 0839690c
<template>
<div class="echartsBox">
<div class="titleBox row">
<h3>公司毛利变化趋势图</h3>
<div style="margin-left: 20px;">
</div>
</div>
<div style="background: #fff;">
<div id="WoolMyEchartC2" class="allMyEchartBox" ></div>
</div>
</div>
</template>
<script>
export default {
props:['msgData','StatisticalData'],
data() {
return {
MonthList: [],//月份列表
CostAnalysisData: [],
colorList:['#089bab','#FFA171','#72b8ff','#ff9cc6','#7b78ff','#28cc90','#ee8fff','#5cf2ff','#ff9a00','#4fc4f7','#738eff','#b0edff',
'rgba(228,57,57,.9)','rgba(248,126,46,1)','rgba(252,196,34,.7)','#3DD948','#39CAE4','rgba(44,49,241,.6)','rgba(122,57,228,.5)','#E65FC1','#D0B478','#BABABA',
'rgba(228,57,57,.7)','rgba(247,154,44,.7)','rgba(255,246,11,.7)','rgba(61,217,72,.7)','rgba(57,202,228,.7)','rgba(44,49,241,.7)','rgba(122,57,228,.7)'],
}
},
created() {
window.addEventListener('resize', this.handleResize);
},
destroyed() {
window.removeEventListener('resize', this.handleResize);
},
watch: {
StatisticalData:{
handler(n,o){
this.MonthList = n.MonthList//月份列表
this.BranchAnalysisData = n.BranchAnalysisData//各线路统计
this.getEchart()
},
deep: true,
immediate: false,
}
},
mounted() {
},
methods: {
handleResize() {
location.reload()
},
getEchart(){
let datas = []
let titles = []
let Stocklegend = {}
let Newobj = {}
let barW = 30;
if(this.BranchAnalysisData.length >=2){barW=28;}
if(this.BranchAnalysisData.length >=3){barW=27;}
if(this.BranchAnalysisData.length >=4){barW=22;}
if(this.BranchAnalysisData.length >=5){barW=17;}
if(this.BranchAnalysisData.length >=7){barW=15;}
this.BranchAnalysisData.forEach((x,indexs)=>{
let Name = `${x.Name}`
titles.push(Name)
let obj = {
name: Name,
type: 'bar',
label: {
show: true,
position: 'top', // 在顶部显示
formatter: '{c}w' // 格式化金额，{c} 代表数据值
},
itemStyle:{
barBorderRadius: 5,
},
barWidth: barW,
data: x.DetailList.map(y=>{return (y.MaoLi/10000).toFixed(2)}) // 绑定实时数据数组
}
datas.push(obj)
if(indexs>6){
let name=x.Name;
Newobj[name]=false;
}
Stocklegend=Newobj;
})
let chartDom = document.getElementById('WoolMyEchartC2','light');
let myChart = this.$echarts.init(chartDom);
let option
option = {
color:this.colorList,
legend: {
x:'left',
y:'bottom',
type:'scroll',
icon: "circle",
padding: [5, 30, 20, 30] ,
data: titles,
// selected: Stocklegend
},
grid: {
left: 15, // 默认10%，给24就挺合适的。
top: 30, // 默认60
right: 45, // 默认10%
bottom: 70, // 默认60
containLabel: true
},
xAxis: {
type: 'category',
boundaryGap: false,
nameTextStyle: {
fontWeight: 600,
fontSize: 18
},
axisLine: {
lineStyle: {
// 设置x轴颜色
color: "transparent"
}
},
axisLabel: {
textStyle: {
color: "#333333"
}
},
data: this.MonthList
},
yAxis : [
{
type : 'value',
axisLine: {
lineStyle: {
// 设置x轴颜色
color: "transparent",
width: 1,
}
},
axisLabel: {
textStyle: {
color: "#969696"
},
formatter: '{value}w',
margin: 20 // 标签距离y轴的距离为20
},
splitLine:{
show:true,
lineStyle:{
// type:'dashed'
color:'#EEEEEE',
}
}
}
],
tooltip: {
trigger: 'axis',
axisPointer: {
lineStyle: {
type: 'dashed',
color: "#ddd"
}
}
},
dataZoom: [
{
type: 'inside',
disabled: true
}
],
series:datas
}
myChart.setOption(option,true)
},
}
}
</script>
<style>
</style>
src/components/FinancialModule/DataAnalysis/index.vue
View file @ 0839690c
<template>
<div style="height: 100%;">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="线路经营情况" name="1"></el-tab-pane>
<el-tab-pane label="公司经营情况" name="2"></el-tab-pane>
<el-tab-pane label="日本小包OR常规" name="3"></el-tab-pane>
<el-tab-pane label="购物佣金情况" name="4"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3" label="线路经营情况" name="1"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3" label="公司经营情况" name="2"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3" label="日本小包OR常规" name="3"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=2" label="购物佣金情况" name="4"></el-tab-pane>
</el-tabs>
<div class="query-box">
<el-form class="_info_box clearfix" label-width="90px">
......@@ -16,6 +16,7 @@
v-model="msg.OutBranchId"
@change="getChange"
clearable
:disabled="PermissionState==2"
>
<el-option
:value="-1"
......@@ -91,7 +92,7 @@
<el-input v-model="shopMsg.MaoLiRate" type="number" @change="getMaoLiRate"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if="activeName!=4">
<el-col :span="4" v-if="activeName!=4 && activeName!=3">
<el-form-item label="线路">
<el-select filterable v-model="msg.LineId" @change="getStatement"
clearable>
......@@ -187,6 +188,7 @@ export default {
coinGetShow: false,
loading: false,
activeName: '1',
PermissionState: '0',//权限状态 1管理员级 2各公司负责人 3地接OP查询佣金
msg:{
startDate: '',
endDate: '',
......@@ -258,6 +260,23 @@ export default {
this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
this.msg.startDate = this.dateTime[0]
this.msg.endDate = this.dateTime[1]
let userInfo = this.getLocalStorage();
if(userInfo.RB_Group_id==2){
if(userInfo.RB_Branch_id==0||userInfo.RB_Branch_id==49){
this.PermissionState=1;
if(userInfo.RB_Post_Id==171){
this.PermissionState=3;//地接OP
this.activeName='4';
}
}
else{
//分公司的 看各自公司的数据 佣金暂时不开
this.PermissionState=2;
this.msg.OutBranchId=userInfo.RB_Branch_id;
}
}
this.financeinfo_post_GetList()
this.getQueryData()
this.getShops()
......@@ -304,8 +323,7 @@ export default {
})
},
getStatement(){
if(this.msg.Type==2) this.msg.IsLastData = 2
else this.msg.IsLastData = 0
this.msg.IsLastData = 0
let msg = this.msg
let url ='financestatistics_post_GetDataAnalysisStat'
if(this.activeName=='4') {
......
src/components/FinancialModule/RecPayQueryKM.vue 0 → 100644
View file @ 0839690c
This diff is collapsed.
src/components/PersonalInfoSet.vue
View file @ 0839690c
......@@ -1089,7 +1089,7 @@
newArr.push(file.file);
let path = "/Sale/Uploadvideo/";
this.UploadFileToAli2024(path, newArr, x => {
//console.log("UploadFileToAli2024", x)
});
},
//绑定手机
......
src/components/commonPage/DMCchooseImg.vue
View file @ 0839690c
......@@ -255,7 +255,7 @@
pageIndex: 1,
currentPage: 1,
total: 0,
Type: 1, //1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店
Type: 0, //1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店
Name: "", //资源图片名称
SourceId: 0 //资源编号
},
......
src/router/config.js
View file @ 0839690c
......@@ -4171,6 +4171,14 @@ export default {
title: '收支款查询管理'
},
}, { //财务 财务单据 收款查询管理
path: '/RecPayQueryKM',
name: 'RecPayQueryKM',
component: resolve => require(['@/components/FinancialModule/RecPayQueryKM'], resolve),
meta: {
title: '科目收支查询'
},
},
{ //财务 财务单据 收款查询管理
path: '/RecPayQueryWB',
name: 'RecPayQueryWB',
component: resolve => require(['@/components/FinancialModule/RecPayQueryWB'], resolve),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment