1

src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue

@@ -100,7 +100,15 @@
     </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="180" :show-overflow-tooltip='true'></el-table-column>
+        <el-table-column label="订单号" prop="OrderNo" width="200" :show-overflow-tooltip='true'>
+          <template slot-scope="scope">
+            {{scope.row.OrderNo}}
+            <el-tooltip class="item" effect="dark" content="已取消" placement="top" v-if="scope.row.OrderStatus==7"
+                        style="">
+              <i class="el-tooltip el-icon-info" style="color: #FF4048"></i>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column label="规格" width="200" :show-overflow-tooltip='true'>
           <template slot-scope="scope">
             {{scope.row.GoodsName}}{{scope.row.Specification}}
@@ -130,16 +138,19 @@
             {{scope.row.AllPrice+scope.row.YSMoney}}
           </template>
         </el-table-column>
+
       </el-table-column>
 
       <el-table-column label="营业成本" align="center">
+        <el-table-column label="手续费" prop="ServiceCharge" width="80"></el-table-column>
         <el-table-column label="采购成本" prop="CostMoney"></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">
-            <span @click="showFXCommission(scope.row)" style=" color: #409EFF;cursor:pointer">{{scope.row.FXCommission}}</span>
+             <span v-if="scope.row.OrderNo=='小计'" >{{scope.row.FXCommission}}</span>
+             <span v-else @click="showFXCommission(scope.row)" style=" color: #409EFF;cursor:pointer">{{scope.row.FXCommission}}</span>
           </template>
         </el-table-column>
         <el-table-column label="已返佣" prop="RemitFXCommission" width="70"></el-table-column>
@@ -172,7 +183,7 @@
           </template>
       </el-table-column>
     </el-table>
-    <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
+    <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize" :current-page.sync="msg.pageIndex"
       layout="prev, pager, next" :total="count">
     </el-pagination>
     <el-dialog title="查看返佣" :visible.sync="czjfDig" width="900px">
@@ -222,7 +233,7 @@
         value: '',
         msg: {
           pageIndex: 1,
-          pageSize: 10,
+          pageSize: 15,
           SupplierId: 0,
           StartDate: '',
           EndDate: '',