Commit b67ce554 authored by 黄奎's avatar 黄奎

页面修改

parent 9c104a68
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<div class="content"> <div class="content">
<div style="display: flex;flex-direction: row;align-items: center"> <div style="display: flex;flex-direction: row;align-items: center">
<span>供应商</span> <span>供应商</span>
<el-select class="w150" style="margin-left: 10px;" v-model="msg.SupplierId" filterable size="small" placeholder="请选择" <el-select class="w150" style="margin-left: 10px;" v-model="msg.SupplierId" filterable size="small"
@change="msg.pageIndex=1,getDateList()"> placeholder="请选择" @change="msg.pageIndex=1,getDateList()">
<el-option :key="0" :value="0" label="全部"></el-option> <el-option :key="0" :value="0" label="全部"></el-option>
<el-option v-for="item in options" :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for="item in options" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -23,37 +23,25 @@ ...@@ -23,37 +23,25 @@
@change="change" align="right"> @change="change" align="right">
</el-date-picker> </el-date-picker>
</div> </div>
<span style="margin:0 10px">订单号</span> <span style="margin:0 10px">订单号</span>
<el-input v-model="msg.OrderNo" placeholder="请输入订单号" @blur='msg.pageIndex=1,getDateList()' style="width:200px" @keyup.enter.native = 'search' clearable></el-input> <el-input v-model="msg.OrderNo" placeholder="请输入订单号" @blur='msg.pageIndex=1,getDateList()' style="width:200px"
<span style="margin:0 10px">商品名称</span> @keyup.enter.native='search' clearable></el-input>
<el-autocomplete <span style="margin:0 10px">商品名称</span>
style="width:350px" <el-autocomplete style="width:350px" v-model="GoodsIDs" :fetch-suggestions="remoteMethod" placeholder="请输入"
v-model="GoodsIDs" @select="forceUpdate" @blur="spget()" :trigger-on-focus="false"></el-autocomplete>
:fetch-suggestions="remoteMethod"
placeholder="请输入"
@select="forceUpdate"
@blur="spget()"
:trigger-on-focus="false"
></el-autocomplete>
<span style="margin:0 10px">代理</span> <span style="margin:0 10px">代理</span>
<el-autocomplete <el-autocomplete v-model="OneUserId" :fetch-suggestions="querySearchAsync" placeholder="请输入"
v-model="OneUserId" @select="handleSelect" @blur="dlget()" :trigger-on-focus="false"></el-autocomplete>
:fetch-suggestions="querySearchAsync"
placeholder="请输入"
@select="handleSelect"
@blur="dlget()"
:trigger-on-focus="false"
></el-autocomplete>
</div> </div>
</div> </div>
<div style="padding: 10px 20px;background: #fff;margin-top: 10px"> <div style="padding: 10px 20px;background: #fff;margin-top: 10px">
<div class="Subtotal"> <div class="Subtotal">
<div class="Subtotal_item" style="margin:15px"> <div class="Subtotal_item" style="margin:15px">
<div style='width:100%;border-bottom:1px solid #f2f2f2'> <div style='width:100%;border-bottom:1px solid #f2f2f2'>
<i class="iconfont icon-qian groupTourOrder_count_green" style="font-size:12px"></i> <i class="iconfont icon-qian groupTourOrder_count_green" style="font-size:12px"></i>
<span class='Subtotal_t' >营业收入</span> <span class='Subtotal_t'>营业收入</span>
</div> </div>
<div><span class='Subtotal_t'>结算款:</span>{{OrderProfitLoss.TotalFinal_Price}}</div> <div><span class='Subtotal_t'>结算款:</span>{{OrderProfitLoss.TotalFinal_Price}}</div>
<div><span class='Subtotal_t'>运费:</span>{{OrderProfitLoss.TotalFreightMoney }}</div> <div><span class='Subtotal_t'>运费:</span>{{OrderProfitLoss.TotalFreightMoney }}</div>
...@@ -62,100 +50,100 @@ ...@@ -62,100 +50,100 @@
<div><span class='Subtotal_t'>合计数:</span>{{OrderProfitLoss.TotalPay}}</div> <div><span class='Subtotal_t'>合计数:</span>{{OrderProfitLoss.TotalPay}}</div>
</div> </div>
<div class="Subtotal_item" style="margin:15px"> <div class="Subtotal_item" style="margin:15px">
<div style='width:100%;border-bottom:1px solid #f2f2f2'> <div style='width:100%;border-bottom:1px solid #f2f2f2'>
<i class="iconfont icon-qian groupTourOrder_count_green" style="font-size:12px"></i> <i class="iconfont icon-qian groupTourOrder_count_green" style="font-size:12px"></i>
<span class='Subtotal_t' >营业成本</span> <span class='Subtotal_t'>营业成本</span>
</div>
<div class="ProfitLoss">
<div class="ProfitLoss_xbox">
<div><span class='Subtotal_t'>采购成本:</span>{{OrderProfitLoss.TotalCostMoney }}</div>
<div><span class='Subtotal_t'>包装费摊销:</span>{{OrderProfitLoss.TotalPackingMoney }}</div>
<div><span class='Subtotal_t'>快递费:</span>{{OrderProfitLoss.TotalCostFreight }}</div>
<div><span class='Subtotal_t'>商品运费摊销:</span>{{OrderProfitLoss.TotalGoodsFreight }}</div>
<div><span class='Subtotal_t'>分公司小计:</span>{{OrderProfitLoss.TotalBranchCommission }}</div>
</div> </div>
<div class="ProfitLoss"> <div class="ProfitLoss_xbox" style="margin-left:60px">
<div class="ProfitLoss_xbox"> <div><span class='Subtotal_t'>总代理小计:</span>{{OrderProfitLoss.TotalGeneralAgentCommission }}</div>
<div><span class='Subtotal_t'>采购成本:</span>{{OrderProfitLoss.TotalCostMoney }}</div> <div><span class='Subtotal_t'>特一级返佣:</span>{{OrderProfitLoss.TotalSpecialCommission }}</div>
<div><span class='Subtotal_t'>包装费摊销:</span>{{OrderProfitLoss.TotalPackingMoney }}</div> <div><span class='Subtotal_t'>一级返佣:</span>{{OrderProfitLoss.TotalOneCommission }}</div>
<div><span class='Subtotal_t'>快递费:</span>{{OrderProfitLoss.TotalCostFreight }}</div> <div><span class='Subtotal_t'>二级返佣:</span>{{OrderProfitLoss.TotalOneTwoCommission }}</div>
<div><span class='Subtotal_t'>商品运费摊销:</span>{{OrderProfitLoss.TotalGoodsFreight }}</div> <div><span class='Subtotal_t'>其他:</span>{{OrderProfitLoss.TotalOneOtherPrice }}</div>
<div><span class='Subtotal_t'>分公司小计:</span>{{OrderProfitLoss.TotalBranchCommission }}</div>
</div>
<div class="ProfitLoss_xbox" style="margin-left:60px">
<div><span class='Subtotal_t'>总代理小计:</span>{{OrderProfitLoss.TotalGeneralAgentCommission }}</div>
<div><span class='Subtotal_t'>特一级返佣:</span>{{OrderProfitLoss.TotalSpecialCommission }}</div>
<div><span class='Subtotal_t'>一级返佣:</span>{{OrderProfitLoss.TotalOneCommission }}</div>
<div><span class='Subtotal_t'>二级返佣:</span>{{OrderProfitLoss.TotalOneTwoCommission }}</div>
<div><span class='Subtotal_t'>其他:</span>{{OrderProfitLoss.TotalOneOtherPrice }}</div>
</div>
<div class="ProfitLoss_xbox" style="margin-left:60px">
<div><span class='Subtotal_t'>合计:</span>{{OrderProfitLoss.TotalALLCommission }}</div>
<div><span class='Subtotal_t'>已付:</span>{{OrderProfitLoss.TotalPaid }}</div>
<div><span class='Subtotal_t'>未付:</span>{{OrderProfitLoss.TotalNoPaid }}</div>
<div><span class='Subtotal_t'>毛利:</span>{{OrderProfitLoss.TotalGrossProfit }}</div>
</div>
</div> </div>
<div class="ProfitLoss_xbox" style="margin-left:60px">
<div><span class='Subtotal_t'>合计:</span>{{OrderProfitLoss.TotalALLCommission }}</div>
<div><span class='Subtotal_t'>已付:</span>{{OrderProfitLoss.TotalPaid }}</div>
<div><span class='Subtotal_t'>未付:</span>{{OrderProfitLoss.TotalNoPaid }}</div>
<div><span class='Subtotal_t'>毛利:</span>{{OrderProfitLoss.TotalGrossProfit }}</div>
</div>
</div>
</div> </div>
</div>
</div> </div>
<el-table :data="tableData" v-loading="loading" header-cell-class-name="headClass" style="width: 100%" border> </div>
<el-table-column label="商品信息" align="center"> <el-table :data="tableData" v-loading="loading" header-cell-class-name="headClass" style="width: 100%" border>
<el-table-column label="订单号" prop="OrderNo" width="150" :show-overflow-tooltip='true' ></el-table-column> <el-table-column label="商品信息" align="center">
<el-table-column label="规格" width="100" :show-overflow-tooltip='true'> <el-table-column label="订单号" prop="OrderNo" width="150" :show-overflow-tooltip='true'></el-table-column>
<template slot-scope="scope"> <el-table-column label="规格" width="100" :show-overflow-tooltip='true'>
{{scope.row.GoodsName}}{{scope.row.Specification}} <template slot-scope="scope">
<!--<p v-for="(item,index) in scope.row.Specification " :key="index">{{item}}</p>--> {{scope.row.GoodsName}}{{scope.row.Specification}}
</template> <!--<p v-for="(item,index) in scope.row.Specification " :key="index">{{item}}</p>-->
</el-table-column> </template>
<el-table-column label="单价" prop="Unit_Price" width="70"></el-table-column>
<el-table-column label="数量" prop="Number" width="70"></el-table-column>
<el-table-column label="供应商" prop="SupplierName" width="150" :show-overflow-tooltip='true'></el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="单价" prop="Unit_Price" width="70"></el-table-column>
<el-table-column label="数量" prop="Number" width="70"></el-table-column>
<el-table-column label="供应商" prop="SupplierName" width="150" :show-overflow-tooltip='true'></el-table-column>
</el-table-column>
<el-table-column label="营业收入" align="center" > <el-table-column label="营业收入" align="center">
<el-table-column label="结算款" prop="Final_Price" width="70"></el-table-column> <el-table-column label="结算款" prop="Final_Price" width="70"></el-table-column>
<el-table-column label="运费" prop="FreightMoney" width="70"></el-table-column> <el-table-column label="运费" prop="FreightMoney" width="70"></el-table-column>
<el-table-column label="已收" prop="AllPrice" width="70"></el-table-column> <el-table-column label="已收" prop="AllPrice" width="70"></el-table-column>
<el-table-column label="未收款" width="70"> <el-table-column label="未收款" width="70">
<!--结算款-已收--> <!--结算款-已收-->
<!--暂时写为0--> <!--暂时写为0-->
<template slot-scope="scope"> <template slot-scope="scope">
<!--<p>{{scope.row.Final_Price - scope.row.FreightMoney}}</p>--> <!--<p>{{scope.row.Final_Price - scope.row.FreightMoney}}</p>-->
<p>0</p> <p>0</p>
</template> </template>
</el-table-column>
<el-table-column label="合计数" prop="AllPrice" width="70"></el-table-column>
</el-table-column>
<el-table-column label="营业成本" align="center">
<el-table-column label="采购成本" prop="CostMoney" width="70"></el-table-column>
<el-table-column label="包装费摊销" prop="PackingMoney" width="70"></el-table-column>
<el-table-column label="快递费" prop="CostFreight" width="70"></el-table-column>
<el-table-column label="商品运费摊销" prop="GoodsFreight" width="70"></el-table-column>
<el-table-column label="总公司返佣" prop="GeneralAgentCommission" width="70"></el-table-column>
<el-table-column label="总公司名称" prop="GeneralAgentName" :show-overflow-tooltip='true' ></el-table-column>
<el-table-column label="分公司返佣" prop="BranchCommission" width="70"></el-table-column>
<el-table-column label="分公司名称" prop="BranchName" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="特一级返佣" prop="SpecialCommission" width="70"></el-table-column>
<el-table-column label="特一级名称" prop="SpecialName" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="一级返佣" prop="OneCommission" width="70"></el-table-column>
<el-table-column label="一级名称" prop="OneUserName" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="二级返佣" prop="TwoCommission" width="70"></el-table-column>
<el-table-column label="二级名称" prop="TwoUserName" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="其他" prop="OtherPrice" width="70"></el-table-column>
<el-table-column label="合计" prop="ALLCommission" width="70"></el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="合计数" prop="AllPrice" width="70"></el-table-column>
</el-table-column>
<el-table-column label="营业成本" align="center">
<el-table-column label="采购成本" prop="CostMoney" width="70"></el-table-column>
<el-table-column label="包装费摊销" prop="PackingMoney" width="70"></el-table-column>
<el-table-column label="快递费" prop="CostFreight" width="70"></el-table-column>
<el-table-column label="商品运费摊销" prop="GoodsFreight" width="70"></el-table-column>
<el-table-column label="总公司返佣" prop="GeneralAgentCommission" width="70"></el-table-column>
<el-table-column label="总公司名称" prop="GeneralAgentName" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="分公司返佣" prop="BranchCommission" width="70"></el-table-column>
<el-table-column label="分公司名称" prop="BranchName" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="特一级返佣" prop="SpecialCommission" width="70"></el-table-column>
<el-table-column label="特一级名称" prop="SpecialName" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="一级返佣" prop="OneCommission" width="70"></el-table-column>
<el-table-column label="一级名称" prop="OneUserName" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="二级返佣" prop="TwoCommission" width="70"></el-table-column>
<el-table-column label="二级名称" prop="TwoUserName" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="其他" prop="OtherPrice" width="70"></el-table-column>
<el-table-column label="合计" prop="ALLCommission" width="70"></el-table-column>
</el-table-column>
<el-table-column prop="Paid" label="已付" width="70"></el-table-column>
<el-table-column prop="NoPaid" label="应付" width="70"></el-table-column>
<el-table-column prop="GrossProfit" label="毛利" width="70"></el-table-column>
<el-table-column prop="GrossProfitRate" label="毛利率" width="70"></el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
layout="prev, pager, next" :total="count">
</el-pagination>
</div>
<el-table-column prop="Paid" label="已付" width="70"></el-table-column>
<el-table-column prop="NoPaid" label="应付" width="70"></el-table-column>
<el-table-column prop="GrossProfit" label="毛利" width="70"></el-table-column>
<el-table-column prop="GrossProfitRate" label="毛利率" width="70"></el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
layout="prev, pager, next" :total="count">
</el-pagination>
</div>
</template> </template>
<script> <script>
...@@ -170,19 +158,19 @@ ...@@ -170,19 +158,19 @@
SupplierId: 0, SupplierId: 0,
StartDate: '', StartDate: '',
EndDate: '', EndDate: '',
OrderNo:'',//订单号 OrderNo: '', //订单号
GoodsID:0, GoodsID: 0,
OneUserId:0, OneUserId: 0,
}, },
options: [], options: [],
tableData: [], tableData: [],
searchList:[], searchList: [],
count: 0, count: 0,
loading: false, loading: false,
GoodsIDs:'',//商品id GoodsIDs: '', //商品id
OneUserId:'',//代理 OneUserId: '', //代理
OrderProfitLoss:{},//小计 OrderProfitLoss: {}, //小计
} }
}, },
created() { created() {
...@@ -216,13 +204,13 @@ ...@@ -216,13 +204,13 @@
} }
}); });
}, },
getTotalOrderProfitLoss(){ getTotalOrderProfitLoss() {
this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", {}, res => { this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", {}, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.OrderProfitLoss = res.data.data; this.OrderProfitLoss = res.data.data;
} }
}); });
}, },
Export() { Export() {
let msg = { let msg = {
...@@ -237,86 +225,86 @@ ...@@ -237,86 +225,86 @@
"损益核算.xls" "损益核算.xls"
); );
}, },
remoteMethod(query,cb) { remoteMethod(query, cb) {
let results=[] let results = []
if (query !== '' && query.length>=2) { if (query !== '' && query.length >= 2) {
this.mallapipost("/api/LiveHouse/GetGoodsList", {
this.mallapipost("/api/LiveHouse/GetGoodsList",{ Name:query },res => { Name: query
if (res.data.resultCode == 1) { }, res => {
console.log(res) if (res.data.resultCode == 1) {
res.data.data.forEach(x => { res.data.data.forEach(x => {
let obj={ let obj = {
value:x.Name, value: x.Name,
Id:x.Id Id: x.Id
}
results.push(obj)
});
}
},err => {});
}else{
this.msg.GoodsID=0
this.msg.pageIndex=1
this.getDateList();
}
cb(results);
},
forceUpdate(item){
if(item){
this.msg.GoodsID = item.Id;
}else{
this.msg.GoodsID=0
} }
this.msg.pageIndex=1 results.push(obj)
this.getDateList(); });
},
spget(){
console.log(this.GoodsIDs)
if(this.GoodsIDs==''){
this.msg.GoodsID=0
this.msg.pageIndex=1
this.getDateList();
} }
}, }, err => {});
querySearchAsync(queryString,cb){ } else {
let results=[] this.msg.GoodsID = 0
if (queryString !== '' && queryString.length>=1) { this.msg.pageIndex = 1
this.mallapipost("/api/LiveHouse/GetDistributorInfoList",{ Name:queryString },res => { this.getDateList();
if (res.data.resultCode == 1) { }
cb(results);
res.data.data.forEach((x)=>{ },
let obj = { forceUpdate(item) {
value:x.Name, if (item) {
UserId:x.UserId, this.msg.GoodsID = item.Id;
} } else {
results.push(obj) this.msg.GoodsID = 0
}) }
} this.msg.pageIndex = 1
},err => {}); this.getDateList();
}else{ },
this.msg.OneUserId=0 spget() {
this.msg.pageIndex=1 if (this.GoodsIDs == '') {
this.getDateList(); this.msg.GoodsID = 0
} this.msg.pageIndex = 1
cb(results); this.getDateList();
}, }
handleSelect(item){ },
if(item){ querySearchAsync(queryString, cb) {
this.msg.OneUserId = item.UserId; let results = []
}else{ if (queryString !== '' && queryString.length >= 1) {
this.msg.OneUserId=0 this.mallapipost("/api/LiveHouse/GetDistributorInfoList", {
} Name: queryString
this.msg.pageIndex=1 }, res => {
this.getDateList(); if (res.data.resultCode == 1) {
},
dlget(){ res.data.data.forEach((x) => {
console.log(this.OneUserId) let obj = {
if(this.OneUserId==''){ value: x.Name,
this.msg.OneUserId=0 UserId: x.UserId,
this.msg.pageIndex=1 }
this.getDateList(); results.push(obj)
})
} }
}, }, err => {});
} else {
this.msg.OneUserId = 0
this.msg.pageIndex = 1
this.getDateList();
}
cb(results);
},
handleSelect(item) {
if (item) {
this.msg.OneUserId = item.UserId;
} else {
this.msg.OneUserId = 0
}
this.msg.pageIndex = 1
this.getDateList();
},
dlget() {
if (this.OneUserId == '') {
this.msg.OneUserId = 0
this.msg.pageIndex = 1
this.getDateList();
}
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getDateList(); this.getDateList();
...@@ -327,7 +315,7 @@ ...@@ -327,7 +315,7 @@
this.msg.StartDate = ''; this.msg.StartDate = '';
this.msg.EndDate = ''; this.msg.EndDate = '';
} }
this.msg.pageIndex=1; this.msg.pageIndex = 1;
this.getDateList(); this.getDateList();
}, },
} }
...@@ -397,56 +385,67 @@ ...@@ -397,56 +385,67 @@
.OrderProfitLossList .el-input__icon { .OrderProfitLossList .el-input__icon {
line-height: 24px; line-height: 24px;
} }
.OrderProfitLossList .el-table td, .el-table th{
padding: 3px 0; .OrderProfitLossList .el-table td,
} .el-table th {
.OrderProfitLossList .el-table{ padding: 3px 0;
font-size: 13px; }
}
.OrderProfitLossList .el-select__tags-text { .OrderProfitLossList .el-table {
display: inline-block; font-size: 13px;
width: 40px; }
overflow: hidden;
text-overflow:ellipsis; .OrderProfitLossList .el-select__tags-text {
white-space: nowrap; display: inline-block;
} width: 40px;
.OrderProfitLossList .el-select__tags{ overflow: hidden;
max-width: 400px; text-overflow: ellipsis;
} white-space: nowrap;
.OrderProfitLossList .Subtotal{ }
width: 100%;
margin: 10px 0; .OrderProfitLossList .el-select__tags {
display: flex; max-width: 400px;
flex-direction: row; }
align-items: center;
background: #f2f2f2; .OrderProfitLossList .Subtotal {
font-size: 12px; width: 100%;
} margin: 10px 0;
.OrderProfitLossList .Subtotal_item{ display: flex;
display: flex; flex-direction: row;
flex-direction: column; align-items: center;
align-items: flex-start; background: #f2f2f2;
margin-left: 50px; font-size: 12px;
background: #fff; }
padding: 20px;
} .OrderProfitLossList .Subtotal_item {
.OrderProfitLossList .Subtotal_item .Subtotal_t{ display: flex;
margin: 3px 0; flex-direction: column;
font-size: 12px; align-items: flex-start;
width: 90px; margin-left: 50px;
display: inline-block; background: #fff;
} padding: 20px;
.OrderProfitLossList .ProfitLoss{ }
display: flex;
flex-direction: row; .OrderProfitLossList .Subtotal_item .Subtotal_t {
align-items: center; margin: 3px 0;
background: #fff; font-size: 12px;
} width: 90px;
.OrderProfitLossList .ProfitLoss_xbox{ display: inline-block;
display: flex; }
flex-direction: column;
justify-content: flex-start; .OrderProfitLossList .ProfitLoss {
align-items: flex-start; display: flex;
background: #fff; flex-direction: row;
} align-items: center;
background: #fff;
}
.OrderProfitLossList .ProfitLoss_xbox {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: flex-start;
background: #fff;
}
</style> </style>
...@@ -287,7 +287,6 @@ ...@@ -287,7 +287,6 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
console.log("this.data", this.dataList);
this.total = res.data.data.count this.total = res.data.data.count
} else { } else {
this.loading = false; this.loading = false;
......
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
}, },
//新增、修改广告 //新增、修改广告
saveData() { saveData() {
console.log("post",this.postMsg);
this.apipost( this.apipost(
"ws_post_SetPage", this.postMsg, "ws_post_SetPage", this.postMsg,
res => { res => {
......
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