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

src/components/Hotel/HotelManagement.vue

@@ -330,11 +330,13 @@
             </el-tooltip>
           </div>
         </div>
-        <div style="padding-left:15px;padding-top:5px;">
-          <i style="top:2px" class="iconfont icon-renyuanguanli"></i>
-          <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
-          {{item.UpdateTimeStr}}
-        </div>
+        <el-tooltip class="item" effect="dark" :content="item.UpdateName+''+item.UpdateTimeStr" placement="top-start">
+          <div style="padding-left:15px;padding-top:5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
+            <i style="top:2px" class="iconfont icon-renyuanguanli"></i>
+            <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
+            {{item.UpdateTimeStr}}
+          </div>
+        </el-tooltip>
         <div class="btnList">
           <button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtnMan">{{$t('pub.updateMsg')}}</button>
           <button @click="CopyHotel(item.ID)" class="hotelBtnMan">复制</button>

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -525,10 +525,10 @@
             <td>{{item.PeopleNumber}}+1</td>
             <td colspan="8">{{item.TotalMoney}}</td>
           </tr>
-          <tr style="display:none;">
+          <tr>
             <td class="CP_ComTitle2">备注</td>
             <td colspan="8">
-              <el-input type="textarea"></el-input>
+              <el-input type="textarea" v-model="OtherPrice.OtherRemark"></el-input>
             </td>
           </tr>
         </table>

src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue

@@ -277,11 +277,11 @@
               </el-form-item>
             </div>
           </div>
-          <div class="clearfix" style="display:none;">
+          <div class="clearfix"  v-show="IsShow">
             <div class="Dleftname">备注</div>
             <div class="DrightList">
               <el-form-item>
-                <el-input type="textarea" class="w875"></el-input>
+                <el-input type="textarea" class="w875" v-model="teamPrice.PriceRemark"></el-input>
               </el-form-item>
             </div>
           </div>

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -154,7 +154,7 @@
               </div>
             </div>
             <div>
-              <span class="openGroup opbd" @click="goToOpenTravel('TravelManager6',item.ID,item.OpenState)">
+              <span class="openGroup opbd" @click="goToOpenTravel('TravelManager6',item)">
                 <el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
                   <i class="iconfont icon-nav-hangzheng"></i>
                 </el-tooltip>
@@ -459,15 +459,15 @@
         });
       },
       //开团或修改
-      goToOpenTravel(path, configId, openState) {
-        if (configId > 0) {
+      goToOpenTravel(path,item) {
+        if (item.ID > 0) {
           this.$router.push({
             name: path,
             query: {
-              configId: configId,
-              openState: openState,
+              configId: item.ID,
+              openState: item.OpenState,
               isOffer: 1,
-              offerId:configId,
+              offerId:item.OfferId,
               blank: 'y'
             }
           });

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -16,11 +16,13 @@
           {{$t('sm.xianluxingcheng')}}
         </div>
         <div class="TravelLine" v-if="TeamType!=3"></div>
-        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==3}" @click.prevent="custormAnchor('thirdAnchor',3)">
+        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==3}"
+          @click.prevent="custormAnchor('thirdAnchor',3)">
           {{$t('sm.chanpintese')}}
         </div>
         <div class="TravelLine" v-if="TeamType!=3"></div>
-        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}" @click.prevent="custormAnchor('fourAnchor',4)">
+        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}"
+          @click.prevent="custormAnchor('fourAnchor',4)">
           {{$t('sm.buchongxinxi')}}
         </div>
         <div class="TravelLine"></div>
@@ -60,12 +62,15 @@
           <div class="toTop" @click="backTop">
             <i class="iconfont icon-huidaodingbu"></i>
           </div>
-          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">{{$t('pub.saveBtn')}}</div>
-          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">{{$t('fnc.tijiao')}}</div>
+          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">
+            {{$t('pub.saveBtn')}}</div>
+          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">
+            {{$t('fnc.tijiao')}}</div>
           <div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(3)"
             title="另存为新模板">{{$t('pub.saveBtn')}}
           </div>
