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

# Conflicts:
#	src/assets/css/tripIndexNew.css

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2095,13 +2095,13 @@
               <span class="RL-remarkTitle" v-if="item.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span>
               <p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
                 <span style="color: blue !important" v-for="(childItem,childIndex) in item.GuestList" :key="childIndex"
-                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }} <span style="color:#f56c6c">{{childItem.VisaType==1?'个签':''}}</span></span>
+                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }}<span style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span></span>
               </p>
               <p v-if="item.CancelGuestList.length > 0">
                 <span class="">{{ $t("salesModule.CancelOrder") }}:</span>
                 <span class="RL-redType RL-remarkCon">
                   <span v-for="(childItem,childIndex) in item.CancelGuestList"
-                    :key="childIndex">{{ childItem.userName }} <span style="color:#f56c6c">{{childItem.VisaType==1?'个签':''}}</span> &nbsp;&nbsp;</span>
+                    :key="childIndex">{{ childItem.userName }}<span style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span> &nbsp;&nbsp;</span>
                 </span>
               </p>
               <span>{{ $t("salesModule.RoomInfo") }}：{{

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -2179,6 +2179,9 @@
         if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
           cityId = item.UnionCityId;
         }
+        if (item.FeatureType == 8) {
+          //path = 'confirmationOrderDownLoadNew'
+        }
         let routeData = this.$router.resolve({
           name: path,
           query: {

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -783,7 +783,7 @@
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
                       <el-dropdown-item
-                        @click.native="goUrlR('confirmationOrderDownLoad',item.TCID,item.ID,item.StartCityID)">
+                        @click.native="goUrlR('confirmationOrderDownLoad',item)">
                         {{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
                       <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
                       </el-dropdown-item>
@@ -1559,16 +1559,24 @@
         });
       },
       goUrlR(path, TCID, ConfigId, cityId) {
+         var cityId = item.StartCityID;
+        if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
+          cityId = item.UnionCityId;
+        }
+        if (item.FeatureType == 8) {
+          //path = 'confirmationOrderDownLoadNew'
+        }
         let routeData = this.$router.resolve({
           name: path,
           query: {
-            configId: ConfigId,
+            configId: item.ID,
             cityId: cityId,
-            tcid: TCID,
+            tcid: item.TCID,
             orderId: 0,
             vshowL: false,
             vshowM: false,
             vshowTCNUM: true,
+            isClick: 1 //不计算点击
           }
         });
         window.open(routeData.href, "_blank");

src/components/activity/FreelineManagement.vue

@@ -521,33 +521,6 @@
               <div class="el-col">
                 <div class="d7">
                   <el-button @click.native='Delete(item)' type="primary" style="background:#00C6FF; border-color:#00C6FF">删除</el-button>
-                  <!--<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary" style="background:#00C6FF; border-color:#00C6FF">报名清单</el-button>
-                   <el-dropdown trigger="click" style="margin-bottom:5px;">
-                    <span class="el-dropdown-link">修改
-                      <i class="el-icon-arrow-down el-icon--right"></i>
-                    </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
-                      <el-dropdown-item @click.native="goToOpenTravel('TravelManager3',item.ID,0)">系列团修改</el-dropdown-item>
-                      <el-dropdown-item @click.native="goToOpenTravel('TravelManager3',item.ID,item.TCID)">当团修改</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
-                  <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}</el-button>
-                  <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">OP备注</el-button>
-                  <el-dropdown trigger="click">
-                    <span class="el-dropdown-link">更多操作
-                      <i class="el-icon-arrow-down el-icon--right"></i>
-                    </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
-                      <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">团队收支明细</el-dropdown-item>
-                      <el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item.TCID,item.ID,item.StartCityID)">行程下载</el-dropdown-item>
-                      <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item>
-                      <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">上架</el-dropdown-item>
-                      <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架</el-dropdown-item>
-                      <el-dropdown-item @click.native="goB2B(item.ConfigId)">B2B预览</el-dropdown-item>
-                      <el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>分销联运</el-dropdown-item>
-                      <el-dropdown-item @click.native='ckSellPoint(item)'>本团卖点</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown> -->
                 </div>
               </div>
             </div>

src/components/commonPage/TripDownLoadCommon.vue

@@ -164,7 +164,8 @@
     props: ["tripObj", "downType"],
     data() {
       return {
-        TripLayer: {}
+        TripLayer: {},
+        TripPath: "confirmationOrderDownLoad"
       };
     },
     methods: {
@@ -200,7 +201,7 @@
           isopOperation: obj.isopOperation,
         };
         let routeData = this.$router.resolve({
-          name: "confirmationOrderDownLoad",
+          name: this.TripPath,
           query: downMsg
         })
         window.open(routeData.href, '_blank');
@@ -208,11 +209,13 @@
       },
       getFeatureType() {
         var postMsg = {
-          TCID: this.tripObj
+          TCID: this.tripObj.tcid
         }
         this.apipost('travel_get_GetTravelFeatureType', postMsg, res => {
           if (res.data.resultCode == 1) {
-            console.log("travel_get_GetTravelFeatureType",res);
+            if (res.data.data == 8) {
+             // this.TripPath = "confirmationOrderDownLoadNew";
+            }
           }
         }, err => {})
       }
@@ -242,6 +245,15 @@
         this.TripLayer.vshowLLR = false;
       }
       this.TripLayer.vshowO = false;
+    },
+    watch: {
+      tripObj: {
+        //深度监听，可监听到对象、数组的变化
+        handler: function (val, oldVal) {
+          this.getFeatureType();
+        },
+        deep: true
+      },
     }
   };