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

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -427,6 +427,25 @@
                     <span>{{$t('Airticket.Air_StartTime')}}</span>
                     {{item.StartDate}}
                   </p>
+                  <p class="travelnowrap flex" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
+                    <span>报价单</span>
+                    <span class="go_date">
+                      <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
+                        <a :key="subIndex" style="margin-left:20px;color:blue;cursor:pointer;" :href="subItem.Url"
+                          v-if="subItem.Url" target="_blank" :download="subItem.Name">{{subItem.Name}}</a>
+                        <template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
+                          <br :key="subIndex+1000" />
+                        </template>
+                      </template>
+                    </span>
+                  </p>
+                  <p class="travelnowrap flex" v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
+                    <span>报价单</span>
+                    <span class="go_date">
+                      <a style="margin-left:20px;color:blue;cursor:pointer;" :href="item.PriceOfferUrl"
+                        v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
+                    </span>
+                  </p>
                   <p class="travelnowrap">
                     <span>{{$t('Operation.Op_teamNotice')}}</span>
                     {{item.OutNotice==1?"OK":"暂定"}}

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -456,7 +456,7 @@
                     </el-checkbox>
                     <template v-if="CurrentUserInfo.RB_Group_id==2">
                       <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
-                        v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
+                        v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
                     </template>
                     <template v-else>
                       <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"