Skip to content

E
ElectricitySheep
Commit 44f1662c authored by Mac's avatar Mac
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents f8c8b3e2 39e2daea
Hide whitespace changes
Inline Side-by-side
Showing with 262 additions and 270 deletions
src/components/statistics/cutomerStatistics.vue
View file @ 44f1662c
......@@ -8,25 +8,15 @@
</div>
<div class="content">
<div style="display: flex;flex-direction: row;align-items: center">
<el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.Source" size="small" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.Id"
:label="item.Name"
:value="item.Id">
<el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.Source" size="small"
placeholder="请选择">
<el-option v-for="item in options" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<div class="block">
<el-date-picker
style="padding: 3px 10px;width: 380px;height: 32px"
v-model="value"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
@change="getList"
align="right">
<el-date-picker style="padding: 3px 10px;width: 380px;height: 32px" v-model="value" type="daterange"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
@change="getList" align="right">
</el-date-picker>
</div>
<el-tabs v-model="activeName" @tab-click="handleClick" style="margin-left: 20px">
......@@ -74,37 +64,17 @@
</div>
<div style="padding: 20px;background: #fff;margin-top: 10px">
<el-table
v-loading="loading"
:data="tableData"
header-cell-class-name="headClass"
style="width: 100%;"
>
<el-table-column
prop="TimeStr"
label="日期"
width="342">
<el-table v-loading="loading" :data="tableData" header-cell-class-name="headClass" style="width: 100%;">
<el-table-column prop="TimeStr" label="日期" min-width="2">
</el-table-column>
<el-table-column
prop="Pink"
label="普象会员"
width="339">
<el-table-column prop="Pink" label="普象会员" min-width="2">
</el-table-column>
<el-table-column
prop="VIP"
label="VIP会员"
width="339">
<el-table-column prop="VIP" label="VIP会员" min-width="2">
</el-table-column>
<el-table-column
prop="Silver"
label="银象"
width="339">
<el-table-column prop="Silver" label="银象" min-width="2">
</el-table-column>
<el-table-column
prop="Gold"
label="金象"
>
<el-table-column prop="Gold" label="金象" min-width="2">
</el-table-column>
</el-table>
</div>
......@@ -113,74 +83,77 @@
<script>
export default {
data(){
return{
msg:{
  Source:0,
StartDate:'',
EndDate:'',
data() {
return {
msg: {
Source: 0,
StartDate: '',
EndDate: '',
},
loading:false,
options:[],
tableData:[],
count:0,
value:'',
activeName:'',
loading: false,
options: [],
tableData: [],
count: 0,
value: '',
activeName: '',
//总客户和今日用户
UserData:[],
UserData: [],
}
},
created(){
created() {
this.getplat();
this.getMallDistri();
this.getList();
},
methods:{
methods: {
//获取顶部客户统计
getMallDistri(){
getMallDistri() {
this.apipost("/api/Tenant/MallDistributorStatistics", {}, res => {
if(res.data.resultCode==1){
this.UserData = res.data.data;
}else{
this.Error(res.data.message);
if (res.data.resultCode == 1) {
this.UserData = res.data.data;
} else {
this.Error(res.data.message);
}
})
},
//获取平台
getplat(){
getplat() {
this.apipost("/api/User/GetMemberUserSourceEnumList", {}, res => {
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.options = res.data.data;
this.options.unshift({Name: "全部平台", Id: 0})
this.options.unshift({
Name: "全部平台",
Id: 0
})
}
})
},
//获取列表
getList(){
if(this.value!='' && this.value != null){
getList() {
if (this.value != '' && this.value != null) {
this.msg.StartDate = this.value[0];
this.msg.EndDate = this.value[1];
}else{
} else {
this.msg.StartDate = '';
this.msg.EndDate = '';
}
this.loading=true;
this.loading = true;
this.apipost("/api/Tenant/MallDistributorDayStatistics", this.msg, res => {
this.loading=false
if(res.data.resultCode==1){
this.loading = false
if (res.data.resultCode == 1) {
this.tableData = res.data.data;
}else {
} else {
this.Error(res.data.message);
}
})
},
Export(){
Export() {
let msg = {
PlatformType:this.msg.PlatformType,
StartDate :this.msg.StartDate ,
EndDate :this.msg.EndDate,
OrderType :this.msg.OrderType,
PlatformType: this.msg.PlatformType,
StartDate: this.msg.StartDate,
EndDate: this.msg.EndDate,
OrderType: this.msg.OrderType,
}
msg = JSON.parse(JSON.stringify(msg));
......@@ -190,20 +163,20 @@
"销售统计.xls"
);
},
empty(){
this.msg.Source=0;
this.value='';
empty() {
this.msg.Source = 0;
this.value = '';
this.getList();
},
handleClick(tab, event) {
if(tab.name=='first'){
if (tab.name == 'first') {
this.fun_date(7)
}else if(tab.name=='second'){
} else if (tab.name == 'second') {
this.fun_date(30)
}
},
fun_date(num){
let that= this
fun_date(num) {
let that = this
let date1 = new Date();
//今天时间
let time1 = date1.getFullYear() + "-" + (date1.getMonth() + 1) + "-" + date1.getDate()
......@@ -219,69 +192,81 @@
this.getList();
},
},
mounted(){
mounted() {
}
}
</script>
<style >
</script>
.salesStatistics .el-card__header{
<style>
.salesStatistics .el-card__header {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
background: #fff;
}
.salesStatistics .el-button--small{
.salesStatistics .el-button--small {
padding: 9px 15px;
}
.salesStatistics .content .searchInput{
.salesStatistics .content .searchInput {
border: 1px solid #DCDFE6;
border-radius: 4px;
}
.salesStatistics .content .searchInput .el-input__inner{
border:none;outline:none;
.salesStatistics .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
.salesStatistics .content .searchInput{
.salesStatistics .content .searchInput {
line-height: normal;
display: inline-table;
border-collapse: separate;
border-spacing: 0;
width:250px;
width: 250px;
margin-right: 20px;
}
.salesStatistics .content{
.salesStatistics .content {
background: #fff;
margin-top:10px;
margin-top: 10px;
padding: 15px;
box-sizing: border-box;
}
.salesStatistics .el-icon-date{
.salesStatistics .el-icon-date {
line-height: 24px;
}
.salesStatistics .el-range-separator{
.salesStatistics .el-range-separator {
line-height: 24px;
}
.salesStatistics .zong{
.salesStatistics .zong {
width: 100%;
height: 57px;
padding: 18px 20px;
border-bottom: 1px solid #EBEEF5;
background: white;
}
.salesStatistics .table-area {
margin: 10px 0;
display: flex;
justify-content: space-between;
}
.salesStatistics .table-area {
margin: 10px 0;
display: flex;
justify-content: space-between;
}
.salesStatistics .table-area .el-card {
width: 49.5%;
color: #303133;
}
.salesStatistics .el-card {
border: 1px solid #EBEEF5;
background-color: #FFF;
......@@ -289,15 +274,18 @@
-webkit-transition: .3s;
transition: .3s;
}
.salesStatistics .el-card__header {
padding: 18px 20px;
border-bottom: 1px solid #EBEEF5;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.salesStatistics .el-card__body {
padding: 20px;
}
.salesStatistics .num-info {
display: flex;
width: 100%;
......@@ -306,13 +294,16 @@
color: #303133;
margin: 20px 0;
}
.salesStatistics .num-info .num-info-item {
text-align: center;
flex-grow: 1;
border-left: 1px dashed #EFF1F7;
}
.salesStatistics .info-item-name {
font-size: 14px;
color: #92959B;
}
</style>
src/components/statistics/salesStatistics.vue
View file @ 44f1662c
......@@ -8,33 +8,20 @@
</div>
<div class="content">
<div style="display: flex;flex-direction: row;align-items: center">
<el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.PlatformType" size="small" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.Id"
:label="item.Name"
:value="item.Id">
<el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.PlatformType" size="small"
placeholder="请选择">
<el-option v-for="item in options" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<el-select class="w100" @change="getList" style="margin-right: 10px;" size="small" v-model="msg.OrderType" placeholder="请选择">
<el-option
v-for="item in options2"
:key="item.Id"
:label="item.Name"
:value="item.Id">
<el-select class="w100" @change="getList" style="margin-right: 10px;" size="small" v-model="msg.OrderType"
placeholder="请选择">
<el-option v-for="item in options2" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<div class="block">
<el-date-picker
style="padding: 3px 10px;width: 380px;height: 32px"
v-model="value"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
@change="change"
align="right">
<el-date-picker style="padding: 3px 10px;width: 380px;height: 32px" v-model="value" type="daterange"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
@change="change" align="right">
</el-date-picker>
</div>
<el-tabs v-model="activeName" @tab-click="handleClick" style="margin-left: 20px">
......@@ -106,49 +93,22 @@
<div style="padding: 20px;background: #fff;margin-top: 10px">
<el-tabs v-model="msg.OrderStatus" @tab-click="handleClick2">
<el-tab-pane v-for="(item,index) of tabsList" :key = index :label="item.Name" :name="item.ID"></el-tab-pane>
<el-tab-pane v-for="(item,index) of tabsList" :key=index :label="item.Name" :name="item.ID"></el-tab-pane>
</el-tabs>
<el-table
v-loading="Listloading"
:data="tableData"
header-cell-class-name="headClass"
style="width: 1698px;"
>
<el-table-column
prop="CreateDate"
label="日期"
width="342">
<el-table v-loading="Listloading" :data="tableData" header-cell-class-name="headClass" style="width: 100%;">
<el-table-column prop="CreateDate" label="日期" min-width="2">
</el-table-column>
<el-table-column
prop="PayMemerNum"
label="付款人数"
width="339">
<el-table-column prop="PayMemerNum" label="付款人数" min-width="2">
</el-table-column>
<el-table-column
prop="OrderNum"
label="付款订单数"
width="339">
<el-table-column prop="OrderNum" label="付款订单数" min-width="2">
</el-table-column>
<el-table-column
prop="PayMoney"
label="付款金额"
width="339">
<el-table-column prop="PayMoney" label="付款金额" min-width="2">
</el-table-column>
<el-table-column
prop="GoodsNum"
label="付款件数"
>
<el-table-column prop="GoodsNum" label="付款件数" min-width="2">
</el-table-column>
</el-table>
<el-pagination style="text-align:right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
:current-page.sync="msg.pageIndex"
layout="prev, pager, next"
:total="count">
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
:current-page.sync="msg.pageIndex" layout="prev, pager, next" :total="count">
</el-pagination>
</div>
</div>
......@@ -157,41 +117,58 @@
<script>
export default {
name: "salesStatistics",
data(){
return{
msg:{
pageIndex:1,
pageSize:20,
PlatformType:0,
StartDate:'',
EndDate:'',
OrderStatus:0,
OrderType:0,
data() {
return {
msg: {
pageIndex: 1,
pageSize: 20,
PlatformType: 0,
StartDate: '',
EndDate: '',
OrderStatus: 0,
OrderType: 0,
},
Listloading:false,
tabsList:[
{'Name':'全部',"ID":'0'},
{'Name':'未完成订单',"ID":'1'},
{'Name':'已完成订单',"ID":'2'},
{'Name':'已取消订单',"ID":'3'},
{'Name':'售后中订单',"ID":'4'},
{'Name':'已完成售后订单',"ID":'5'},
Listloading: false,
tabsList: [{
'Name': '全部',
"ID": '0'
},
{
'Name': '未完成订单',
"ID": '1'
},
{
'Name': '已完成订单',
"ID": '2'
},
{
'Name': '已取消订单',
"ID": '3'
},
{
'Name': '售后中订单',
"ID": '4'
},
{
'Name': '已完成售后订单',
"ID": '5'
},
],
options:[],
options2:[],
Coupon:0,
tableData:[],
count:0,
value:'',
activeName:'',
loading:false,
Totaldata:{
options: [],
options2: [],
Coupon: 0,
tableData: [],
count: 0,
value: '',
activeName: '',
loading: false,
Totaldata: {
OrderNum: "0",
GoodsNum: "0",
PayMemerNum: "0",
PayMoney: "0",
},
Totaldata2:{
Totaldata2: {
OrderNum: "0",
GoodsNum: "0",
PayMemerNum: "0",
......@@ -199,96 +176,102 @@
}
}
},
created(){
created() {
this.getplat();
this.getOrderTypeEnumEnumList()
this.getIntegraStatisticslList()
},
methods:{
getplat(){
methods: {
getplat() {
this.apipost("/api/User/GetMemberUserSourceEnumList", {}, res => {
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.options = res.data.data;
this.options.unshift({Name: "全部平台", Id: 0})
this.options.unshift({
Name: "全部平台",
Id: 0
})
}
})
},
getOrderTypeEnumEnumList(){
getOrderTypeEnumEnumList() {
this.apipost("/api/Order/GetOrderTypeEnumEnumList", {}, res => {
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.options2 = res.data.data;
this.options2.unshift({Name: "全部订单", Id: 0})
this.options2.unshift({
Name: "全部订单",
Id: 0
})
}
})
},
change(val){
this.activeName=''
this.msg.pageIndex=1
change(val) {
this.activeName = ''
this.msg.pageIndex = 1
this.getIntegraStatisticslList(false)
},
getDataList(show=false){
if(this.value!='' && this.value != null){
getDataList(show = false) {
if (this.value != '' && this.value != null) {
this.msg.StartDate = this.value[0];
this.msg.EndDate = this.value[1];
}else{
} else {
this.msg.StartDate = '';
this.msg.EndDate = '';
}
if(show==true){
this.Listloading=true;
if (show == true) {
this.Listloading = true;
}
this.apipost("/api/Statistics/GetSellPageList", this.msg, res => {
this.Listloading=false
this.Listloading = false
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.count = res.data.data.count;
}else {
} else {
this.Info(res.data.message);
}
})
},
getIntegraStatisticslList(show= true){
this.loading=true;
getIntegraStatisticslList(show = true) {
this.loading = true;
this.getDataList()
let Totalmsg = {
PlatformType:this.msg.PlatformType,
StartDate :this.msg.StartDate ,
EndDate :this.msg.EndDate,
OrderType :this.msg.OrderType,
PlatformType: this.msg.PlatformType,
StartDate: this.msg.StartDate,
EndDate: this.msg.EndDate,
OrderType: this.msg.OrderType,
}
this.apipost("/api/Statistics/GetSellOrder", Totalmsg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.loading = false;
if (res.data.resultCode == 1) {
this.Totaldata = res.data.data;
}else {
} else {
this.Info(res.data.message);
}
})
if(show==true){
if (show == true) {
let Totalmsg2 = {
PlatformType:this.msg.PlatformType,
StartDate :this.msg.StartDate ,
EndDate :this.msg.EndDate,
OrderType :this.msg.OrderType,
PlatformType: this.msg.PlatformType,
StartDate: this.msg.StartDate,
EndDate: this.msg.EndDate,
OrderType: this.msg.OrderType,
}
var day1 = new Date();
day1.setTime(day1.getTime());
var s1 = day1.getFullYear()+"-" + (day1.getMonth()+1) + "-" + day1.getDate();
Totalmsg2.StartDate=s1
Totalmsg2.EndDate=s1
var s1 = day1.getFullYear() + "-" + (day1.getMonth() + 1) + "-" + day1.getDate();
Totalmsg2.StartDate = s1
Totalmsg2.EndDate = s1
this.apipost("/api/Statistics/GetSellOrder", Totalmsg2, res => {
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.Totaldata2 = res.data.data;
}else {
} else {
this.Info(res.data.message);
}
......@@ -301,12 +284,12 @@
this.msg.pageIndex = val;
this.getDataList()
},
Export(){
Export() {
let msg = {
PlatformType:this.msg.PlatformType,
StartDate :this.msg.StartDate ,
EndDate :this.msg.EndDate,
OrderType :this.msg.OrderType,
PlatformType: this.msg.PlatformType,
StartDate: this.msg.StartDate,
EndDate: this.msg.EndDate,
OrderType: this.msg.OrderType,
}
msg = JSON.parse(JSON.stringify(msg));
......@@ -316,30 +299,30 @@
"销售统计.xls"
);
},
empty(){
this.msg.PlatformType=0;
this.msg.OrderType=0;
this.msg.StartDate='';
this.msg.EndDate='';
this.msg.pageIndex=1
this.value='';
this.activeName='';
empty() {
this.msg.PlatformType = 0;
this.msg.OrderType = 0;
this.msg.StartDate = '';
this.msg.EndDate = '';
this.msg.pageIndex = 1
this.value = '';
this.activeName = '';
this.getIntegraStatisticslList()
},
handleClick(tab, event) {
if(tab.name=='first'){
if (tab.name == 'first') {
this.fun_date(7)
}else if(tab.name=='second'){
} else if (tab.name == 'second') {
this.fun_date(30)
}
},
handleClick2(){
this.msg.pageIndex=1
handleClick2() {
this.msg.pageIndex = 1
this.getDataList(true)
},
fun_date(num){
let that= this
fun_date(num) {
let that = this
let date1 = new Date();
//今天时间
let time1 = date1.getFullYear() + "-" + (date1.getMonth() + 1) + "-" + date1.getDate()
......@@ -351,78 +334,90 @@
data.push(time2)
data.push(time1)
that.value = data;
this.msg.pageIndex=1
this.msg.pageIndex = 1
this.getIntegraStatisticslList(false)
},
getList(){
this.msg.pageIndex=1
getList() {
this.msg.pageIndex = 1
this.getIntegraStatisticslList()
}
},
mounted(){
mounted() {
}
}
</script>
<style >
</script>
.salesStatistics .el-card__header{
<style>
.salesStatistics .el-card__header {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
background: #fff;
}
.salesStatistics .el-button--small{
.salesStatistics .el-button--small {
padding: 9px 15px;
}
.salesStatistics .content .searchInput{
.salesStatistics .content .searchInput {
border: 1px solid #DCDFE6;
border-radius: 4px;
}
.salesStatistics .content .searchInput .el-input__inner{
border:none;outline:none;
.salesStatistics .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
.salesStatistics .content .searchInput{
.salesStatistics .content .searchInput {
line-height: normal;
display: inline-table;
border-collapse: separate;
border-spacing: 0;
width:250px;
width: 250px;
margin-right: 20px;
}
.salesStatistics .content{
.salesStatistics .content {
background: #fff;
margin-top:10px;
margin-top: 10px;
padding: 15px;
box-sizing: border-box;
}
.salesStatistics .el-icon-date{
.salesStatistics .el-icon-date {
line-height: 24px;
}
.salesStatistics .el-range-separator{
.salesStatistics .el-range-separator {
line-height: 24px;
}
.salesStatistics .zong{
.salesStatistics .zong {
width: 100%;
height: 57px;
padding: 18px 20px;
border-bottom: 1px solid #EBEEF5;
background: white;
}
.salesStatistics .table-area {
margin: 10px 0;
display: flex;
justify-content: space-between;
}
.salesStatistics .table-area {
margin: 10px 0;
display: flex;
justify-content: space-between;
}
.salesStatistics .table-area .el-card {
width: 49.5%;
color: #303133;
}
.salesStatistics .el-card {
border: 1px solid #EBEEF5;
background-color: #FFF;
......@@ -430,15 +425,18 @@
-webkit-transition: .3s;
transition: .3s;
}
.salesStatistics .el-card__header {
padding: 18px 20px;
border-bottom: 1px solid #EBEEF5;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.salesStatistics .el-card__body {
padding: 20px;
}
.salesStatistics .num-info {
display: flex;
width: 100%;
......@@ -447,13 +445,16 @@
color: #303133;
margin: 20px 0;
}
.salesStatistics .num-info .num-info-item {
text-align: center;
flex-grow: 1;
border-left: 1px dashed #EFF1F7;
}
.salesStatistics .info-item-name {
font-size: 14px;
color: #92959B;
}
</style>
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