-          <div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">{{$t('sm.yulan')}}</div>
+          <div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">{{$t('sm.yulan')}}
+          </div>
         </div>
       </div>
     </div>
@@ -86,7 +91,7 @@
     provide() {
       return {
         loadConfigInfo: this.firstLoadConfigInfo,
-        reload:this.reload
+        reload: this.reload
       }
     },
     data() {
@@ -144,6 +149,7 @@
           OpenTeamDescribe: "", //开团备注
           IsOpenHotel: 0, //0可以添加删除酒店，1-不能修改酒店信息
           DayNum: 0, //行程天数
+          OfferId: 0, //报价单Id
         },
         //行程
         FeatureData: {
@@ -341,6 +347,7 @@
         basicData.IsDirect = this.PostConfig.IsDirect;
         basicData.OpenTeamDescribe = this.PostConfig.OpenTeamDescribe;
         basicData.RemoveChild = this.PostConfig.RemoveChild;
+        basicData.OfferId=this.PostConfig.OfferId;
 
         basicData.TeamType = this.PostConfig.TeamType;
 
@@ -378,7 +385,7 @@
         TripFeature.FeatureHtmlJsonDelete = TripFeature.FeatureHtmlJsonDelete ? JSON.stringify(TripFeature
             .FeatureHtmlJsonDelete) :
           "";
-   
+
         if (TripFeature.FeatureType >= 4) {
           var htmlObj = document.getElementById("newFeatureBox");
           if (htmlObj && htmlObj.innerHTML != null && htmlObj.innerHTML != "") {} else {
@@ -622,6 +629,9 @@
         let configId = this.$route.query.configId;
         this.modifyTcid = this.$route.query.tcid;
         this.TCNUM = this.$route.query.TCNUM;
+        if (this.$route.query.offerId) {
+          this.PostConfig.OfferId = this.$route.query.offerId;
+        }
         if (this.modifyTcid > 0) {
           this.modifyType = 2;
         } else {
@@ -721,6 +731,11 @@
                 this.PostConfig.IsSubstitution = tempData.IsSubstitution;
                 this.PostConfig.IsDirect = tempData.IsDirect;
                 this.PostConfig.PriceIsDirect = tempData.PriceIsDirect;
+                this.PostConfig.OfferId = tempData.OfferId;
+                if (this.$route.query.offerId) {
+                  this.PostConfig.OfferId = this.$route.query.offerId;
+                }
+
                 //是否有报价单
                 this.IsHaveOffer = tempData.IsHaveOffer;
 
@@ -824,9 +839,9 @@
     },
     watch: {
       // 方法1
-        '$route' (to, from) { //监听路由是否变化
-            location.reload()
-        },
+      '$route'(to, from) { //监听路由是否变化
+        location.reload()
+      },
     },
     mounted() {
       this.ScrollMethod();

src/components/scenicSpot/scenicSpotList.vue

@@ -312,11 +312,13 @@
         <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
           <div class="hotelTitle">{{item.Name}}</div>
         </el-tooltip>
-        <div style="padding-left:15px;margin:10px 0;">
-          <i style="top: 1px;position: relative;" class="iconfont icon-renyuanguanli"></i>
-          <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
-          {{item.UpdateTimeStr}}
-        </div>
+        <el-tooltip class="item" effect="dark" :content="item.UpdateName+''+item.UpdateTimeStr" placement="top-start" popper-class="max-w250">
+          <div style="padding-left:15px;margin:10px 0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
+            <i style="top: 1px;position: relative;" class="iconfont icon-renyuanguanli"></i>
+            <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
+            {{item.UpdateTimeStr}}
+          </div>
+        </el-tooltip>
         <div class="btnList">
           <button @click="goUrl('scenicSpotInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
           <button @click="CopyScenic(item.ID)" class="hotelBtn">复制</button>