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

src/components/administrative/ViittoCommission.vue

@@ -4,15 +4,29 @@
     position: relative;
     top: 1px;
   }
-
+  .opUl li {
+      display: inline-block;
+      margin: 10px 15px 10px 0;
+  }
 </style>
 <template>
-  <div class="flexOne">
-    <div class="query-box">
-      <ul>
+  <div class="flexOne domesticCommission">
+    <div >
+      <ul class="opUl">
         <li>
+          <em>选择期数</em>
+          <el-date-picker
+      v-model="Periods"
+      type="month"
+      value-format="yyyy-MM"
+      placeholder="选择期数">
+    </el-date-picker>
           <input v-if="IsAuth==1" type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable"  />
         </li>
+        <li >
+                  <el-button size="mini" type="danger" style="border-radius:14px" 
+                      @click="exportExcel">导出员工总提成</el-button>
+              </li>
       </ul>
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
@@ -61,7 +75,7 @@
         currentPage: 1,
         isDisable:false,
         IsAuth:0,//生成票务提成权限
- 
+        Periods:'',
       }
     },
     mounted() {
@@ -70,6 +84,22 @@
       this.getList();
     },
     methods: {
+      exportExcel: function () {
+        if(this.Periods&&this.Periods!=''&&this.Periods!=null&&this.Periods!=undefined){
+          let msg = {
+            RB_Group_Id: this.getLocalStorage().RB_Group_id,
+            Periods: this.Periods,
+      }
+      this.GetLocalFile(
+        "Commission_get_GetPeriodsIdAllUser",
+        msg,
+        "第"+this.Periods+"员工总提成.xls"
+      );
+        }else{
+          this.Error("请选择期数");
+        }
+ 
+    },
       goUrlZD(){
         let orderObj = {
           OrderID: 0,

src/components/dmc/manager/dmcTotalTable.vue

@@ -147,7 +147,9 @@
     <div class="mt10 fz14 color333 dmcTotalIconStyle">
       {{$t('ground.yiqueding')}}:<span style="color:#4BCA81 ;">√</span>{{$t('ground.daiqueding')}}:<span
         style="color: #E95252;">O</span>{{$t('salesModule.NotDeal')}}:<span style="color:#E95252 ;">X</span>
-      <span style="font-size: 12px; float: right;">*注意领队交接表一定要在出团日期前维护(需点击保存)，否则此团所有操作无提成</span>
+
+        
+      <span style="font-size: 12px; float: right;">*注意领队交接表一定要在出团日期前维护(需点击保存)，否则此团所有操作无提成；</span>
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
       <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
@@ -167,7 +169,11 @@
           <th width="90">{{$t('salesModule.Trade')}}<br />{{$t('ground.huiyuanjia')}}</th>
           <th width="75">{{$t('advmanager.v_line')}}<br />{{$t('admin.admin_leader')}}</th>
           <th width="75">{{$t('Operation.Op_jinchudian')}}</th>
-          <th width="50">{{$t('ground.dingdan')}}<br />{{$t('admin.admin_personNumber')}}</th>
+          <th width="50">
+            <el-tooltip class="item" effect="dark" content="16/2 （成人16位，儿童2位）" placement="top">
+           <div> {{$t('ground.dingdan')}}<br />{{$t('admin.admin_personNumber')}}</div>
+            </el-tooltip>
+          </th>
           <th width="100">{{$t('ground.jiweishu')}}<br />(Y/E/F/单地接)</th>
           <th width="60">{{$t('leader.leader_Leader')}}</th>
           <th width="60">{{$t('leader.leader_Guide')}}</th>
@@ -266,7 +272,7 @@
                 {{item.InOut}}
               </td>
               <td>
-                {{item.OrderGuestNum}}
+                {{(item.OrderGuestNum-item.ChildNum)}}/{{item.ChildNum}}
               </td>
               <td>
                 <div class="link">