页面修改

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -262,7 +262,7 @@
                     <el-checkbox v-model="queryMsg.IsWarning">{{$t('Operation.Op_WarningTeam')}}</el-checkbox>
                   </span>
                 </div>
-                <div class="comSearchDiv">
+                <div class="comSearchDiv" style="display:none;">
                   <span>{{$t('visa.v_hbstatus')}}</span>
                   <span>
                     <el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;">
@@ -915,12 +915,12 @@
         flightStatus: [{
           Id: 0,
           Name: '不限',
-          Checked: false
+          Checked: true
         },
           {
             Id: 1,
             Name: '已配置',
-            Checked: true
+            Checked: false
           },
           {
             Id: 2,

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -8,7 +8,8 @@
       <span class="foldList" @click="fold" v-if="isFold==1">点击展开</span>
       <div class="TrfList clearfix">
         <!-- 'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)-->
-        <div class="TFslide" v-for="item in TypeArray" :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
+        <div class="TFslide" v-for="item in TypeArray"
+          :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
           @click="clickFeature(item)" :key="item.subCode">
           <img v-bind:src="item.imgUrl">
           <div>{{item.ckTitle}}</div>
@@ -17,8 +18,8 @@
       <div style="display:none">
         <p style="padding:5px 0;">请选择下载word行程的主题颜色</p>
         <el-radio-group v-model="FeatureData.TemplateId">
-          <el-radio-button v-for="item in templateColorArray" :class="`templateColorArray_${item.color}`" :label="item.id"
-            :key="item.id" :value="item.id">{{item.text}}</el-radio-button>
+          <el-radio-button v-for="item in templateColorArray" :class="`templateColorArray_${item.color}`"
+            :label="item.id" :key="item.id" :value="item.id">{{item.text}}</el-radio-button>
         </el-radio-group>
         <p style="padding:5px 0 0 0;"> </p>
       </div>
@@ -38,8 +39,8 @@
                 <img v-else :src="item.Url">
                 <div class="TFIMGzhe">
                   <div class="TFreupload" @click="updateTFimg(index)">
-                    <el-upload :file-list="FeatureData.fileList" :http-request="reUpload" :multiple="true" accept="image/jpeg, image/gif, image/png, image/bmp"
-                      :show-file-list="false" action>
+                    <el-upload :file-list="FeatureData.fileList" :http-request="reUpload" :multiple="true"
+                      accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false" action>
                       <i class="iconfont icon-Edit"></i>
                     </el-upload>
                   </div>
@@ -68,8 +69,9 @@
             <div class="userDefined">
               <!-- <quill-editor @change="onEditorChange($event)" v-model="FeatureData.FeatureContent">
               </quill-editor>-->
-              <my-edit v-on:edit-value="FeatureData.FeatureContent = arguments[0]" v-bind:editValue="FeatureData.FeatureContent"
-                v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
+              <my-edit v-on:edit-value="FeatureData.FeatureContent = arguments[0]"
+                v-bind:editValue="FeatureData.FeatureContent" v-bind:toolbarShow="toolbar"
+                v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
             </div>
           </div>
           <div class="TFright" v-if="FeatureData.FeatureType!=FeatureTypeState.userDefined">
@@ -79,8 +81,8 @@
                 <img v-else :src="item.Url">
                 <div class="TFIMGzhe">
                   <div class="TFreupload" @click="updateTFimg(index)">
-                    <el-upload :file-list="FeatureData.fileList" :http-request="reUpload" :multiple="true" accept="image/jpeg, image/gif, image/png, image/bmp"
-                      :show-file-list="false" action>
+                    <el-upload :file-list="FeatureData.fileList" :http-request="reUpload" :multiple="true"
+                      accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false" action>
                       <i class="iconfont icon-Edit"></i>
                     </el-upload>
                   </div>
@@ -94,7 +96,8 @@
           <div v-if="FeatureData.FeatureType===FeatureTypeState.travelSpecial">
             <new-feature ref='newFeature' :data='FeatureData'></new-feature>
           </div>
-          <div v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
+          <div
+            v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
             <newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
           </div>
         </div>
@@ -283,7 +286,7 @@
           type: contentType
         });
       },
