销售开团修改

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -385,8 +385,8 @@
         <div>
           <div class="TPSetInfo clearfix">
             <el-form label-width="10px" style="border-collapse:collapse;">
-              <div class="dijiebaojia clearfix">
-                <p class="TPbaseSet" style="width: 140px">地接报价</p>
+              <div class="dijiebaojia clearfix" style="display:none;">
+                <p class="TPbaseSet" style="width: 140px;">地接报价</p>
                 <table border="1" bordercolor="#dcdfe6" class="fl" v-if="dijiebaojiaShow&&queryPriceList.length>0"
                   v-loading="queryPriceListLoading">
                   <template v-for="item in queryPriceList">

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue

@@ -33,21 +33,17 @@
         <TravelConfig @headCallBack="getConfig" @setTravelUploadData="setTravelUploadData" :PostConfig="PostConfig"
           :TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig>
         <TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters"
-                              :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect"
-                              v-bind:AllCityList="AllCityList"
-                              v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp"
-                              :AirSend="AirSend" @change="handlerChangeData"
-                              :TeamType="TeamType"></TravelDaysTripDirect>
+          :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
+          v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
+          @change="handlerChangeData" :TeamType="TeamType"></TravelDaysTripDirect>
         <TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
-                       :TeamType="TeamType"
-                       :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
+          :TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
         <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
           :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList"
           v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
 
         <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
-                      :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
-                      :TeamType="TeamType"></TravelPrice2>
+          :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
         <div class="btnFixedDiv">
           <div class="toTop" @click="backTop">
             <i class="iconfont icon-huidaodingbu"></i>
@@ -63,19 +59,12 @@
         </div>
       </div>
     </div>
-
-     <el-dialog
-      custom-class="w800"
-      title="行程地图"
-      :visible.sync="isShowMap"
-      center
-    >
+    <el-dialog custom-class="w800" title="行程地图" :visible.sync="isShowMap" center>
       <TravelMap :dataList="travelLngLat"></TravelMap>
       <div slot="footer" class="dialog-footer">
