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

src/components/SalesVisa/VisaProductOrder.vue

-<style>
+<style scoped>
   .row {
   display: flex;
 }
@@ -638,7 +638,7 @@
     height: 30px;
     font-size: 12px;
     text-align: left;
-    text-indent: 25px;
+    text-indent: 5px !important;
   }
 
   .VisaProductTable tr {
@@ -903,8 +903,8 @@
               <th width="6%">业务员</th>
               <th width="6%">公司</th>
               <th width="4%">人数</th>
-              <th width="7%">出发日期</th>
-              <th width="7%">报名日期</th>
+              <th width="6%">出发日期</th>
+              <th width="6%">报名日期</th>
               <th width="7%">应收总额</th>
 
               <th width="7%">实收</th>
@@ -914,9 +914,9 @@
               <th width="5%">优惠</th>
               <th width="5%">待收</th>
               <th width="5%">在途</th>
-              <th width="4%">订单状态</th>
+              <th width="5%">订单状态</th>
               <th width="5%">状态</th>
-              <th width="4%">完结状态</th>
+              <th width="5%">完结状态</th>
               <th width="10%">操作</th>
             </tr>
             <tbody>
@@ -1236,6 +1236,12 @@
               }else{
                 this.CompletedLoading = false
               }
+              for (let i = 0; i < this.dataList.length; i++) {
+                this.$refs.multipleTable.toggleRowSelection(
+                  this.dataList[i],
+                  false
+                );
+              }
               this.multipleSelection = []
               this.$message.success('操作成功！');
               this.getList()

src/components/SalesVisa/components/visaOrderList.vue

@@ -638,6 +638,13 @@
                       </span>
                     </template>
                   </el-table-column>
+                  <el-table-column label="利润" style="background:#EAEAEA">
+                    <template slot-scope="scope">
+                      <span :class="{'cF1416C':scope.row.dueInMoney>0}">
+                        ￥<span class="fz15 fbold">{{moneyFormat((scope.row.income*100)-(scope.row.costMoney*100)-(scope.row.refundMoney*100)/100)}}</span>
+                      </span>
+                    </template>
+                  </el-table-column>
                   <el-table-column label="提成" style="background:#EAEAEA"
                   v-if="(scope.row.commissionMoney&&scope.row.commissionMoney>0)||(scope.row.opCommission&&scope.row.opCommission>0)">
                     <template slot-scope="scope">
@@ -1270,6 +1277,12 @@ export default {
               }else{
                 this.CompletedLoading = false
               }
+              for (let i = 0; i < this.OrderList.length; i++) {
+                this.$refs.multipleTable.toggleRowSelection(
+                  this.OrderList[i],
+                  false
+                );
+              }
               this.multipleSelection = []
               this.$message.success('操作成功！');
               this.$emit('success')