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

src/components/busManagement/CharteringManagement/CharteringProductList.vue

@@ -378,7 +378,7 @@
         if (item.ProductState == 2) {
           text = this.$t('Operation.Op_shangjia')
         }
-        that.Confirm(`${this.$t('objFill.shifouyao')}${text}${this.$t('objFill.gaibaochecp')}`, this.$t('tips.tips'), {
+        that.$confirm(`${this.$t('objFill.shifouyao')}${text}${this.$t('objFill.gaibaochecp')}`, this.$t('tips.tips'), {
             confirmButtonText: this.$t('pub.sureBtn'),
             cancelButtonText: this.$t('pub.cancelBtn'),
             type: "warning"

src/components/dmc/manager/tripsManager.vue

@@ -448,16 +448,6 @@
                 :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
             </span>
           </li>
-          <li>
-            <span>
-              <em>{{$t('scen.sc_temStatu')}}</em>
-              <el-select class="w150" v-model="queryMsg.QTCState" filterable :placeholder="$t('pub.pleaseSel')">
-                <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
-                <el-option v-for="tcItem in $tripUtils.TeamStatesList.TeamStates" :label="tcItem.Name" :key="tcItem.Id"
-                  :value="tcItem.Id">{{tcItem.Name}}</el-option>
-              </el-select>
-            </span>
-          </li>
           <li>
             <span>
               <em>{{$t('scen.sc_cp')}}</em>
@@ -469,12 +459,22 @@
             </span>
           </li>
           <li>
+            <span>
+              <em>{{$t('scen.sc_temStatu')}}</em>
+              <el-select class="w150" v-model="queryMsg.QTCState" filterable :placeholder="$t('pub.pleaseSel')">
+                <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
+                <el-option v-for="tcItem in $tripUtils.TeamStatesList.TeamStates" :label="tcItem.Name" :key="tcItem.Id"
+                  :value="tcItem.Id">{{tcItem.Name}}</el-option>
+              </el-select>
+            </span>
+          </li>
+          <!-- <li>
             <span>
               <em>{{$t('Operation.Op_hetuan')}}</em>
               <el-input maxlength="50" v-model="queryMsg.CombinationNum" class="permiss-input w150"
                 @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
-          </li>
+          </li> -->
           <li>
             <button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
             <input type="button" class="hollowFixedBtn" :value="$t('op.TDHT')" @click="heTuan"