Skip to content

S
SuperMan
Commit ddfb68da authored by Mac's avatar Mac
Browse files
Options

损益修改

parent 6191b292
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 80 deletions
src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue
View file @ ddfb68da
......@@ -12,7 +12,7 @@
<div style="display: flex;flex-direction: row;align-items: center">
<span>供应商</span>
<el-select class="w150" style="margin-left: 10px;" v-model="msg.SupplierId" filterable size="small"
placeholder="请选择" @change="msg.pageIndex=1,getDateList(),getTotalOrderProfitLoss()">
placeholder="请选择" @change="msg.pageIndex=1,getTotalOrderProfitLoss()">
<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>
......@@ -25,8 +25,8 @@
</div>
<span style="margin:0 10px">订单号</span>
<el-input v-model="msg.OrderNo" placeholder="请输入订单号" style="width:200px"
@keyup.enter.native='msg.pageIndex=1,getDateList(),getTotalOrderProfitLoss()' clearable
@clear="msg.pageIndex=1,getDateList(),getTotalOrderProfitLoss()"
@keyup.enter.native='msg.pageIndex=1,getTotalOrderProfitLoss()' clearable
@clear="msg.pageIndex=1,getTotalOrderProfitLoss()"
></el-input>
<span style="margin:0 10px">商品名称</span>
<el-autocomplete style="width:350px" v-model="GoodsIDs" :fetch-suggestions="remoteMethod" placeholder="请输入"
......@@ -38,7 +38,7 @@
</div>
<div style="margin:10px 0">
<span>公司名称</span>
<el-select size="small" v-model="msg.CompanyId" :filter-method="ChangeListName" filterable placeholder="请选择" @change="msg.pageIndex=1,getDateList(),getTotalOrderProfitLoss()">
<el-select size="small" v-model="msg.CompanyId" :filter-method="ChangeListName" filterable placeholder="请选择" @change="msg.pageIndex=1,getTotalOrderProfitLoss()">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in companyData" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
......@@ -46,57 +46,57 @@
</div>
</div>
<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" style="font-size:12px"></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" style="font-size:12px"></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.TotalGoodsFreight }}</div>
<!-- <div><span class='Subtotal_t'>商品运费摊销：</span>￥{{OrderProfitLoss.TotalGoodsFreight }}</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><span class='Subtotal_t'>总返佣：</span>￥{{OrderProfitLoss.TotalFXCommission }}</div>
</div>
<div class="ProfitLoss_xbox" style="margin-left:60px">
<div><span class='Subtotal_t'>已返佣金额：</span>￥{{OrderProfitLoss.TotalRemitFXCommission }}</div>
<div><span class='Subtotal_t'>已付成本：</span>￥{{OrderProfitLoss.TotalPaidCostMoney }}</div>
<div><span class='Subtotal_t'>其他实收：</span>￥{{OrderProfitLoss.TotalRealMoney }}</div>
<div><span class='Subtotal_t'>其他实付：</span>￥{{OrderProfitLoss.TotalPayMoney }}</div>
<div><span class='Subtotal_t'>优惠金额：</span>￥{{OrderProfitLoss.TotalCouponMoney }}</div>
</div>
<div class="ProfitLoss_xbox" style="margin-left:60px">
<!-- <div><span class='Subtotal_t'>公司结算金额：</span>￥{{OrderProfitLoss.TotalCompanyProfit }}</div>-->
</div>
</div>
</div>
</div>
<!-- <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" style="font-size:12px"></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" style="font-size:12px"></i>-->
<!-- <span class='Subtotal_t'>营业成本</span>-->
<!-- </div>-->
<!-- <div class="ProfitLoss">-->
<!-- <div class="ProfitLoss_xbox">-->
<!-- <div><span class='Subtotal_t'>采购成本：</span>￥{{OrderProfitLoss.TotalCostMoney }}</div>-->
<!--&lt;!&ndash; <div><span class='Subtotal_t'>包装费摊销：</span>￥{{OrderProfitLoss.TotalPackingMoney }}</div>&ndash;&gt;-->
<!-- <div><span class='Subtotal_t'>运费支出：</span>￥{{OrderProfitLoss.TotalGoodsFreight }}</div>-->
<!--&lt;!&ndash; <div><span class='Subtotal_t'>商品运费摊销：</span>￥{{OrderProfitLoss.TotalGoodsFreight }}</div>&ndash;&gt;-->
<!-- <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><span class='Subtotal_t'>总返佣：</span>￥{{OrderProfitLoss.TotalFXCommission }}</div>-->
<!-- </div>-->
<!-- <div class="ProfitLoss_xbox" style="margin-left:60px">-->
<!-- <div><span class='Subtotal_t'>已返佣金额：</span>￥{{OrderProfitLoss.TotalRemitFXCommission }}</div>-->
<!-- <div><span class='Subtotal_t'>已付成本：</span>￥{{OrderProfitLoss.TotalPaidCostMoney }}</div>-->
<!-- <div><span class='Subtotal_t'>其他实收：</span>￥{{OrderProfitLoss.TotalRealMoney }}</div>-->
<!-- <div><span class='Subtotal_t'>其他实付：</span>￥{{OrderProfitLoss.TotalPayMoney }}</div>-->
<!-- <div><span class='Subtotal_t'>优惠金额：</span>￥{{OrderProfitLoss.TotalCouponMoney }}</div>-->
<!-- </div>-->
<!-- <div class="ProfitLoss_xbox" style="margin-left:60px">-->
<!--&lt;!&ndash; <div><span class='Subtotal_t'>公司结算金额：</span>￥{{OrderProfitLoss.TotalCompanyProfit }}</div>&ndash;&gt;-->
<!-- </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">
......@@ -107,16 +107,16 @@
<!--<p v-for="(item,index) in scope.row.Specification " :key="index">{{item}}</p>-->
</template>
</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="Unit_Price" ></el-table-column>
<el-table-column label="数量" prop="Number"></el-table-column>
<el-table-column label="供应商" prop="SupplierName" width="120" :show-overflow-tooltip='true'></el-table-column>
</el-table-column>
<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" ></el-table-column>
<el-table-column label="运费收入" prop="FreightMoney" ></el-table-column>
<el-table-column label="已收" prop="AllPrice" width="70"></el-table-column>
<el-table-column label="未收款" width="70">
<el-table-column label="已收" prop="AllPrice" ></el-table-column>
<el-table-column label="未收款" >
<!--结算款-已收-->
<!--暂时写为0-->
<template slot-scope="scope">
......@@ -124,7 +124,7 @@
<p>0</p>
</template>
</el-table-column>
<el-table-column label="合计数" prop="AllPrice" width="70"></el-table-column>
<el-table-column label="合计数" prop="AllPrice" ></el-table-column>
</el-table-column>
<el-table-column label="营业成本" align="center">
......@@ -237,9 +237,8 @@
}
},
created() {
this.getDateList()
this.getSupplierList()
this.getTotalOrderProfitLoss()
this.getSupplierList()
this.getCompanyUserList('')
},
methods: {
......@@ -252,8 +251,12 @@
this.mallapipost("/api/LiveHouse/GetOrderProfitLossList", this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
if(res.data.data.pageData.length>0){
res.data.data.pageData.push(this.OrderProfitLoss);
}
this.tableData = res.data.data.pageData
this.count = res.data.data.count;
} else {
this.Info(res.data.message);
}
......@@ -279,10 +282,17 @@
this.czjfDig = true;
},
getTotalOrderProfitLoss() {
this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", this.msg, res => {
if (this.value != '' && this.value != null) {
this.msg.StartDate = this.value[0];
this.msg.EndDate = this.value[1];
}
// this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", this.msg, res => {
this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss_V2", this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderProfitLoss = res.data.data;
this.OrderProfitLoss.OrderNo ='小计'
this.getDateList()
}
});
},
......@@ -295,14 +305,6 @@
});
},
Export() {
// let msg = {
// SupplierId: this.msg.SupplierId,
// StartDate: this.msg.StartDate,
// EndDate: this.msg.EndDate,
// IsFxCommission: this.msg.IsFxCommission,
// CompanyId: this.msg.CompanyId,
//
// }
let msg = this.msg
msg = JSON.parse(JSON.stringify(msg));
this.GetMallLocalFile(
......@@ -331,7 +333,6 @@
} else {
this.msg.GoodsID = 0
this.msg.pageIndex = 1
this.getDateList();
this.getTotalOrderProfitLoss()
}
cb(results);
......@@ -343,14 +344,12 @@
this.msg.GoodsID = 0
}
this.msg.pageIndex = 1
this.getDateList();
this.getTotalOrderProfitLoss()
},
spget() {
if (this.GoodsIDs == '') {
this.msg.GoodsID = 0
this.msg.pageIndex = 1
this.getDateList();
this.getTotalOrderProfitLoss()
}
},
......@@ -374,7 +373,6 @@
} else {
this.msg.OneUserId = 0
this.msg.pageIndex = 1
this.getDateList();
this.getTotalOrderProfitLoss()
}
cb(results);
......@@ -386,14 +384,12 @@
this.msg.OneUserId = 0
}
this.msg.pageIndex = 1
this.getDateList();
this.getTotalOrderProfitLoss()
},
dlget() {
if (this.OneUserId == '') {
this.msg.OneUserId = 0
this.msg.pageIndex = 1
this.getDateList();
this.getTotalOrderProfitLoss()
}
},
......@@ -408,7 +404,6 @@
this.msg.EndDate = '';
}
this.msg.pageIndex = 1;
this.getDateList();
this.getTotalOrderProfitLoss()
},
ChangeListName(val){
......
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