损益核计算的修改

src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue

@@ -54,7 +54,7 @@
             <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.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>
@@ -66,10 +66,10 @@
           </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.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">
@@ -89,7 +89,7 @@
             </div>
             <div class="ProfitLoss_xbox" style="margin-left:60px">
 
-              <div><span class='Subtotal_t'>公司结算金额：</span>￥{{OrderProfitLoss.TotalCompanyProfit }}</div>
+<!--              <div><span class='Subtotal_t'>公司结算金额：</span>￥{{OrderProfitLoss.TotalCompanyProfit }}</div>-->
 
             </div>
           </div>
@@ -114,7 +114,7 @@
 
       <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="FreightMoney" ></el-table-column>
         <el-table-column label="已收" prop="AllPrice" width="70"></el-table-column>
         <el-table-column label="未收款" width="70">
           <!--结算款-已收-->
@@ -130,7 +130,7 @@
       <el-table-column label="营业成本" align="center">
         <el-table-column label="采购成本" prop="CostMoney"></el-table-column>
 
-        <el-table-column label="快递费" prop="CostFreight" ></el-table-column>
+        <el-table-column label="运费支出" prop="GoodsFreight" ></el-table-column>
         <el-table-column label="已付成本" prop="PaidCostMoney" ></el-table-column>
         <el-table-column label="总返佣" prop="FXCommission" >
            <template slot-scope="scope">
@@ -155,11 +155,11 @@
       <el-table-column prop="CompanyName" label="公司名称" width="120"></el-table-column>
 
       <el-table-column prop="GrossProfit" label="毛利" ></el-table-column>
-      <el-table-column label="分公司结算" >
-        <template slot-scope="scope">
-          <span >{{((scope.row.GrossProfit *scope.row.CompanyProfitRate)/100).toFixed(2)}}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="分公司结算" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <span >{{((scope.row.GrossProfit *scope.row.CompanyProfitRate)/100).toFixed(2)}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column prop="GrossProfitRate" label="毛利率" ></el-table-column>
     </el-table>
     <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"