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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -2,6 +2,7 @@
   <div class="mb30" v-loading='loading'>
     <table class="leaderReimbursementTableNav" border="0" cellspacing="1" cellpadding="0">
       <tr>
+        <th width="8%">出团公司</th>
         <th width="8%">出发地</th>
         <th width="30%">行程名称</th>
         <th width="150">团号</th>
@@ -14,6 +15,9 @@
         <th>酒店</th>
       </tr>
       <tr v-for='item in nav'>
+        <td>
+           {{item.OutBranchName}}
+        </td>
         <td>{{item.StartCityNames}}
         </td>
         <td>

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -287,6 +287,16 @@
         });
       },
       getHtml: function (postData, SaveType, TeamType) {
+        //HK 2019-10-14 新增开始
+       if (this.$refs.newFeature2 != undefined) {
+          //检查是否有更新
+          var IsRefresh = this.$refs.newFeature2.getIsRefresh();
+          if (IsRefresh) {
+            //有更新重新初始化行程特色内容
+            this.$refs.newFeature2.UpDateInfo();
+          }
+        }
+        //HK 2019-10-14 新增结束
         var FeatureData = {
           B2BRemark: postData.B2BRemark,
           ConfigId: postData.ConfigId,

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -1636,6 +1636,11 @@
         blockList.splice(index1, 1);
         this.pageCount(name)
       },
+      //判断是否切换
+      getIsRefresh()
+      {
+        return this.Refresh;    
+      },
       // 返回数据对象
       getFeatureData: function () {
         this.canEditChange(false);

src/components/newTravelmanager/TravelGroupControl/travelFeature/featureBody.vue

@@ -35,35 +35,6 @@
                     </div>
                 </div>
             </div>
-             <!-- <div class="meal-first-box" v-if='i==0 && x.type==1'>
-                <div class="img-box" :id='"box_"+index+"_"+i'>
-                    <div class="img-parent">
-                        <VueDraggableResizable :ref='"vds_"+index+"_"+i' tabindex="0" :resizable='false' :active="false" :parent="false" axis='y' @activated="onActivated(i)" :w="860" :h="1960" :x="x.x" :y="x.y"  :z="2" @dragstop="onDragstop">
-                            <img :src='x.img' :id='"body_"+index+"_"+i' />
-                        </VueDraggableResizable>
-                    </div>
-                    <div class="type">
-                        <span>酒店</span>
-                    </div>
-                </div>
-                <div class="remark">优选酒店</div>
-                <div class="hotelInfo">
-                    <div class="name-box">
-                        <div class="name">
-                            <div class="right-bg"></div>
-                            <input v-if='!r' v-model='x.name' :style='{width:x.name.length*28+"px"}' type="text" maxlength="10" />
-                        </div>
-                        <div class="cityName">
-                            <div class="left-bg"></div>
-                            <input v-if='!r' v-model='x.cityName' type="text" maxlength="5" />
-                        </div>
-                    </div>
-                    <div class="star-box"></div>
-                    <div class="txt-content">
-                        <textarea v-if='!r'  v-model="x.description" spellcheck="false"></textarea>
-                    </div>
-                </div>
-            </div> -->
             <div class="hotel-second-box" v-if='i==1 && x.type==1'>
                 <div class="hotelInfo">
                     <div class="txt-content">

src/components/newTravelmanager/TravelGroupControl/travelFeature/index.vue

@@ -347,7 +347,6 @@
         this.h.subTitle = this.data.Subtitle ? this.data.Subtitle : "";
         this.h.title = this.data.Title ? (this.data.Title.length > 20 ? this.data.Title.substring(0, 20) : this.data.Title) :
           "";
-        console.log("this.h",this.data,this.h);
         //初始化A4腰
         if (this.data.LineName) {
           this.f.line = this.data.LineName.replace(/出境/ig, "");
@@ -432,13 +431,6 @@
             this.t.push(i)
           }
         } else if (active == 'change') {
-          // if (chooseType == 1 || chooseType == 2) {
-
-          // } else {
-          //   let tempObj = this.d[i]
-          //   tempObj.img = path
-          //   this.$set(this.d, i, tempObj)
-          // }
           let tempObj = this.d[i];
           tempObj.img.list[tempObj.img.index] = path
           this.$set(this.d, i, tempObj)
@@ -457,5 +449,4 @@
       }
     }
   }
-
-</script>
+</script>
\ No newline at end of file