Skip to content

S
SuperMan
Commit b67ce554 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 9c104a68
Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 258 deletions
src/components/FinancialModule/ReportForm/OrderProfitLossList.vue
View file @ b67ce554
......@@ -11,8 +11,8 @@
<div class="content">
<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()">
<el-select class="w150" style="margin-left: 10px;" v-model="msg.SupplierId" filterable size="small"
placeholder="请选择" @change="msg.pageIndex=1,getDateList()">
<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>
......@@ -23,37 +23,25 @@
@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-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>
<el-autocomplete v-model="OneUserId" :fetch-suggestions="querySearchAsync" placeholder="请输入"
@select="handleSelect" @blur="dlget()" :trigger-on-focus="false"></el-autocomplete>
</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>
<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>
......@@ -62,100 +50,100 @@
<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 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.TotalCostFreight }}</div>
<div><span class='Subtotal_t'>商品运费摊销：</span>￥{{OrderProfitLoss.TotalGoodsFreight }}</div>
<div><span class='Subtotal_t'>分公司小计：</span>￥{{OrderProfitLoss.TotalBranchCommission }}</div>
</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 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>
<el-table-column label="规格" width="100" :show-overflow-tooltip='true'>
<template slot-scope="scope">
{{scope.row.GoodsName}}{{scope.row.Specification}}
<!--<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="SupplierName" width="150" :show-overflow-tooltip='true'></el-table-column>
</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>
<el-table-column label="规格" width="100" :show-overflow-tooltip='true'>
<template slot-scope="scope">
{{scope.row.GoodsName}}{{scope.row.Specification}}
<!--<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="SupplierName" width="150" :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="FreightMoney" width="70"></el-table-column>
<el-table-column label="已收" prop="AllPrice" width="70"></el-table-column>
<el-table-column label="未收款" width="70">
<!--结算款-已收-->
<!--暂时写为0-->
<template slot-scope="scope">
<!--<p>{{scope.row.Final_Price - scope.row.FreightMoney}}</p>-->
<p>0</p>
</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 label="营业收入" align="center">
<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="AllPrice" width="70"></el-table-column>
<el-table-column label="未收款" width="70">
<!--结算款-已收-->
<!--暂时写为0-->
<template slot-scope="scope">
<!--<p>{{scope.row.Final_Price - scope.row.FreightMoney}}</p>-->
<p>0</p>
</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 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>
<script>
......@@ -170,19 +158,19 @@
SupplierId: 0,
StartDate: '',
EndDate: '',
OrderNo:'',//订单号
GoodsID:0,
OneUserId:0,
OrderNo: '', //订单号
GoodsID: 0,
OneUserId: 0,
},
options: [],
tableData: [],
searchList:[],
searchList: [],
count: 0,
loading: false,
GoodsIDs:'',//商品id
OneUserId:'',//代理
OrderProfitLoss:{},//小计
GoodsIDs: '', //商品id
OneUserId: '', //代理
OrderProfitLoss: {}, //小计
}
},
created() {
......@@ -216,13 +204,13 @@
}
});
},
getTotalOrderProfitLoss(){
this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", {}, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderProfitLoss = res.data.data;
}
});
getTotalOrderProfitLoss() {
this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", {}, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderProfitLoss = res.data.data;
}
});
},
Export() {
let msg = {
......@@ -237,86 +225,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
remoteMethod(query, cb) {
let results = []
if (query !== '' && query.length >= 2) {
this.mallapipost("/api/LiveHouse/GetGoodsList", {
Name: query
}, res => {
if (res.data.resultCode == 1) {
res.data.data.forEach(x => {
let obj = {
value: x.Name,
Id: x.Id
}
this.msg.pageIndex=1
this.getDateList();
},
spget(){
console.log(this.GoodsIDs)
if(this.GoodsIDs==''){
this.msg.GoodsID=0
this.msg.pageIndex=1
this.getDateList();
results.push(obj)
});
}
},
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();
}, 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() {
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() {
if (this.OneUserId == '') {
this.msg.OneUserId = 0
this.msg.pageIndex = 1
this.getDateList();
}
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getDateList();
......@@ -327,7 +315,7 @@
this.msg.StartDate = '';
this.msg.EndDate = '';
}
this.msg.pageIndex=1;
this.msg.pageIndex = 1;
this.getDateList();
},
}
......@@ -397,56 +385,67 @@
.OrderProfitLossList .el-input__icon {
line-height: 24px;
}
.OrderProfitLossList .el-table td, .el-table th{
padding: 3px 0;
}
.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;
}
.OrderProfitLossList .el-table td,
.el-table th {
padding: 3px 0;
}
.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>
src/components/WebSet/WebSiteService.vue
View file @ b67ce554
......@@ -287,7 +287,6 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
console.log("this.data", this.dataList);
this.total = res.data.data.count
} else {
this.loading = false;
......
src/components/WebSet/WebSiteUpdate.vue
View file @ b67ce554
......@@ -70,7 +70,6 @@
},
//新增、修改广告
saveData() {
console.log("post",this.postMsg);
this.apipost(
"ws_post_SetPage", this.postMsg,
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