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

src/components/Ticketing/PassengerList.vue

@@ -66,7 +66,7 @@
   border-top:1px dashed #d1d1d1;
   padding-top:10px;
 }
-.PassengerList .el-input,.el-input__inner{
+.PassengerList .el-input__inner{
   height:23px!important;
   padding:0 5px;
 }
@@ -141,8 +141,8 @@
                             <span class="iconfont icon-hangban"></span>
                             <span>{{item.Flight_number}}</span>
                             <span>
-                                <el-input class="w69" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>-
-                                <el-input class="w69" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
+                                <el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> -
+                                <el-input class="w60" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
                             </span>
                           </p>
                           <el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
@@ -174,8 +174,8 @@
                             <span class="iconfont icon-hangban"></span>
                             <span>{{item.Flight_number}}</span>
                             <span>
-                                <el-input class="w69" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>-
-                                <el-input class="w69" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
+                                <el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> -
+                                <el-input class="w60" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
                             </span>
 
                           </p>
@@ -265,7 +265,6 @@
         );
       },
       getFlightInfo() {
-        //导出报表
         let msg = {
           ID:this.$route.query.id
         }
@@ -305,6 +304,7 @@
           },err => {}
         );
       },
+      //导出报表
       exportExcel(){
         let msg = {
           AirTicketId: this.msg.AirTicketId

src/components/administrative/CommissionDetail.vue

@@ -74,6 +74,8 @@ export default {
           '额外奖励':x.otherMoney.toFixed(2),
           '额外扣除':x.backMoney.toFixed(2),
           '应发提成':x.sumMoney.toFixed(2),
+          '收客数':x.peopleCount,
+          '单签证人数':x.visaPeopleCount,
           '所属期数':x.periods
         }
         data.push(obj)