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

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -557,15 +557,15 @@
         <li>
           <span>
             <em>{{ $t("visa.v_tuanhao") }}</em>
-            <el-input v-model="msg.TCID" class="w150"></el-input>
+            <el-input v-model="msg.TCID" class="w150" clearable></el-input>
           </span>
         </li>
         <li>
           <span><em>{{ $t("hotel.hotel_StarDate") }}</em>
-            <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
+            <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" clearable
               type="date"></el-date-picker>
             -
-            <el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
+            <el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" clearable
               type="date"></el-date-picker>
           </span>
         </li>

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -41,6 +41,33 @@
 .price:hover {
   color: red;
 }
+  .PQ_detail {
+    width: 100%;
+    border-collapse: collapse;
+  }
+
+  .PQ_detail tr th,
+  .v-table-title-cell {
+    background: #e6e6e6;
+    height: 40px;
+    font-size: 14px;
+    border-right: 1px solid #e6e6e6;
+    color: #333;
+  }
+
+  .PQ_detail tr {
+    background: #fff;
+    text-align: center;
+    height: 40px;
+  }
+
+  .PQ_detail tr td {
+    font-size: 12px;
+    border: 1px solid #e5e5e5;
+  }
+  .ml {
+    margin-left: 10px;
+  }
 </style>
 <template>
   <div class="TC_Content">
@@ -61,37 +88,37 @@
           <li>
             <span>
               <em>业务名称</em>
-              <el-input maxlength="50" v-model="queryMsg.GTeamName" class="permiss-input w150"
+              <el-input maxlength="50" v-model="queryMsg.GTeamName" class="permiss-input w150" clearable
                 @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
-              <el-date-picker class="w150" type="date" v-model="queryMsg.SelectStartDate"
+              <el-date-picker class="w150" type="date" v-model="queryMsg.SelectStartDate" clearable
                 :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
               <el-date-picker class="w150" type="date" v-model="queryMsg.SelectEndDate"
-                :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+                :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder clearable></el-date-picker>
             </span>
           </li>
           <li>
             <span>
               <em>航空公司</em>
-              <el-input maxlength="50" v-model="queryMsg.QAirlineCompany" class="permiss-input w150"
+              <el-input maxlength="50" v-model="queryMsg.QAirlineCompany" class="permiss-input w150" clearable
                 @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
           <li>
             <span>
               <em>航班号</em>
-              <el-input maxlength="50" v-model="queryMsg.QFlightNum" class="permiss-input w150"
+              <el-input maxlength="50" v-model="queryMsg.QFlightNum" class="permiss-input w150" clearable
                 @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
           <li>
             <span>
               <em>合作伙伴</em>
-              <el-input maxlength="50" v-model="queryMsg.QCustomerName" class="permiss-input w150"
+              <el-input maxlength="50" v-model="queryMsg.QCustomerName" class="permiss-input w150" clearable
                 @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
@@ -131,9 +158,9 @@
               <div class="el-col w_10">
                 <div class="p20">
                   <div class="mb title"><i class="iconfont icon-jiage"></i><span>机位信息</span></div>
-                  <div class="mb bold"><span class="item-title">经济舱:</span><span>{{item.YSeat}} <span class="item-title">剩余:</span>{{item.SurplusYSeatNum}}</span></div>
-                  <div class="mb bold"><span class="item-title">商务舱:</span><span> {{item.CSeat}} <span class="item-title">剩余:</span>{{item.SurplusCSeatNum}}</span></div>
-                  <div class="mb bold"><span class="item-title">头等舱:</span><span> {{item.FSeat}} <span class="item-title">剩余:</span>{{item.SurplusFSeatNum}}</span></div>
+                  <div class="mb bold"><span class="item-title">经济舱:</span><span>{{item.YSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusYSeatNum}}</span></div>
+                  <div class="mb bold"><span class="item-title">商务舱:</span><span> {{item.CSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusCSeatNum}}</span></div>
+                  <div class="mb bold"><span class="item-title">头等舱:</span><span> {{item.FSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusFSeatNum}}</span></div>
                   <div class="mb bold"><span class="item-title">报名人数:</span><span> {{item.OrderGuestNum}} </span></div>
                   <div class="mb bold"><span class="item-title">领队导游:</span><span> {{item.LeaderNum}} </span></div>
                 </div>