增加一日游

src/assets/common/lang/zh.js

@@ -1211,6 +1211,19 @@ export const Operation = {
   Op_localBranchPrice:'当地分公司价格',
   Op_localdaiPrice:'当地代销商价格',
   Op_localDangPrice:'当地当团利润归属',
+  Op_Country:'国别',
+  Op_WarningTeam:'预警团',
+  Op_TransportState:'联运状态',
+  Op_hide:'隐藏',
+  Op_TeamWarningSearch:'团控预警查询',
+  Op_daysChoice:'天数选择',
+  Op_Attendance:'上座率',
+  Op_warningSearch:'预警查询',
+  Op_TeamName:'团名',
+  Op_nei:'内',
+  Op_zhu:'主',
+  Op_lian:'联',
+  Op_jietuan:'结团',
 }
 export const rule = {
   company: '请选择公司',

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -39,10 +39,13 @@
           :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>
-        <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="!flagWangYue"
+
+        <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==1"
           :PostConfig="PostConfig" :modifyTcid="modifyTcid"></TravelPrice>
-        <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
-          :priceList="PriceList" v-else :PostConfig="PostConfig" :modifyTcid="modifyTcid"></TravelPrice2>
+        <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==2"
+          :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"></TravelPrice2>
+        <TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==3"
+          :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"></TravelPrice3>
         <div class="btnFixedDiv">
           <div class="toTop" @click="backTop">
             <i class="iconfont icon-huidaodingbu"></i>
@@ -65,6 +68,7 @@
   import TravelNotice from "../TravelGroupControl/TravelNotice";
   import TravelPrice from "../TravelGroupControl/TravelPrice";
   import TravelPrice2 from "../TravelGroupControl/TravelPrice2";
+  import TravelPrice3 from "../TravelGroupControl/TravelPrice3";
 
   export default {
     provide() {
@@ -185,7 +189,9 @@
         ckedNav: 1,
         modifyType: 1, //1:系列团修改，2:单团修改
         modifyTcid: 0, //修改单团期id
-        flagWangYue: null,
+        // flagWangYue: null,
+        // flagTwodog:null,
+        TeamType:'',
         loading: false,
         isNewConfig: true,
       };
@@ -196,7 +202,8 @@
       TravelFeature: TravelFeature,
       TravelNotice: TravelNotice,
       TravelPrice: TravelPrice,
-      TravelPrice2: TravelPrice2
+      TravelPrice2: TravelPrice2,
+      TravelPrice3: TravelPrice3
     },
     methods: {
       /*获取行程特色内容对象*/
@@ -366,7 +373,7 @@
           basicData.TravelInfoIsCopy = true;
         }
         //小包团
-        if (this.flagWangYue) {
+        if (this.TeamType) {
           basicData.TeamType = 1;
         } else {
           basicData.TeamType = 0;
@@ -563,12 +570,16 @@
         return dinnerObj;
       },
       firstLoadConfigInfo() {
-        if (this.$route.query.flag) {
-          this.flagWangYue = this.$route.query.flag === "false" ? false : true;
-        } else {
-          this.flagWangYue = false;
-        }
-
+        // if (this.$route.query.flag) {
+        //   this.flagWangYue = this.$route.query.flag === "false" ? false : true;
+        // } else {
+        //   this.flagWangYue = false;
+        // }
+        // if(this.$route.query.isOneday){
+        //   this.flagTwodog = this.$route.query.isOneday
+        // }
+        this.TeamType = this.$route.query.TeamType;
+        console.log(this.TeamType,'teamtype');
         let configId = this.$route.query.configId;
         this.modifyTcid = this.$route.query.tcid;
         this.TCNUM = this.$route.query.TCNUM;

src/router/config.js

@@ -1412,6 +1412,14 @@ export default {
                 title: '自主开团'
               },
             },
+            {
+              path: '/TravelManager4', //一日游开团
+              name: 'TravelManager4',
+              component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelManager2'], resolve),
+              meta: {
+                title: '自主开团'
+              },
+            },
             {
               path: '/BasicOpenGroup', //基础班团控配置
               name: 'BasicOpenGroup',
@@ -1427,6 +1435,14 @@ export default {
                 title: '团控列表'
               },
             },
+            {
+              path:'/oneDayTrip',  //一日游
+              name:'oneDayTrip',
+              component: resolve => require(['@/components/TravelManager/TravelList/oneDayTrip'], resolve),
+              meta: {
+                title: '一日游'
+              },
+            },
             {
               path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
               name: 'priceIncomeConfirmInfo',