Commit f8cce75f authored by 王悦's avatar 王悦

no message

parent e56fbee4
......@@ -52,7 +52,7 @@
</el-form>
<div class="page_EasyReport_export">
<button class="normalBtn " @click="exportExcel">导出EXCEL</button>
<button class="normalBtn " @click="togbu">一键同步</button>
<!-- <button class="normalBtn " @click="togbu">一键同步</button> -->
</div>
<button class="normalBtn page_EasyReport_search" @click="getData">确定</button>
</div>
......
......@@ -515,7 +515,7 @@ tr._item_list td:last-child {
<button class="hollowFixedBtn" @click="openKaiQiZzBox('一键关闭')">一键关闭</button>-->
<button class="normalBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="method5()">导出</button>
<button class="normalBtn" @click="togbu">一键同步</button>
<!-- <button class="normalBtn" @click="togbu">一键同步</button> -->
<!--<button class="hollowFixedBtn" @click="exportExcelCurrentPage">导出2</button>-->
</li>
</ul>
......@@ -1070,7 +1070,7 @@ export default {
},
{
field: "MaoLiRate",
formatter: this.moneyFormat,
// formatter: this.moneyFormat,
title: "毛利率",
width: 90,
titleAlign: "left",
......@@ -1657,7 +1657,7 @@ export default {
return this.priceFormat(rowData.YongJinShouRu);
if (field === "YingFu") return this.priceFormat(rowData.YingFu);
if (field === "MaoLi") return this.priceFormat(rowData.MaoLi);
if (field === "MaoLiRate") return rowData.MaoLiRate + "%";
// if (field === "MaoLiRate") return rowData.MaoLiRate;
if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
if (field === "TransportCost")
return this.priceFormat(rowData.TransportCost);
......@@ -1836,24 +1836,25 @@ export default {
} else {
let newData = [];
data.forEach((x, index) => {
x.MaoLiRate=x.MaoLiRate+"%";
if (index !== data.length - 1) {
x.Is_Transport = x.Is_Transport === 0 ? "否" : "是";
newData.push(x);
} else {
x.MaoLiRate =
this.total === 0 ? 0 : parseFloat(x.MaoLiRate / this.total);
x.AverageIncome =
this.total === 0
? 0
: parseFloat(x.AverageIncome / this.total);
x.AverageCost =
this.total === 0
? 0
: parseFloat(x.AverageCost / this.total);
x.AverageProfit =
this.total === 0
? 0
: parseFloat(x.AverageProfit / this.total);
// x.MaoLiRate =
// this.total === 0 ? 0 : parseFloat(x.MaoLiRate / this.total);
// x.AverageIncome =
// this.total === 0
// ? 0
// : parseFloat(x.AverageIncome / this.total);
// x.AverageCost =
// this.total === 0
// ? 0
// : parseFloat(x.AverageCost / this.total);
// x.AverageProfit =
// this.total === 0
// ? 0
// : parseFloat(x.AverageProfit / this.total);
x.LineName = "合计";
x.TCID = "";
x.TCNUM = "";
......
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