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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -513,6 +513,7 @@ tr._item_list td:last-child {
                 <el-option value="19" v-if="isShowType" label="单项门票"></el-option>
                 <el-option value="20" label="开票收入"></el-option>
                 <el-option value="21" label="日本手配费收入"></el-option>
+                <el-option value="22" label="车行收入"></el-option>
               </el-select>
               <el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150"  v-if="isShowGrounding==false">
                 <el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
@@ -760,6 +761,7 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===14" @click="goSAirRec('TicketManager',rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===15">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===16">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===22">{{rowData.TCID}}</span>
   </div>
 
   `,
@@ -880,6 +882,7 @@ Vue.component("TCNUMJump", {
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===19" @click="goUrl('SingleticketOrderListOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
     <span v-if="rowData.DataType===20">{{rowData.TCNUM}}</span>
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===21" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
+    <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===22" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
     rowData: {
@@ -2256,6 +2259,9 @@ export default {
     if(this.msg.LineId==-18){
       this.msg.DataType="21";
     }
+    if(this.msg.LineId==-19){
+      this.msg.DataType="22";
+    }
     let userInfo = this.getLocalStorage();
     if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
         this.isShowType = false;

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -7,8 +7,9 @@
       <span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
       <span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
       <template v-if="true">
-        <span v-if="FeatureData.FeatureType==9" class="foldList" style="margin-right: 5px;"
+        <span v-if="FeatureData.ConfigId&&dataAll.FeaturePageType&&FeatureData.FeatureType==9" class="foldList" style="margin-right: 5px;"
           @click="journeyTemplate()">编辑行程</span>
+        <!-- <span v-if="!FeatureData.ConfigId&&FeatureData.FeatureType==9" style="color: red;float: right;margin-right: 5px;line-height: 28px;">请先选择版型并保存数据</span> -->
       </template>
       <div class="TrfList clearfix">
         <!--&&item.TypeState!=8-->

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -223,7 +223,7 @@
           TripCityList: [], //行程城市
           TripMapList: [],
           NotQueryCityList:[],//使用系统中的经纬度城市
-          FeaturePageType:2,//1横版 2竖版
+          FeaturePageType:0,//1横版 2竖版
         },
         //行程
         FeatureData: {
@@ -271,7 +271,7 @@
           DayList: [],
           isFileUpload: false, //是否是一键上传行程
           IsUpdateTrip: 0, //是否联动行程特色
-          FeaturePageType: 1, //1横版 2竖版
+          FeaturePageType: 0, //1横版 2竖版
         },
         PostPrice: "", //报价信息
         //线路
@@ -893,6 +893,7 @@
                 this.PostConfig.CountryID = tempData.CountryID;
                 this.PostConfig.TeamType = tempData.TeamType;
                 this.PostConfig.FeaturePageType = tempData.FeaturePageType;
+
                 this.PostConfig.FeatureType = tempData.Feature&&tempData.Feature.FeatureType?tempData.Feature.FeatureType:8
                 //视频地址
                 this.PostConfig.VideoStr = tempData.VideoStr;

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -183,8 +183,10 @@
             <span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span>
             <span :class="{'showOther':TeamType==3}">
               <el-form-item prop="FeaturePageType">
-                <el-select class="w90" placeholder="请选择版型" v-model="dataAll.FeaturePageType"
-                @change="getFeaturePageType()">
+                <el-select class="w90" placeholder="请选择版型"
+                :disabled="isTemplate"
+                v-model="dataAll.FeaturePageType"
+                @change="PromptTemplate()" @focus="">
                   <el-option label="横版" :value="1"></el-option>
                   <el-option label="竖版" :value="2"></el-option>
                 </el-select>
@@ -202,6 +204,7 @@
               </div>
               <div class="dayPage-box row">
                 <div class="dayPage-form relative" v-if="!item.isHide">
+                  <template v-if="isTemplate">
                     <el-tooltip class="item" effect="dark" content="放大行程" placement="top">
                       <span class="el-icon-full-screen absolute BlowUpTravelDays"
                       @click="clickBlowUpTravelDays(item)"></span>
@@ -220,6 +223,8 @@
                       <span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose"
                         @click="clickBlowUpTravelDays(item)"></span>
                     </div>
+                  </template>
+                  <span v-else style="color: red;">请选择版型</span>
                 </div>
                 <div class="newDayContent"
                 :style="{'width':!item.isHide?'520px':'1020px'}">
@@ -263,7 +268,8 @@
       return {
         //折叠展开
         SelectDefaultValue: 0,
-        isFold: ""
+        isFold: "",
+        isTemplate: false,
       };
     },
     components: {
@@ -272,8 +278,26 @@
       travelDaysHV
     },
     methods: {
+      PromptTemplate(){
+        let _this = this
+        this.$confirm("一旦选择不可更改， 确认？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          _this.isTemplate = true
+          _this.getFeaturePageType()
+        })
+        .catch(() => {
+          _this.isTemplate = false
+          _this.dataAll.FeaturePageType = 0
+        });
+
+      },
       getFeaturePageType(){
         this.subConfig.DayList.forEach(x=>{
+          x.IsBlowUp = false
           x.ScenicArray.forEach(y=>{
             y.ScenicJson = {
               x: 0,
@@ -342,6 +366,8 @@
             dayItem.WarmTipObj = warmTipObj;
             dayItem.isHide = false;
             dayItem.isRead = false;
+            dayItem.IsBlowUp = false
+            dayItem.zoom = 1
             if(this.dataAll.FeaturePageType==1){
               dayItem.zoom = 0.285
             }
@@ -502,8 +528,9 @@
         deep: true,
         immediate: true,
         handler: function (newVal, oldVal) {
-
-
+          if(!this.dataAll.FeaturePageType){
+            this.isTemplate = false
+          }else this.isTemplate = true
         }
       },
       'subConfig.DayList': {