Commit e728afdd authored by Mac's avatar Mac

损益的修改

parent 9d406eb4
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<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" <el-select class="w150" style="margin-left: 10px;" v-model="msg.SupplierId" filterable size="small"
placeholder="请选择" @change="msg.pageIndex=1,getDateList()"> placeholder="请选择" @change="msg.pageIndex=1,getDateList(),getTotalOrderProfitLoss()">
<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>
...@@ -24,8 +24,10 @@ ...@@ -24,8 +24,10 @@
</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" <el-input v-model="msg.OrderNo" placeholder="请输入订单号" style="width:200px"
@keyup.enter.native='msg.pageIndex=1,getDateList()' clearable></el-input> @keyup.enter.native='msg.pageIndex=1,getDateList(),getTotalOrderProfitLoss()' clearable
@clear="msg.pageIndex=1,getDateList(),getTotalOrderProfitLoss()"
></el-input>
<span style="margin:0 10px">商品名称</span> <span style="margin:0 10px">商品名称</span>
<el-autocomplete style="width:350px" v-model="GoodsIDs" :fetch-suggestions="remoteMethod" placeholder="请输入" <el-autocomplete style="width:350px" v-model="GoodsIDs" :fetch-suggestions="remoteMethod" placeholder="请输入"
@select="forceUpdate" @blur="spget()" :trigger-on-focus="false"></el-autocomplete> @select="forceUpdate" @blur="spget()" :trigger-on-focus="false"></el-autocomplete>
...@@ -125,7 +127,7 @@ ...@@ -125,7 +127,7 @@
<el-table-column label="合计" prop="ALLCommission" 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 prop="RemitFXCommission" label="已付"></el-table-column> <el-table-column prop="RemitFXCommission" label="已付"></el-table-column>
<el-table-column prop="NoPaid" label="应付" ></el-table-column> <el-table-column prop="NoPaid" label="应付" ></el-table-column>
<el-table-column prop="GrossProfit" label="毛利" ></el-table-column> <el-table-column prop="GrossProfit" label="毛利" ></el-table-column>
<el-table-column prop="GrossProfitRate" label="毛利率" ></el-table-column> <el-table-column prop="GrossProfitRate" label="毛利率" ></el-table-column>
...@@ -244,7 +246,7 @@ ...@@ -244,7 +246,7 @@
this.czjfDig = true; this.czjfDig = true;
}, },
getTotalOrderProfitLoss() { getTotalOrderProfitLoss() {
this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", {IsFxCommission:1}, res => { this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", this.msg, 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;
...@@ -286,6 +288,7 @@ ...@@ -286,6 +288,7 @@
this.msg.GoodsID = 0 this.msg.GoodsID = 0
this.msg.pageIndex = 1 this.msg.pageIndex = 1
this.getDateList(); this.getDateList();
this.getTotalOrderProfitLoss()
} }
cb(results); cb(results);
}, },
...@@ -297,12 +300,14 @@ ...@@ -297,12 +300,14 @@
} }
this.msg.pageIndex = 1 this.msg.pageIndex = 1
this.getDateList(); this.getDateList();
this.getTotalOrderProfitLoss()
}, },
spget() { spget() {
if (this.GoodsIDs == '') { if (this.GoodsIDs == '') {
this.msg.GoodsID = 0 this.msg.GoodsID = 0
this.msg.pageIndex = 1 this.msg.pageIndex = 1
this.getDateList(); this.getDateList();
this.getTotalOrderProfitLoss()
} }
}, },
querySearchAsync(queryString, cb) { querySearchAsync(queryString, cb) {
...@@ -326,6 +331,7 @@ ...@@ -326,6 +331,7 @@
this.msg.OneUserId = 0 this.msg.OneUserId = 0
this.msg.pageIndex = 1 this.msg.pageIndex = 1
this.getDateList(); this.getDateList();
this.getTotalOrderProfitLoss()
} }
cb(results); cb(results);
}, },
...@@ -337,12 +343,14 @@ ...@@ -337,12 +343,14 @@
} }
this.msg.pageIndex = 1 this.msg.pageIndex = 1
this.getDateList(); this.getDateList();
this.getTotalOrderProfitLoss()
}, },
dlget() { dlget() {
if (this.OneUserId == '') { if (this.OneUserId == '') {
this.msg.OneUserId = 0 this.msg.OneUserId = 0
this.msg.pageIndex = 1 this.msg.pageIndex = 1
this.getDateList(); this.getDateList();
this.getTotalOrderProfitLoss()
} }
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
...@@ -357,6 +365,7 @@ ...@@ -357,6 +365,7 @@
} }
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.getDateList(); this.getDateList();
this.getTotalOrderProfitLoss()
}, },
} }
} }
......
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