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

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1919,7 +1919,9 @@
       if (this.$route.query.tcmun) {
         this.queryMsg.TCNUM = this.$route.query.tcmun;
       }
-
+      if (this.$route.query.TCID) {
+        this.queryMsg.TCID = this.$route.query.TCID;
+      }
       if (userInfo.IsParentCompany == undefined) {
         this.queryCommonData.IsParentCompany = 2;
       } else {

src/components/TravelManager/TravelList/components/EditLeaveGroup.vue

@@ -91,7 +91,7 @@ export default {
         return this.$message.error('请选择出团公司');
       }
       if(this.msg.ApplyResion==''){
-        return this.$message.error('请输入申请出团公司缘由');
+        return this.$message.error('请输入申请修改出团公司缘由');
       }
       this.loading = true
       this.apipost('travel_post_SetApplyPriceTeamType', this.msg, res => {

src/components/commonPage/DMCchooseImg.vue

@@ -180,7 +180,7 @@
       <span style="margin-left:24px;">
         <input type="text" class="resource-name resAddImg" v-model="queryMsg.Name" @keyup.enter="getList"
           placeholder="请输入关键字" />
-        <span class="search-imgicon"><i class="iconfont icon-img_cz searchImgIcon" @click="getList"></i></span>
+        <span class="search-imgicon"><i class="iconfont icon-img_cz searchImgIcon" @click="queryMsg.currentPage=1,queryMsg.pageIndex=1,getList()"></i></span>
       </span>
       <div class="addimgContent test-1" v-loading="loading">
         <div class="addimgDiv" v-for="(item, index) in imglistArry" :key="item.subCode"

src/components/dmc/manager/GroupOutCorporationAudit.vue

@@ -4,7 +4,7 @@
       <ul>
         <li>
           <em>出团公司</em>
-          <el-select filterable v-model='msg.OutBranchId' size="small" @change='getControlList()' clearable>
+          <el-select filterable v-model='msg.OutBranchId' size="small" @change='getControlList()'>
             <el-option label="不限" :value="-1" :key="-1"></el-option>
             <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
           </el-select>
@@ -13,7 +13,7 @@
           <span>
             <em>团队类型</em>
             <el-select class="w200" v-model="msg.TeamType" filterable :placeholder="$t('pub.pleaseImport')" size="small"
-              @change="getControlList()" clearable>
+              @change="getControlList()">
               <el-option v-for="item in groupType" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
             </el-select>
           </span>
@@ -22,7 +22,7 @@
           <span>
             <em>审核状态</em>
             <el-select class="w200" v-model="msg.BranchAuditState" filterable :placeholder="$t('pub.pleaseImport')"
-              size="small" @change="getControlList()" clearable>
+              size="small" @change="getControlList()">
               <el-option v-for="item in BranchAuditStateType" :label="item.Name" :value="item.Id" :key="item.Id">
               </el-option>
             </el-select>
@@ -201,9 +201,6 @@
       this.StartTime = [StartTime, EndTime]
       this.msg.QStartDate = StartTime
       this.msg.QEndDate = EndTime
-      if (this.$route.query && this.$route.query.TCID) {
-        this.msg.TCID = this.$route.query.TCID
-      }
       this.getCompany()
     },
     mounted() {
@@ -218,6 +215,7 @@
           this.msg.QStartDate = ''
           this.msg.QEndDate = ''
         }
+        this.getControlList()
       },
       getCompany() {
         this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
@@ -297,44 +295,54 @@
         }
         this.loading = true
         this.apipost("travel_post_AuditPriceOutBranchTeamType", {
-            TCID: TCID,
-            BranchAuditState: type,
-            BranchAuditRemark: this.cancelRemark
-          }, res => {
-            if (res.data.resultCode == 1) {
-              if (!name) {
+          TCID: TCID,
+          BranchAuditState: type,
+          BranchAuditRemark: this.cancelRemark
+        }, res => {
+          if (res.data.resultCode == 1) {
+            if (!name) {
+              this.cancelOrderDialog = false
+              this.Success(res.data.message);
+              this.getList()
+            } else {
+              if (length) {
                 this.cancelOrderDialog = false
                 this.Success(res.data.message);
                 this.getList()
-              } else {
-                if (length) {
-                  this.cancelOrderDialog = false
-                  this.Success(res.data.message);
-                  this.getList()
-                }
               }
-            } else {
-              this.Error(res.data.message);
             }
-            this.loading = false
+          } else {
+            this.Error(res.data.message);
           }
-        );
+          this.loading = false
+        });
       },
       goTravel(item) { //跳转到团队列表
         var newPath = "TravelControlList";
+        var query = {
+          TCID: item.TCID,
+          blank: 'y',
+          tab: '团控列表'
+        };
         if (item.TeamType == 1) {
-          newPath = "TravelControlListSale"
+          newPath = "TravelControlListSale";
+          query = {
+            TCID: item.TCID,
+            blank: 'y',
+            tab: '团控列表'
+          };
         }
         if (item.TeamType == 2) {
-          newPath = "oneDayTrip"
+          newPath = "oneDayTrip";
+          query = {
+            id: item.TCID,
+            blank: 'y',
+            tab: '团控列表'
+          };
         }
         this.$router.push({
           path: newPath,
-          query: {
-            TCID: item.TCID,
-            blank: 'y',
-            tab: '团控列表'
-          }
+          query: query
         });
       }
     }

src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue

@@ -247,7 +247,6 @@
                                 <img
                                   v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
                                   class="absolute"
-                                  style="height: 100%;"
                                   :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
                               </div>
                             </div>
@@ -287,8 +286,7 @@
                                     <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
                                       <img
                                         v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
-                                        class="absolute"
-                                        style="height: 100%;" :src="ScenicArrayList[1].NewImaArray[0].Url"
+                                        class="absolute" :src="ScenicArrayList[1].NewImaArray[0].Url"
                                         :id="'viewSpotImg_'+(item*4)+'_1'+index">
                                     </template>
                                     <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
@@ -339,8 +337,7 @@
                                     <template v-if="ScenicArrayList&&ScenicArrayList.length>2">
                                       <img
                                         v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url"
-                                        class="absolute"
-                                        style="height: 100%;" :src="ScenicArrayList[2].NewImaArray[0].Url"
+                                        class="absolute" :src="ScenicArrayList[2].NewImaArray[0].Url"
                                         :id="'viewSpotImg_'+(item*4)+'_2'+index">
                                     </template>
                                     <img v-if="ScenicArrayList.length>2&&item.ScenicArray.length>2" class="absolute img100"