Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/HandFee/HandFeeStatistics.vue

@@ -224,6 +224,9 @@
                 <span style="margin-left: 15px;">已制单总金额：
                 {{totalBW.toFixed(2)}}
                 </span>
+                <span style="margin-left: 15px;">原币总金额：
+                    {{totalYB.toFixed(2)}}
+                    </span>
           </div>
         <div class="_fnDm_content" v-loading='loading'>
             <el-table
@@ -460,6 +463,7 @@ export default {
             LogLoading:false,
             currentPage:1,
             total:0,
+            totalYB:0,
             totalBW:0,
             totalBW2:0,
             totalZD:0,
@@ -483,7 +487,8 @@ export default {
                 }],
             }
         }
-    },created(){
+    },
+    created(){
         if(this.$route.query.FrID){
             this.msg.FrID = this.$route.query.FrID;
         }
@@ -655,11 +660,12 @@ export default {
                 if(res.data.resultCode == 1) {
                     let data = res.data.data
                     this.total = 0;
+                    this.totalYB = 0
                     this.totalBW = 0
                     this.totalBW2 = 0
                     this.DataList = data;
                     this.DataList.forEach(x=>{
-                        // this.total+=x.OriginalMoney
+                        this.totalYB+=x.OriginalMoney
                         if(x.HandFeeIncomeFrId){
                             this.totalBW+=x.Money
                         }else{
@@ -675,7 +681,10 @@ export default {
             },err=>{})
         },
         method5() {
-            this.GetLocalFile("Financial_post_GetFinanceHandFeeListToExcel", this.msg,"手配费用单据.xls");
+            let msg = JSON.parse(JSON.stringify(this.msg))
+            let userInfo = this.getLocalStorage();
+            msg.EmployeeId = userInfo.EmployeeId
+            this.GetLocalFile("Financial_post_GetFinanceHandFeeListToExcel", msg,"手配费用单据.xls");
         } ,
         FinancialFlowTemplate_post_GetStatusList(){  // 获取审核状态枚举
             this.apipost('FinancialFlowTemplate_post_GetStatusList',{}, res => {

src/components/myOrdersAllType/components/OrderList.vue

 <template>
   <el-table border ref="multipleTable" :data="OrderList" style="width: 100%"
     :default-sort="{prop: 'null', order: 'null'}"
-    :sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','DueInMoney']">
+    :sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','OrderProfit','DueInMoney']">
     <el-table-column width="200" prop="CreateTimeStr" label="订单Id" show-overflow-tooltip>
       <template slot-scope="scope">
         <div>
@@ -30,9 +30,9 @@
         </span>
       </template>
     </el-table-column>
-    <el-table-column prop="SaleName" label="销售" show-overflow-tooltip>
+    <el-table-column prop="SaleName" label="销售">
     </el-table-column>
-    <el-table-column prop="LureEmpName" label="引流" show-overflow-tooltip>
+    <el-table-column prop="LureEmpName" label="引流">
     </el-table-column>
     <el-table-column label="商品名称" show-overflow-tooltip>
       <template slot-scope="scope">
@@ -44,27 +44,29 @@
         <div style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Description}}</div>
       </template>
     </el-table-column>
-    <el-table-column sortable prop="Money" label="总金额" show-overflow-tooltip min-width="100">
+    <el-table-column sortable prop="Money" label="总金额" min-width="100" show-overflow-tooltip>
       <template slot-scope="scope">
         {{scope.row.Money}}&ensp;({{scope.row.CurrencyName}})
       </template>
     </el-table-column>
-    <el-table-column sortable prop="Income" label="实收" show-overflow-tooltip>
+    <el-table-column sortable prop="Income" label="实收">
     </el-table-column>
-    <el-table-column sortable prop="PreferTipAmount" label="人头小费" show-overflow-tooltip min-width="101">
+    <el-table-column sortable prop="PreferTipAmount" label="人头小费" min-width="101">
     </el-table-column>
-    <el-table-column sortable prop="PlatformTax" label="手续费" show-overflow-tooltip min-width="100">
+    <el-table-column sortable prop="PlatformTax" label="手续费" min-width="100">
     </el-table-column>
-    <el-table-column sortable prop="Refund" label="退款" show-overflow-tooltip>
+    <el-table-column sortable prop="Refund" label="退款">
     </el-table-column>
-    <el-table-column sortable prop="CostMoney" label="成本" show-overflow-tooltip>
+    <el-table-column sortable prop="CostMoney" label="成本" >
     </el-table-column>
-    <el-table-column sortable prop="DueInMoney" label="待收" show-overflow-tooltip>
+    <el-table-column sortable prop="DueInMoney" label="待收">
       <template slot-scope="scope">
         <span :class="{'red':scope.row.DueInMoney>0}">{{scope.row.DueInMoney}}</span>
       </template>
     </el-table-column>
-    <el-table-column sortable prop="DiscountsMoney" label="优惠" show-overflow-tooltip>
+    <el-table-column sortable prop="OrderProfit" label="预期利润" min-width="100">
+    </el-table-column>
+    <el-table-column sortable prop="DiscountsMoney" label="优惠">
     </el-table-column>
     <el-table-column prop="StateName" label="状态" show-overflow-tooltip>
       <template slot-scope="scope">