1

src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue

@@ -143,7 +143,7 @@
         <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="RemitFXCommission" label="已付"></el-table-column>
+      <el-table-column prop="Paid" label="已付"></el-table-column>
       <el-table-column prop="NoPaid" label="应付" ></el-table-column>
       <el-table-column label="其他" align="center">
         <el-table-column label="应收" prop="YSMoney" width="70"></el-table-column>
@@ -153,12 +153,13 @@
       </el-table-column>
 
       <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 prop="GrossProfit" label="毛利" ></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"