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

src/components/SalesModule/addPassenger.vue

@@ -311,7 +311,8 @@
                 <el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID">
                 </el-option>
               </el-select>
-              <input type="button" value="新增房间" class="normalBtn" @click="addhouse()" title="需要拼房，但没有双人间（半间）的点击新增房间"/>
+              <input type="button" value="新增房间" class="normalBtn" v-if="!UpdateOrderHouseBtn" @click="addhouse()" title="需要拼房，但没有双人间（半间）的点击新增房间"/>
+              <input type="button" value="刷新房间" class="normalBtn" v-if="UpdateOrderHouseBtn" @click="SellUpdateOrderHouse()" title="选择人数后没有房间的点击刷新"/>
             </el-form-item>
           </li>
           <li>
@@ -680,6 +681,7 @@
           HouseId:'',//房间信息
           CouponsIds: []
         },
+        UpdateOrderHouseBtn: false,
         EconomicCapabilityS: [],
         rules: {
           IdCard: [{
@@ -1956,6 +1958,9 @@
             res => {
               if (res.data.resultCode == 1) {
                 this.roomlist = res.data.data;
+                if (this.roomlist.length < 1) {
+                  this.UpdateOrderHouseBtn = true
+                }
               } else {
                 this.$message.error(res.data.message);
               }
@@ -1965,6 +1970,23 @@
           );
         }
       },
+      SellUpdateOrderHouse(){
+        let OrderId = this.addMsg.OrderId;
+        this.apipost(
+            "sellorder_post_SellUpdateOrderHouse_V2",
+            {OrderId: OrderId},
+            res => {
+              if (res.data.resultCode == 1) {
+                this.Roominformation()
+                this.UpdateOrderHouseBtn = false
+              } else {
+                this.$message.error(res.data.message);
+              }
+            },
+            err => {
+            }
+          );
+      },
       getHouselist(Sex,TCID,OrderId,IsBed){
         if(Sex ==1 || Sex == 2){
           this.apipost(

src/components/TravelManager/TravelList/SaleTripList.vue

@@ -95,6 +95,7 @@
                   <el-button v-if="item.CreateBy==CurrentUserId" @click="goToOpenTravel('TravelManager5',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
                   <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
                   <el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
+                  <el-button @click="goUrlR('SalesconfirmationOrder',item)" type="primary">行程下载</el-button>
                 </div>
               </div>
             </div>
@@ -317,6 +318,23 @@
           err => {}
         );
       },
+      //跳转至下载
+      goUrlR(path,item){
+        console.log(item,'itemm');
+         let routeData = this.$router.resolve({
+          name: path,
+          query: {
+            configId:item.ID,
+            cityId: 0,
+            tcid: item.TCID,
+            orderId:0,
+            vshowL:false,
+            vshowM:false,
+            vshowTCNUM:true,
+          }
+        })
+        window.open(routeData.href, '_blank')
+      }
     },
     mounted() {
       let UserInfo = this.getLocalStorage();