1

src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue

@@ -36,6 +36,14 @@
           @select="handleSelect" @blur="dlget()" :trigger-on-focus="false"></el-autocomplete>
 
       </div>
+      <div style="margin:10px 0">
+        <span>公司名称</span>
+        <el-select size="small" v-model="msg.CompanyId" :filter-method="ChangeListName" filterable placeholder="请选择" @change="msg.pageIndex=1,getDateList(),getTotalOrderProfitLoss()">
+          <el-option label="不限" :value="0"></el-option>
+          <el-option v-for="item in companyData" :key="item.Id" :label="item.Name" :value="item.Id">
+          </el-option>
+        </el-select>
+      </div>
     </div>
     <div style="padding: 10px 20px;background: #fff;margin-top: 10px">
       <div class="Subtotal">
@@ -74,6 +82,14 @@
              <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><span class='Subtotal_t'>其他实收：</span>￥{{OrderProfitLoss.TotalRealMoney }}</div>
+              <div><span class='Subtotal_t'>其他实付：</span>￥{{OrderProfitLoss.TotalPayMoney }}</div>
+              <div><span class='Subtotal_t'>优惠金额：</span>￥{{OrderProfitLoss.TotalCouponMoney }}</div>
+
+            </div>
+            <div class="ProfitLoss_xbox" style="margin-left:60px">
+
+              <div><span class='Subtotal_t'>公司结算金额：</span>￥{{OrderProfitLoss.TotalCompanyProfit }}</div>
 
             </div>
           </div>
@@ -93,7 +109,7 @@
         </el-table-column>
         <el-table-column label="单价" prop="Unit_Price" width="70"></el-table-column>
         <el-table-column label="数量" prop="Number" width="70"></el-table-column>
-        <el-table-column label="供应商" prop="SupplierName" width="150" :show-overflow-tooltip='true'></el-table-column>
+        <el-table-column label="供应商" prop="SupplierName" width="120" :show-overflow-tooltip='true'></el-table-column>
       </el-table-column>
 
       <el-table-column label="营业收入" align="center">
@@ -110,6 +126,7 @@
         </el-table-column>
         <el-table-column label="合计数" prop="AllPrice" width="70"></el-table-column>
       </el-table-column>
+
       <el-table-column label="营业成本" align="center">
         <el-table-column label="采购成本" prop="CostMoney"></el-table-column>
 
@@ -120,15 +137,27 @@
             <span @click="showFXCommission(scope.row)" style=" color: #409EFF;cursor:pointer">{{scope.row.FXCommission}}</span>
           </template>
         </el-table-column>
-
-
         <el-table-column label="已返佣" prop="OtherPrice" width="70"></el-table-column>
+        <el-table-column label="订单优惠金额" prop="CouponMoney" width="70"></el-table-column>
+        <el-table-column label="实际退款" prop="RefundActual" width="70"></el-table-column>
         <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 label="其他" align="center">
+        <el-table-column label="应收" prop="YSMoney" width="70"></el-table-column>
+        <el-table-column label="实收" prop="RealMoney" width="70"></el-table-column>
+        <el-table-column label="应付" prop="YFMoney" width="70"></el-table-column>
+        <el-table-column label="实付" prop="PayMoney" width="70"></el-table-column>
+      </el-table-column>
       <el-table-column prop="RemitFXCommission" label="已付"></el-table-column>
       <el-table-column prop="NoPaid" label="应付" ></el-table-column>
+      <el-table-column prop="CompanyName" label="公司名称" width="150"></el-table-column>
+      <el-table-column label="分公司结算" >
+        <template slot-scope="scope">
+          <span >{{(scope.row.GrossProfit *scope.row.CompanyProfitRate).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>
@@ -189,13 +218,15 @@
           OrderNo: '', //订单号
           GoodsID: 0,
           OneUserId: 0,
-          IsFxCommission:1
+          IsFxCommission:1,
+          CompanyId:0,
         },
         CommissionList:[],
         czjfDig:false,
         options: [],
         tableData: [],
         searchList: [],
+        companyData:[],//公司列表
         count: 0,
         loading: false,
         GoodsIDs: '', //商品id
@@ -208,6 +239,7 @@
       this.getDateList()
       this.getSupplierList()
       this.getTotalOrderProfitLoss()
+      this.getCompanyUserList('')
     },
     methods: {
       getDateList() {
@@ -253,12 +285,22 @@
           }
         });
       },
+      getCompanyUserList(Name){
+        this.mallapipost("/api/LiveHouse/GetCompanyUserList", {Name:Name}, res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.companyData = res.data.data;
+          }
+        });
+      },
       Export() {
         let msg = {
           SupplierId: this.msg.SupplierId,
           StartDate: this.msg.StartDate,
           EndDate: this.msg.EndDate,
           IsFxCommission: this.msg.IsFxCommission,
+          CompanyId: this.msg.CompanyId,
+
         }
         msg = JSON.parse(JSON.stringify(msg));
         this.GetMallLocalFile(
@@ -367,6 +409,9 @@
         this.getDateList();
         this.getTotalOrderProfitLoss()
       },
+      ChangeListName(val){
+        this.getCompanyUserList(val)
+      }
     }
   }