页面修改

src/components/index.vue

@@ -214,8 +214,7 @@
                   CRM系统
                   <i class="iconfont icon-right1"></i>
                 </el-dropdown-item>
-                <el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true"
-                v-if="userInfo&&userInfo.DepartName&&userInfo.DepartName.indexOf('操作部')!=-1 ||(userInfo.RB_Branch_id == 1245
+                <el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true" v-if="userInfo&&userInfo.DepartName&&userInfo.DepartName.indexOf('操作部')!=-1 ||(userInfo.RB_Branch_id == 1245
                 && userInfo.DepartName.indexOf('引流')==-1
                 && userInfo.DepartName.indexOf('市场')==-1)">
                   <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
@@ -1196,8 +1195,8 @@
     <!-- 投票 -->
     <Voting v-show="VotingShow" :NowVoteData="NowVoteData" :NowVoteType="NowVoteType"></Voting>
     <!-- 机票未绑团提示 -->
-    <unbundlingMessage v-if="unbundlingVisible"
-    :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"></unbundlingMessage>
+    <unbundlingMessage v-if="unbundlingVisible" :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false">
+    </unbundlingMessage>
   </div>
 </template>
 
@@ -1236,7 +1235,7 @@
     data() {
       return {
         UnboundDate: {},
-        unbundlingVisible: false,//未绑团提醒
+        unbundlingVisible: false, //未绑团提醒
         b2bDomain: "",
         useRed: false,
         //提成账单弹窗
@@ -1841,17 +1840,17 @@
       this.GetSupperOrderEditAuth();
 
       // 获取未绑定团的数据
-      if(!localStorage.getItem("UnboundDateTime")||
-      (localStorage.getItem("UnboundDateTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
+      if (!localStorage.getItem("UnboundDateTime") ||
+        (localStorage.getItem("UnboundDateTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))) {
         this.GetTravelAirNotBind()
-      }else{
-        if(localStorage.getItem("UnboundDate")){
-          if(this.userInfo.DepartName.indexOf("操作部")!=-1 ||
-            (this.userInfo.RB_Branch_id == 1245
-            && this.userInfo.DepartName.indexOf("引流")==-1
-            && this.userInfo.DepartName.indexOf("市场")==-1)){
+      } else {
+        if (localStorage.getItem("UnboundDate")) {
+          if (this.userInfo.DepartName.indexOf("操作部") != -1 ||
+            (this.userInfo.RB_Branch_id == 1245 &&
+              this.userInfo.DepartName.indexOf("引流") == -1 &&
+              this.userInfo.DepartName.indexOf("市场") == -1)) {
             this.UnboundDate = JSON.parse(localStorage.getItem("UnboundDate"))
-          }else{
+          } else {
             localStorage.removeItem("UnboundDate");
             localStorage.removeItem("UnboundDateTime");
           }
@@ -1894,18 +1893,18 @@
     },
     methods: {
       // 获取未绑定团的数据
-      GetTravelAirNotBind(){
+      GetTravelAirNotBind() {
         this.UnboundDate = {}
-        if(this.userInfo.DepartName.indexOf("操作部")!=-1 ||
-        (this.userInfo.RB_Branch_id == 1245
-        && this.userInfo.DepartName.indexOf("引流")==-1
-        && this.userInfo.DepartName.indexOf("市场")==-1)){
+        if (this.userInfo.DepartName.indexOf("操作部") != -1 ||
+          (this.userInfo.RB_Branch_id == 1245 &&
+            this.userInfo.DepartName.indexOf("引流") == -1 &&
+            this.userInfo.DepartName.indexOf("市场") == -1)) {
           this.apipost(
             "opcommission_GetTravelAirNotBind", {},
             res => {
-              if(res.data.resultCode==1){
-                if((res.data.data.TravelList&&res.data.data.TravelList.length>0)
-                ||(res.data.data.AirList&&res.data.data.AirList.length>0)){
+              if (res.data.resultCode == 1) {
+                if ((res.data.data.TravelList && res.data.data.TravelList.length > 0) ||
+                  (res.data.data.AirList && res.data.data.AirList.length > 0)) {
                   localStorage.setItem("UnboundDate", JSON.stringify(res.data.data));
                   localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
                   this.UnboundDate = res.data.data
@@ -1917,7 +1916,7 @@
         }
       },
       testApi() {
-       var postMsg = {};
+        var postMsg = {};
         var cmd = "";
         cmd = "AirTicket_get_GetTicketProduct";
         postMsg = {
@@ -1938,7 +1937,7 @@
       //测试方法
       testEmp() {
         var postMsg = {
-          EmPassword: "jj+n0yVvDg2xM3nxu2v1oA=="
+          EmPassword: "ae0ZVCcnM88kZ349OxsCAA=="
         };
         this.apipost(
           "admin_get_AnalysisPassword", postMsg,

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -220,6 +220,7 @@
           TripCountryList: [], //行程国家
           TripCityList: [], //行程城市
           TripMapList: [],
+          NotQueryCityList:[],//使用系统中的经纬度城市
         },
         //行程
         FeatureData: {
@@ -878,6 +879,7 @@
                 this.PostConfig.TripCountryList = tempData.TripCountryList;
                 this.PostConfig.TripCityList = tempData.TripCityList;
                 this.PostConfig.TripMapList = tempData.TripMapList;
+                this.PostConfig.NotQueryCityList=tempData.NotQueryCityList;
                 this.PostConfig.MapUrl = tempData.MapUrl;
                 let arrList = function (list) {
                   list.forEach(x => {

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -399,11 +399,11 @@
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
                   class="other-month">{{dayobject.day.getDate()}}</span>
                 <!---->
-                <span v-if="dayobject.checkState==$calendarUtils.checkState.checked"
-                  class="checked1" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
                 <!---->
-                <span
-                  v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
               </li>
             </ul>
           </div>
@@ -1491,7 +1491,8 @@
           QFlightDateEnd: this.QFlightDateEnd,
           CreateBy: createBy,
           AirTicketId: this.priceData.AirTicketId,
-          TCID: this.priceData.TCID
+          TCID: this.priceData.TCID,
+          LineId: this.PostConfig.LineId
         };
 
         let that = this;
@@ -1994,7 +1995,7 @@
         this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
             if (res.data.resultCode == 1) {
               this.TeamListArr = res.data.data;
-     
+
             } else {
               this.Error(res.data.message);
             }

src/components/newTravelmanager/TravelGroupControl/tripmap.vue

@@ -98,7 +98,6 @@
         deviceMarkers: [], //城市Markers
         allMapCityList: [], //地图显示所有城市
         countriesMarkers: [], //国家的Markers
-
         chooseCountry: [], //选中的国家
         chooseCity: [], //选中的城市
       };
@@ -481,7 +480,6 @@
               filter: ["==", "NAME_ZH", x.name]
             });
           }
-
           if (x.MId != 651 && x.MId != 891) {
             that.ClearSource("mapLayer-" + x.MId, 1)
             that.ClearSource("mapLayerId-" + x.MId, 1)
@@ -570,12 +568,17 @@
       async calcCitiesGeoInfoHandler() {
         await Promise.all(
           this.citiesData.map(async cityItem => {
-            var cityPosition = await this.getCityCoordinates(cityItem);
-            if (cityPosition && cityPosition.length == 2) {
-              cityItem.longitude = cityPosition[0];
-              cityItem.Lng = cityPosition[0];
-              cityItem.Lat = cityPosition[1];
-              cityItem.latitude = cityPosition[1];
+            var isNotQueryCity = this.PostConfig.NotQueryCityList.find(cItem => {
+              return cItem === cityItem.MId;
+            });
+            if (!isNotQueryCity) {
+              var cityPosition = await this.getCityCoordinates(cityItem);
+              if (cityPosition && cityPosition.length == 2) {
+                cityItem.longitude = cityPosition[0];
+                cityItem.Lng = cityPosition[0];
+                cityItem.Lat = cityPosition[1];
+                cityItem.latitude = cityPosition[1];
+              }
             }
           })
         );