损益

src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue

@@ -72,7 +72,7 @@
              <div class="ProfitLoss_xbox" style="margin-left:60px">
               <div><span class='Subtotal_t'>已返佣金额：</span>￥{{OrderProfitLoss.TotalRemitFXCommission }}</div>
               <div><span class='Subtotal_t'>已付成本：</span>￥{{OrderProfitLoss.TotalPaidCostMoney }}</div>
-             
+
             </div>
           </div>
         </div>
@@ -110,7 +110,7 @@
       </el-table-column>
       <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="PaidCostMoney" ></el-table-column>
         <el-table-column label="总返佣" prop="FXCommission" >
@@ -133,12 +133,35 @@
     <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
       layout="prev, pager, next" :total="count">
     </el-pagination>
-    <el-dialog title="查看返佣" :visible.sync="czjfDig" width="500px">
+    <el-dialog title="查看返佣" :visible.sync="czjfDig" width="800px">
       <div class="diaBox" style="">
-        <div class="diaBox"  style='margin-top:15px' v-for="(item,index) in CommissionList" :key="index">
-          <div>{{item.GradeDescription}}{{'  '}}￥{{item.Commission}}</div>
-          <div>昵称:{{item.UserName}}</div>
-          <div>姓名:{{item.Name}}</div>
+        <div>
+          <span>直播总人数:{{itemData.LivePeopleNum}}人</span>
+          <span style="margin-left: 30px" v-if="itemData.LiveCommission>0">直播总佣金:{{itemData.LiveCommission}}元</span>
+        </div>
+        <div class="diaBox"  style='margin-top:15px' >
+          <el-table
+            border
+            :data="CommissionList"
+            style="width: 700px">
+            <el-table-column prop="Commission" label="返佣类型" >
+              <template slot-scope="scope">
+                <span v-if="scope.row.CommissionType==1">订单返佣:{{scope.row.Commission}}</span>
+                <span v-if="scope.row.CommissionType==2">供应商返佣:{{scope.row.Commission}}</span>
+                <span v-if="scope.row.CommissionType==3">微店返佣:{{scope.row.Commission}}</span>
+                <span v-if="scope.row.CommissionType==4">vip购买返佣:{{scope.row.Commission}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="UserName"
+              label="昵称"
+              width="180">
+            </el-table-column>
+            <el-table-column
+              prop="Name"
+              label="名称">
+            </el-table-column>
+          </el-table>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -176,6 +199,7 @@
         GoodsIDs: '', //商品id
         OneUserId: '', //代理
         OrderProfitLoss: {}, //小计
+        itemData:{},
       }
     },
     created() {
@@ -210,7 +234,7 @@
         });
       },
       showFXCommission(row){
-        
+        this.itemData = row
         this.mallapipost("/api/LiveHouse/GetOrderCommissionList", { TenantId :1,MallBaseId:1,OrderDetailId:row.Id}, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
@@ -373,7 +397,7 @@
     border-spacing: 0;
     width: 250px;
     margin-right: 20px;
-    
+
   }
 
   .fxOrderProfitLossList .content {