Commit 57e68d6a authored by 黄媛媛's avatar 黄媛媛

损益修改

parent 06124025
......@@ -23,9 +23,79 @@
@change="change" align="right">
</el-date-picker>
</div>
<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>
<span style="margin:0 10px">商品名称</span>
<el-autocomplete
style="width:350px"
v-model="GoodsIDs"
:fetch-suggestions="remoteMethod"
placeholder="请输入"
@select="forceUpdate"
@blur="spget()"
:trigger-on-focus="false"
></el-autocomplete>
<span style="margin:0 10px">代理</span>
<el-autocomplete
v-model="OneUserId"
:fetch-suggestions="querySearchAsync"
placeholder="请输入"
@select="handleSelect"
@blur="dlget()"
:trigger-on-focus="false"
></el-autocomplete>
</div>
</div>
<div style="padding: 20px;background: #fff;margin-top: 10px">
<div style="padding: 10px 20px;background: #fff;margin-top: 10px">
<div class="Subtotal">
<div class="Subtotal_item" style="margin:15px">
<div style='width:100%;border-bottom:1px solid #f2f2f2'>
<i class="iconfont icon-qian groupTourOrder_count_green"></i>
<span class='Subtotal_t' >营业收入</span>
</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.TotalAllPrice}}</div>
<div><span class='Subtotal_t'>未收款:</span>{{OrderProfitLoss.TotalNoAllPrice }}</div>
<div><span class='Subtotal_t'>合计数:</span>{{OrderProfitLoss.TotalPay}}</div>
</div>
<div class="Subtotal_item" style="margin:15px">
<div style='width:100%;border-bottom:1px solid #f2f2f2'>
<i class="iconfont icon-qian groupTourOrder_count_green"></i>
<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 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>
</div>
<el-table :data="tableData" v-loading="loading" header-cell-class-name="headClass" style="width: 100%" border>
<el-table-column label="商品信息" align="center">
<el-table-column label="订单号" prop="OrderNo" width="150" :show-overflow-tooltip='true'></el-table-column>
......@@ -59,8 +129,19 @@
<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" width="70" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="分公司返佣" prop="BranchCommission" width="70"></el-table-column>
<el-table-column label="分公司名称" prop="BranchName" width="70" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="特一级返佣" prop="SpecialCommission" width="70"></el-table-column>
<el-table-column label="特一级名称" prop="SpecialName" width="70" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="一级返佣" prop="OneCommission" width="70"></el-table-column>
<el-table-column label="一级名称" prop="OneUserName" width="70" :show-overflow-tooltip='true'></el-table-column>
<el-table-column label="二级返佣" prop="TwoCommission" width="70"></el-table-column>
<el-table-column label="二级名称" prop="TwoUserName" width="70" :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>
......@@ -89,18 +170,25 @@
SupplierId: 0,
StartDate: '',
EndDate: '',
OrderNo:'',//订单号
GoodsID:0,
OneUserId:0,
},
options: [],
tableData: [],
searchList:[],
count: 0,
loading: false,
GoodsIDs:'',//商品id
OneUserId:'',//代理
OrderProfitLoss:{},//小计
}
},
created() {
this.getDateList()
this.getSupplierList()
this.getTotalOrderProfitLoss()
},
methods: {
getDateList() {
......@@ -128,6 +216,14 @@
}
});
},
getTotalOrderProfitLoss(){
this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", {}, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderProfitLoss = res.data.data;
}
});
},
Export() {
let msg = {
SupplierId: this.msg.SupplierId,
......@@ -141,6 +237,86 @@
"损益核算.xls"
);
},
remoteMethod(query,cb) {
let results=[]
if (query !== '' && query.length>=2) {
this.mallapipost("/api/LiveHouse/GetGoodsList",{ Name:query },res => {
if (res.data.resultCode == 1) {
console.log(res)
res.data.data.forEach(x => {
let obj={
value:x.Name,
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
this.getDateList();
},
spget(){
console.log(this.GoodsIDs)
if(this.GoodsIDs==''){
this.msg.GoodsID=0
this.msg.pageIndex=1
this.getDateList();
}
},
querySearchAsync(queryString,cb){
let results=[]
if (queryString !== '' && queryString.length>=1) {
this.mallapipost("/api/LiveHouse/GetDistributorInfoList",{ Name:queryString },res => {
if (res.data.resultCode == 1) {
res.data.data.forEach((x)=>{
let obj = {
value:x.Name,
UserId:x.UserId,
}
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(){
console.log(this.OneUserId)
if(this.OneUserId==''){
this.msg.OneUserId=0
this.msg.pageIndex=1
this.getDateList();
}
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getDateList();
......@@ -227,4 +403,50 @@
.OrderProfitLossList .el-table{
font-size: 13px;
}
.OrderProfitLossList .el-select__tags-text {
display: inline-block;
width: 40px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.OrderProfitLossList .el-select__tags{
max-width: 400px;
}
.OrderProfitLossList .Subtotal{
width: 100%;
margin: 10px 0;
display: flex;
flex-direction: row;
align-items: center;
background: #f2f2f2;
font-size: 12px;
}
.OrderProfitLossList .Subtotal_item{
display: flex;
flex-direction: column;
align-items: flex-start;
margin-left: 50px;
background: #fff;
padding: 20px;
}
.OrderProfitLossList .Subtotal_item .Subtotal_t{
margin: 3px 0;
font-size: 12px;
width: 90px;
display: inline-block;
}
.OrderProfitLossList .ProfitLoss{
display: flex;
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>
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