-      getHtml: function (postData, SaveType) {
+      getHtml: function (postData, SaveType, TeamType) {
         var FeatureData = {
           B2BRemark: postData.B2BRemark,
           ConfigId: postData.ConfigId,
@@ -303,13 +306,6 @@
           WarmTip: postData.WarmTip,
           TemplateId: postData.TemplateId
         };
-        let flagWangYue = this.$route.query.flag;
-
-        if (flagWangYue == undefined || flagWangYue === "false" || !flagWangYue) {
-          flagWangYue = false;
-        } else {
-          flagWangYue = true;
-        }
         if (this.$refs.newFeature != undefined) {
           var obj = '';
           try {
@@ -329,8 +325,7 @@
         setTimeout(() => {
           try {
             FeatureData.FeatureHtml = document.getElementById("newFeatureBox").innerHTML;
-          } catch (err) {
-          }
+          } catch (err) {}
           this.apipost("travel_post_SetFeature", FeatureData, res => {
               try {
                 this.$refs.newFeature.setReadOnly(false)
@@ -343,13 +338,19 @@
               if (res.data.resultCode == 1) {
                 //保存按钮跳转当当前页码
                 if (SaveType == 1) {
-                  let path = flagWangYue ? 'TravelManager3' : 'TravelManager2';
+                  let path = "TravelManager2";
+                  if (TeamType == 0) {
+                    path = "TravelManager2";
+                  } else if (TeamType == 1) {
+                    path = "TravelManager3";
+                  } else if (TeamType == 2) {
+                    path = "TravelManager4";
+                  }
                   this.Success("保存成功");
-                  if (flagWangYue || this.isNewConfig) {
+                  if (this.isNewConfig) {
                     this.$router.push({
                       path: path,
                       query: {
-                        flag: flagWangYue,
                         configId: FeatureData.ConfigId,
                         openState: 1
                       }
@@ -363,8 +364,16 @@
                 }
                 //提交按钮和另存模板跳转团控列表
                 else if (SaveType == 2 || SaveType == 3) {
+                  let path = "TravelControlList";
+                  if (TeamType == 0) {
+                    path = "TravelControlList";
+                  } else if (TeamType == 1) {
+                    path = "TravelControlListSale";
+                  } else if (TeamType == 2) {
+                    path = "oneDayTrip";
+                  }
                   this.$router.push({
-                    path: "TravelControlList",
+                    path: path,
                     query: {
                       cache: true
                     }
@@ -381,7 +390,8 @@
       //切换tab事件
       clickFeature(item) {
         let state = this.FeatureData.FeatureType
-        if ((state === 4 && item.TypeState === 5) || (state === 4 && item.TypeState === 6) || (state === 4 && item.TypeState ===
+        if ((state === 4 && item.TypeState === 5) || (state === 4 && item.TypeState === 6) || (state === 4 && item
+            .TypeState ===
             7)) {
           this.$confirm('尊敬的用户，行程特色“1”切换为行程特色“2”将会清空行程特色“1”里面的所有内容，您确定切换吗？', {
             confirmButtonText: '确定',

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -189,8 +189,6 @@
         ckedNav: 1,
         modifyType: 1, //1:系列团修改，2:单团修改
         modifyTcid: 0, //修改单团期id
-        // flagWangYue: null,
-        // flagTwodog:null,
         TeamType:'',
         loading: false,
         isNewConfig: true,
@@ -372,12 +370,8 @@
         if (SaveType == 3) {
           basicData.TravelInfoIsCopy = true;
         }
-        //小包团
-        if (this.TeamType) {
-          basicData.TeamType = 1;
-        } else {
-          basicData.TeamType = 0;
-        }
+
+        basicData.TeamType=this.TeamType;
         console.log("basicData",basicData);
         this.apipost(
           "travel_post_SetTravelConfigInfo",
@@ -386,7 +380,7 @@
             if (res.data.resultCode == 1) {
               //配置编号
               TripFeature.ConfigId = res.data.data;
-              this.$refs.TravelFeature.getHtml(TripFeature, SaveType);
+              this.$refs.TravelFeature.getHtml(TripFeature, SaveType,this.TeamType);
               this.$refs.TravelPrice.closeHotelDialog();
               this.$refs.TravelPrice.initStatus();
             } else if (res.data.resultCode == 10009) {
@@ -572,13 +566,13 @@
       firstLoadConfigInfo() {
         var routeName = this.$route.name;
         if(routeName=='TravelManager2'){
-          this.TeamType=1;
+          this.TeamType=0;
         }
         if(routeName=='TravelManager3'){
-          this.TeamType=2;
+          this.TeamType=1;
         }
         if(routeName=='TravelManager4'){
-          this.TeamType=3;
+          this.TeamType=2;
         }
         let configId = this.$route.query.configId;
         this.modifyTcid = this.$route.query.tcid;
@@ -595,7 +589,7 @@
           this.ConfigId = configId;
           let msg = {
             configId: configId,
-            isSale: this.flagWangYue
+            isSale: this.TeamType==1?true:false
           };
           this.loading = true;
           this.apipost(
@@ -726,7 +720,7 @@
           this.loading = true;
           this.apipost(
             "travel_get_GetCommonTravelInfo", {
-              isSale: this.flagWangYue
+              isSale: this.TeamType==1?true:false
             },
             res => {
               if (res.data.resultCode == 1) {
@@ -734,7 +728,7 @@
                 if (tempData.LineList != null) {
                   let data = tempData.LineList;
                   let dataTwo = [];
-                  if (this.flagWangYue) {
+                  if ( this.TeamType==1) {
                     data.forEach(x => {
                       if (x.Is_PacketGroup == 1) {
                         dataTwo.push(x);