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

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue

@@ -177,8 +177,8 @@
             <span
               :class="item.WageReId?'cursor-p active':''">{{item.WageType==1?$t('objFill.v101.FinancialModule.xinyuangbl'):item.WageType==2?$t('objFill.v101.FinancialModule.shangjdudd'):'-'}}</span>
           </td>
-          <td>{{item.EmName!=this.$t('objFill.weitu')&&item.BonusMoney?item.BonusMoney:'-'}}</td>
-          <td>{{item.EmName!=this.$t('objFill.weitu')&&item.BonusRate?item.BonusRate+'%':'-'}}</td>
+          <td>{{item.EmName!=$t('objFill.weitu')&&item.BonusMoney?item.BonusMoney:'-'}}</td>
+          <td>{{item.EmName!=$t('objFill.weitu')&&item.BonusRate?item.BonusRate+'%':'-'}}</td>
           <td>{{item.Month}}</td>
           <td>{{item.Remark?item.Remark:'-'}}</td>
         </tr>

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue

@@ -210,17 +210,17 @@
                 <td>{{item.EmName}}</td>
                 <td>
                     <span @click="item.ProfitMoney>0?clickUrl(item,1,2):''"
-                        :class="item.ProfitMoney>0&&item.EmName!=this.$t('objFill.weitu')?'clickCp':''">{{item.ProfitMoney?item.ProfitMoney:'-'}}</span>
+                        :class="item.ProfitMoney>0&&item.EmName!=$t('objFill.weitu')?'clickCp':''">{{item.ProfitMoney?item.ProfitMoney:'-'}}</span>
                 </td>
                 <td>
                     <span @click="item.SalesMoney>0?clickUrl(item,1,1):''"
-                        :class="item.SalesMoney>0&&item.EmName!=this.$t('objFill.weitu')?'clickCp':''">{{item.SalesMoney?item.SalesMoney:'-'}}</span>
+                        :class="item.SalesMoney>0&&item.EmName!=$t('objFill.weitu')?'clickCp':''">{{item.SalesMoney?item.SalesMoney:'-'}}</span>
                 </td>
                 <td>
-                    <span @click="item.LureNum>0?clickUrl(item,2):''" :class="item.LureNum>0&&item.EmName!=this.$t('objFill.weitu')?'clickCp':''">{{item.EmpType==2&&item.LureNum>0?item.LureNum:'-'}}</span>
+                    <span @click="item.LureNum>0?clickUrl(item,2):''" :class="item.LureNum>0&&item.EmName!=$t('objFill.weitu')?'clickCp':''">{{item.EmpType==2&&item.LureNum>0?item.LureNum:'-'}}</span>
                 </td>
                 <td>
-                    <span @click="item.OrderNum>0?clickUrl(item,3):''" :class="item.OrderNum>0&&item.EmName!=this.$t('objFill.weitu')?'clickCp':''">{{item.EmpType==2&&item.OrderNum>0?item.OrderNum:'-'}}</span></td>
+                    <span @click="item.OrderNum>0?clickUrl(item,3):''" :class="item.OrderNum>0&&item.EmName!=$t('objFill.weitu')?'clickCp':''">{{item.EmpType==2&&item.OrderNum>0?item.OrderNum:'-'}}</span></td>
                 <td>{{item.EmpType>0&&item.WageMoney>0 ? '+ ' + item.WageMoney : '-'}}</td>
                 <td @click="GenerateScale(item)">
                     <span
@@ -230,8 +230,8 @@
                 <td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
                 <td>{{item.LimitCommission != 0?item.LimitCommission:'-'}}</td>
                 <!-- <td>{{item.CommissionRate}}%</td> -->
-                <td>{{item.EmName!=this.$t('objFill.weitu')&&item.BonusMoney?item.BonusMoney:'-'}}</td>
-                <td>{{item.EmName!=this.$t('objFill.weitu')&&item.BonusRate?item.BonusRate+'%':'-'}}</td>
+                <td>{{item.EmName!=$t('objFill.weitu')&&item.BonusMoney?item.BonusMoney:'-'}}</td>
+                <td>{{item.EmName!=$t('objFill.weitu')&&item.BonusRate?item.BonusRate+'%':'-'}}</td>
                 <td>{{item.Month}}</td>
                 <td>
 

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -143,7 +143,7 @@
           <li>
             <span>
               <em>{{$t('Operation.Op_TeamName')}}</em>
-              <el-input v-model="queryMsg.Title" class="w150" clearable></el-input>
+              <el-input v-model="queryMsg.Title" @keyup.native.enter="getControlList" class="w150" clearable></el-input>
             </span>
           </li>
           <li>
@@ -306,7 +306,7 @@
                   </span>
                 </div>
                 <button class="normalBtn TC_SearchBtn"
-                  @click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}</button>
+                  @click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}</button>
               </div>
               <span class="advancedQuery" slot="reference">{{$t('visa.v_gjchaxun')}}
                 <i class="iconfont icon-xiaotuziCduan_1"></i>

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -84,10 +84,30 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>{{$t('objFill.v101.baojiadanh')}}</em>
+            <el-input type="text" class="w200" v-model="queryData.OfferId" clearable></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('visa.v_tuanhao')}}</em>
+            <el-input type="text" class="w200" v-model="queryData.TCNUMS" clearable></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('hotel.hotel_StarDate')}}</em>
+            <el-date-picker class="w150" type="date" v-model="queryData.StartGroupDate"
+              :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <el-date-picker class="w150" type="date" v-model="queryData.EndGroupDate"
+              :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+          </span>
         <li>
           <span>
             <em>{{$t('objFill.v101.dmc.kaituanzt')}}</em>
-            <el-select v-model="queryData.OpenState" filterable :placeholder="$t('pub.pleaseSel')">
+            <el-select v-model="queryData.OpenState" filterable :placeholder="$t('pub.pleaseSel')" class='w200'>
               <el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
               <el-option v-for='item in OpenStateList' :key="item.Id" :label="item.label" :value="item.Id">
               </el-option>
@@ -96,11 +116,10 @@
         </li>
         <li>
           <span>
-            <span>{{$t('visa.v_czuser')}}</span>
-            <el-select class="w150" v-model="queryData.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"
+            <em>{{$t('visa.v_czuser')}}</em>
+            <el-select v-model="queryData.CreateBy" filterable :placeholder="$t('pub.pleaseSel')" class='w200'
               clearable>
-              <el-option :label="$t('pub.unlimitedSel')" :value="0">
-              </el-option>
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
               <el-option v-for="(item,index) in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
                 :key="index"></el-option>
             </el-select>
@@ -542,6 +561,26 @@
           total: 0,
           currentPage: 1,
           TeamType: 0, //0常规,1-小包团,2-一日游,3-地接团
+          OfferId: "", //报价单号
+          TCNUMS: "", //团号
+          StartGroupDate: "", //开始时间
+          EndGroupDate: "", //结束时间
+        },
+        pickerBeginDateBefore: {
+          disabledDate: time => {
+            if (this.queryData.EndGroupDate == null) {
+              return false;
+            } else {
+              let endTime = new Date(this.queryData.EndGroupDate);
+              return endTime.getTime() < time.getTime();
+            }
+          }
+        },
+        pickerBeginDateAfter: {
+          disabledDate: time => {
+            let startTime = new Date(this.queryData.StartGroupDate);
+            return startTime.getTime() >= time.getTime();
+          }
         },
         loading: true,
         //开团状态