-        <button class="hollowFixedBtn" @click="isShowMap = false">{{$t('pub.cancelBtn')}}</button>
+        <button class="hollowFixedBtn" @click="isShowMap = false">关闭</button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -89,12 +78,12 @@
   import TravelMap from '../oldTravelGroupControl/TravelMap'
 
   export default {
-    provide () {
+    provide() {
       return {
         loadConfigInfo: this.firstLoadConfigInfo
       }
     },
-    data () {
+    data() {
       return {
         ConfigId: 0, //地址栏查询参数
         NewConfigId: '', //configID加密后的字符串【预览使用】
@@ -142,7 +131,7 @@
           VideoStr: '', //视频地址
           //是否更新酒店库存
           IsUpdateHotel: 0,
-          OpenTeamDescribe: '',//开团备注
+          OpenTeamDescribe: '', //开团备注
           customId: 0,
           allotId: 0,
         },
@@ -216,8 +205,8 @@
         loading: false,
         isNewConfig: true,
         isfromManager: true,
-        isShowMap:false,
-        travelLngLat:[]
+        isShowMap: false,
+        travelLngLat: []
       }
     },
     components: {
@@ -226,14 +215,14 @@
       TravelFeature: TravelFeature,
       TravelNotice: TravelNotice,
       TravelPrice2: TravelPrice2,
-      TravelMap:TravelMap
+      TravelMap: TravelMap
     },
     methods: {
       /*获取行程特色内容对象*/
-      getFeature (featureObj) {
+      getFeature(featureObj) {
         this.PostFeature = featureObj
       },
-      handlerChangeData (data) {
+      handlerChangeData(data) {
         if (
           this.FeatureData.FeatureHtmlJson &&
           this.FeatureData.FeatureHtmlJson.d &&
@@ -245,7 +234,7 @@
         }
       },
       /*获取组件配置信息【回调方法】*/
-      getConfig (configObj) {
+      getConfig(configObj) {
         this.PostConfig = configObj
         this.NoticeParameters.ConfigId = this.PostConfig.ConfigId
         this.NoticeParameters.CountryID = this.PostConfig.CountryID
@@ -258,7 +247,7 @@
         }
       },
       /*获取组件报价信息*/
-      getPrice (priceObj) {
+      getPrice(priceObj) {
         priceObj.forEach(objItem => {
           var SaleBranchId = ''
           if (objItem.SaleBranchIdArray.length > 0) {
@@ -274,23 +263,23 @@
         this.PostPrice = priceObj
       },
       //行程回调
-      getDaysTrip (tripObj) {
+      getDaysTrip(tripObj) {
         this.PostDaysTrip = tripObj
       },
       /*获取行程特色内容对象*/
-      getFeature (featureObj) {
+      getFeature(featureObj) {
         this.PostFeature = featureObj
       },
       /*获取行程特色其他内容*/
-      getNotice (noticeObj) {
+      getNotice(noticeObj) {
         this.PostNotice = noticeObj
       },
       //解锁表单重复提交
-      unlockFormCommit (value) {
+      unlockFormCommit(value) {
         this.isSubmit = value
       },
       //初始化幻灯片
-      initFileList () {
+      initFileList() {
         for (var i = 0; i < 5; i++) {
           var fileObj = this.$commonUtils.FileObject()
           if (this.PostConfig.fileList.length <= 5) {
@@ -300,14 +289,14 @@
         }
       },
       //提交验证
-      submitForm (SaveType) {
+      submitForm(SaveType) {
         if (this.isSubmit) {
           this.isSubmit = false
           this.SaveData(SaveType)
         }
       },
       /*保存数据*/
-      SaveData (SaveType) {
+      SaveData(SaveType) {
         this.MsgBus.$emit('saveTravel', true)
         this.FeatureData.IsSave = true
         this.submitText = '保存中'
@@ -337,9 +326,11 @@
 
         basicData.DayNum = (this.PostDaysTrip && this.PostDaysTrip.DayNum != '') ? this.PostDaysTrip.DayNum : 0
         basicData.NightNum = (this.PostDaysTrip && this.PostDaysTrip.NightNum != '') ? this.PostDaysTrip.NightNum : 0
-        basicData.StartCityId = (this.PostDaysTrip && this.PostDaysTrip.StartCityId != '') ? this.PostDaysTrip.StartCityId :
+        basicData.StartCityId = (this.PostDaysTrip && this.PostDaysTrip.StartCityId != '') ? this.PostDaysTrip
+          .StartCityId :
           0
-        basicData.ReturnArriveCityId = (this.PostDaysTrip && this.PostDaysTrip.ReturnArriveCityId != '') ? this.PostDaysTrip
+        basicData.ReturnArriveCityId = (this.PostDaysTrip && this.PostDaysTrip.ReturnArriveCityId != '') ? this
+          .PostDaysTrip
           .ReturnArriveCityId : 0
 
         basicData.SelfpayingList = this.PostConfig.SelfpayingList
@@ -363,7 +354,8 @@
         TripFeature.FeatureHtmlJson = TripFeature.FeatureHtmlJson ?
           JSON.stringify(TripFeature.FeatureHtmlJson) :
           ''
-        TripFeature.FeatureHtmlJsonDelete = TripFeature.FeatureHtmlJsonDelete ? JSON.stringify(TripFeature.FeatureHtmlJsonDelete) :
+        TripFeature.FeatureHtmlJsonDelete = TripFeature.FeatureHtmlJsonDelete ? JSON.stringify(TripFeature
+            .FeatureHtmlJsonDelete) :
           ''
         TripFeature.FeeInclude = this.PostNotice.FeeInclude
         TripFeature.FeeNonInclude = this.PostNotice.FeeNonInclude
@@ -414,13 +406,12 @@
               this.$refs.TravelFeature.del_show = true
             }
           },
-          err => {
-          }
+          err => {}
         )
       },
 
       //初始化团的幻灯片
-      initFileList () {
+      initFileList() {
         this.PostConfig.fileList = []
         for (var i = 0; i < 5; i++) {
           var fileObj = this.$commonUtils.FileObject()
@@ -428,13 +419,13 @@
         }
       },
       //初始化行程特色幻灯片
-      initFeatureFile () {
+      initFeatureFile() {
         for (var i = 0; i < 5; i++) {
           var fileObj = this.$commonUtils.FileObject()
           this.FeatureData.fileList.push(fileObj)
         }
       },
-      custormAnchor (anchorName, index) {
+      custormAnchor(anchorName, index) {
         // 找到锚点
         let anchorElement = document.getElementById(anchorName)
         // 如果对应id的锚点存在，就跳转到锚点
@@ -443,7 +434,7 @@
         }
         this.ckedNav = index
       }, //滚动事件
-      ScrollMethod () {
+      ScrollMethod() {
         var that = this
         var s1, s2, s3, s4, s5
         document
@@ -479,7 +470,7 @@
           })
       },
       //返回顶部
-      backTop () {
+      backTop() {
         var timer = setInterval(function () {
           var scrollTop = document.getElementsByClassName('frame-box')[0]
             .scrollTop
@@ -492,7 +483,7 @@
         }, 30)
       },
       /*一键上传数据组装*/
-      setTravelUploadData (uploadConfig) {
+      setTravelUploadData(uploadConfig) {
         if (uploadConfig != undefined) {
           var configData = JSON.parse(uploadConfig)
           //基础数据组装
@@ -576,7 +567,7 @@
         }
       },
       //餐饮对象上传创建
-      dinnerUploadFactory (dayNum, useDinnerType, dinnerName) {
+      dinnerUploadFactory(dayNum, useDinnerType, dinnerName) {
         let dinnerObj = this.$tripUtils.dinnerObj()
         dinnerObj.UseDinnerType = useDinnerType
         dinnerObj.DinnerName = dinnerName
@@ -584,7 +575,7 @@
         dinnerObj.DayNum = dayNum
         return dinnerObj
       },
-      firstLoadConfigInfo () {
+      firstLoadConfigInfo() {
         var routeName = this.$route.name
         this.TeamType = 1
         let configId = this.$route.query.configId
@@ -700,8 +691,8 @@
                 this.journeyList.StartCityId = tempData.StartCityId
                 this.journeyList.DayList = tempData.DayList;
 
-                this.PostDaysTrip.TrafficList=[];
-                tempData.DayList2.forEach(item=>{
+                this.PostDaysTrip.TrafficList = [];
+                tempData.DayList2.forEach(item => {
                   this.PostDaysTrip.TrafficList.push(item.TrafficObj);
                 })
 
@@ -732,8 +723,7 @@
               }
               this.loading = false
             },
-            err => {
-            }
+            err => {}
           )
         } else {
           this.initFileList()
@@ -763,12 +753,11 @@
               }
               this.loading = false
             },
-            err => {
-            }
+            err => {}
           )
         }
       },
-      goB2B () {
+      goB2B() {
         let userInfo = this.getLocalStorage()
         var B2BDomain = userInfo.B2BDomain
         let configId = this.NewConfigId
@@ -780,16 +769,17 @@
         )
       },
       //获取地图
-      getMapList(){
-        this.isShowMap=true
-        this.journeyList.DayList.forEach(x=>{
-            x.dayArray.forEach(y=>{
-              if((y.Type==2||y.Type==3)&&(y.childItem.Lat!=""&&y.childItem.Lng!="")){
+      getMapList() {
+        this.isShowMap = true
+        this.journeyList.DayList.forEach(x => {
+          x.dayArray.forEach(y => {
+            if ((y.Type == 2 || y.Type == 3) && (y.childItem.Lat != "" && y.childItem.Lng != "")) {
               this.travelLngLat.push({
-                    lat:y.childItem.Lat,
-                    lng:y.childItem.Lng,
-                    name:y.childItem.CouponsName=="undefined"?y.childItem.HotelName:y.childItem.CouponsName,
-                    type:y.Type
+                lat: y.childItem.Lat,
+                lng: y.childItem.Lng,
+                name: y.childItem.CouponsName == "undefined" ? y.childItem.HotelName : y.childItem
+                  .CouponsName,
+                type: y.Type
               })
             }
           })
@@ -800,7 +790,7 @@
       this.MsgBus.$emit('FeatureDataFlag')
     },
     watch: {},
-    mounted () {
+    mounted() {
       if (this.$route.query.customId) {
         this.PostConfig.customId = this.$route.query.customId
       }
@@ -810,7 +800,7 @@
       this.ScrollMethod()
 
     },
-    created () {
+    created() {
       this.firstLoadConfigInfo();
     }
   }