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

src/components/FinancialModule/BasicDocuments.vue

@@ -1696,8 +1696,9 @@ export default {
             }, err => {})
         },
         AuditOrRefund(){  // 保存
-        // console.log("保存")
         let that=this;
+        that.benMoney=Math.round(that.benMoney * 100) / 100;
+         
         if(that.Ststus==1){
             if(this.AuditOrRefundMsg.Status=='5'){
                 if(that.GetDetail.AccountNumber.indexOf("东航平台")!=-1){
@@ -1706,13 +1707,13 @@ export default {
                         return;
                     }else{
                         if(this.allMoney>parseFloat(that.benMoney) + 5 || this.allMoney<parseFloat(that.benMoney) - 5){
-                            this.Error("请检查实付金额！")
+                            this.Error("请检查实付金额是否在范围内！")
                             return;
                         }
                     }
                 }else{
                     if(this.allMoney!=parseFloat(that.benMoney)){
-                        this.Error("请检查实付金额！")
+                        this.Error("请检查金额是否一致！")
                         return;
                     }
                 }

src/components/TravelManager/TravelList/SaleTripList.vue

@@ -92,7 +92,7 @@
               </div>
               <div class="el-col">
                 <div class="d7">
-                  <el-button v-if="item.CreateBy==CurrentUserId" @click="goToOpenTravel('TravelManager3',item.ID)" type="primary">行程修改</el-button>
+                  <el-button v-if="item.CreateBy==CurrentUserId" @click="goToOpenTravel('TravelManager5',item.ID)" type="primary">行程修改</el-button>
                   <el-button @click="copyTravelInfo(item.ID)" type="primary">行程复制</el-button>
                   <el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">删除</el-button>
                 </div>

src/components/activity/Rotationchart.vue

@@ -155,6 +155,7 @@
                 <el-option label="签证" :value="2"></el-option>
                 <el-option label="机票" :value="3"></el-option>
                 <el-option label="自由行" :value="4"></el-option>
+                <el-option label="当地游" :value="5"></el-option>
             </el-select>
         </el-form-item>
         <el-form-item>
@@ -232,6 +233,7 @@
                     <el-option label="签证" :value="2"></el-option>
                     <el-option label="机票" :value="3"></el-option>
                     <el-option label="自由行" :value="4"></el-option>
+                    <el-option label="当地游" :value="5"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="排序">

src/components/busManagement/busHandBook.vue

@@ -23,27 +23,37 @@
 </style>
 <template>
   <div>
-    <table border="0" cellspacing="1" cellpadding="0" class="busManagerTalbe" style="width: 100%;">
+    <table border="0" cellspacing="1" cellpadding="0" class="busManagerTalbe" style="width: 100%;" v-loading='loading'>
       <tr>
         <td colspan="6">印象ｼﾞｬﾊﾟﾝバス手配依頼書</td>
       </tr>
       <tr>
         <td class="commonBackColor">団　體　名：</td>
-        <td colspan="5" class="comTextAlign">HP20190428A1</td>
+        <td colspan="5" class="comTextAlign">
+          <el-input type="text" v-model="DataObj.TeamNum" />
+        </td>
       </tr>
       <tr>
         <td class="commonBackColor">ガイド名前：</td>
-        <td class="comTextAlign">张三丰</td>
+        <td class="comTextAlign">
+          <el-input type="text" v-model="DataObj.GuideName" />
+        </td>
         <td class="commonBackColor">攜帯番號：</td>
-        <td colspan="3" class="comTextAlign">123456789</td>
+        <td colspan="3" class="comTextAlign">
+          <el-input type="text" v-model="DataObj.GuideTel" />
+        </td>
       </tr>
       <tr>
         <td class="commonBackColor">人　　 數：</td>
-        <td colspan="5" class="comTextAlign">25+1</td>
+        <td colspan="5" class="comTextAlign">
+          <el-input type="text" v-model="DataObj.PeopleNum" />
+        </td>
       </tr>
       <tr>
         <td class="commonBackColor">バス　種類：</td>
-        <td colspan="5" class="comTextAlign">1</td>
+        <td colspan="5" class="comTextAlign">
+          <el-input type="text" v-model="DataObj.BusType" />
+        </td>
       </tr>
       <tr>
         <td class="commonBackColor">スケジュール：</td>
@@ -57,17 +67,31 @@
         <td class="commonBackColor">ホテル</td>
         <td class="commonBackColor">ホテルTEL</td>
       </tr>
-      <tr>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
+      <tr v-for="subItem in DataObj.Details_Extends">
+        <td>
+          {{subItem.UseDate}}
+        </td>
+        <td>
+          <el-input type="text" v-model="subItem.BusType" />
+        </td>
+        <td>
+          <el-input type="text" v-model="subItem.FlightNum" />
+        </td>
+        <td>
+          <el-input type="text" v-model="subItem.BusContent" />
+        </td>
+        <td>
+          <el-input type="text" v-model="subItem.HotelName" />
+        </td>
+        <td>
+          <el-input type="text" v-model="subItem.HotelTel" />
+        </td>
       </tr>
       <tr>
         <td>備考欄：</td>
-        <td colspan="5" class="comTextAlign">04/28日接机+0天+05/04日东京成田国际机场送机，订房号：HP20190428A1</td>
+        <td colspan="5" class="comTextAlign">
+          <el-input type="text" v-model="DataObj.Remarks" />
+        </td>
       </tr>
       <tr>
         <td colspan="6" class="comTextAlign">*迎えや送りは必要・不要となることは、必ず標記してください。</td>
@@ -79,7 +103,7 @@
         <tr>
           <td colspan="6">
             <input type="button" class="normalBtn" @click="SaveData()" value="保存" />
-            <input type="button" class="normalBtn" @click="DownLoadFile('','')" value="下载" />
+            <input type="button" class="normalBtn" @click="DownLoadFile()" value="下载" />
           </td>
         </tr>
       </tfoot>
@@ -92,37 +116,64 @@
     data() {
       return {
         loading: false,
-        DataObj: {},
-        TCIDS:""
+        DataObj: {
+          Id: 0,
+          TCIDS: "",
+          TeamNum: "",
+          GuideName: "",
+          GuideTel: "",
+          PeopleNum: "",
+          BusType: "",
+          DayNight: "",
+          Remarks: "",
+          Details_Extends: []
+        },
+        TCIDS: ""
       }
-
     },
     methods: {
-      DownLoadFile(item, NewCombinationNum) {
+      DownLoadFile(item) {
         let msg = {
-          TCIDS: item.TCIDS
+          TCIDS: this.TCIDS
         };
-        this.GetLocalFile("bus_get_NewDownLoadBusConfig", msg, "バス手配依頼書" + NewCombinationNum + ".xls");
+        this.loading = true;
+        var fileName = "バス手配依頼書" + this.DataObj.TeamNum + ".xls";
+        this.GetLocalFile("bus_get_DownLoadBusConfig", msg,fileName,
+          res => {
+            this.loading = false;
+          });
       },
-
       GetData() {
-        this.apipost('bus_Get_GetBusDownLoadData', {TCIDs:this.TCIDS}, res => {
-          console.log("res",res);
+        this.loading = true;
+        this.apipost('bus_Get_GetBusDownLoadData', {
+          TCIDs: this.TCIDS
+        }, res => {
+          this.loading = false;
           if (res.data.resultCode == 1) {
+            this.DataObj = res.data.data;
 
           } else {
             this.Error(res.data.message);
           }
         }, err => {})
       },
-      SaveData()
-      {
-
+      SaveData() {
+        this.DataObj.TCIDS = this.TCIDS;
+        this.apipost('bus_Post_SaveBusDownLoadData', this.DataObj, res => {
+          if (res.data.resultCode == 1) {
+            this.Success("操作成功");
+            this.GetData();
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {})
       }
     },
     mounted() {
-      this.TCIDS = this.$route.query.TCID;
+      //this.TCIDS = this.$route.query.TCID;
+      this.TCIDS = "2126,2405";
       this.GetData();
     },
   }
+
 </script>

src/components/newTravelmanager/oldTravelGroupControl/TravelMap.vue

+<style>
+  .markers_labels{
+    margin-left: -24px !important;
+    margin-top: -43px !important;
+  }
+  .gm-svpc,.gm-style-mtc,.gm-style-cc{
+    display: none;
+  }
+</style>
+
+<template>
+    <div >
+      <div id="map_canvas" style="height: 400px; width: 100%"></div>
+    </div>
+</template>
+<script>
+    export default {
+      props:["dataList"],
+        name: 'GGMap',
+      data(){
+          return{
+            show:false,
+            directionsService: new google.maps.DirectionsService(),
+            directionsDisplay: new google.maps.DirectionsRenderer(),
+            map:{},
+          }
+      },
+      created(){
+       
+      },
+      destroyed: function() {
+
+      },
+      mounted(){
+      this.mapBuild() //初始化实例之后调用
+      },
+      methods:{
+        getDetailsRoutes(source,destination,map){
+          service = new google.maps.DistanceMatrixService();
+          service.getDistanceMatrix({
+              origins: [source],
+              destinations: [destination],
+              travelMode: google.maps.TravelMode.DRIVING,
+              unitSystem: google.maps.UnitSystem.METRIC,
+              avoidHighways: false,
+              avoidTolls: false
+          }, function (response, status) {
+              if (status == google.maps.DistanceMatrixStatus.OK && response.rows[0].elements[0].status != "ZERO_RESULTS") {
+                  var distance = response.rows[0].elements[0].distance.text;
+                  var duration = response.rows[0].elements[0].duration.text;
+                  var dvDistance = document.getElementById("siteinfo_modal_label");
+                  dvDistance.innerHTML = "";
+                  dvDistance.innerHTML += "Distance: " + distance + "<br />";
+                  dvDistance.innerHTML += "Duration:" + duration;
+
+              } else {
+                  alert("Unable to find the distance via road.");
+              }
+          })
+        },
+        //  地图实例
+        mapBuild(){
+          console.log(this.dataList)
+          let lat = parseFloat(this.dataList[0].lat)
+          let lng = parseFloat(this.dataList[0].lng)
+          let center = {lng: lng, lat: lat}
+            //创建地图实例，zoom是缩放比例
+          this.map = new google.maps.Map(document.getElementById('map_canvas'), {
+            zoom: 7,
+            center: center,
+            mapTypeId: google.maps.MapTypeId.ROADMAP
+          });
+          // var polyOptions = {
+          //     strokeColor: 'red',    // 颜色
+          //     strokeOpacity: 1.0,    // 透明度
+          //     strokeWeight: 2    // 宽度
+          // }
+          // let poly = new google.maps.Polyline(polyOptions);
+          // poly.setMap(map);    // 装载
+            // 遍历循环创建标记
+          // this.dataList.map(item=>{
+          //   // let lat = parseFloat(item.lat)
+          //   // let lng = parseFloat(item.lng)
+          //   // var path = poly.getPath();    //获取线条的坐标
+          //   // path.push(new google.maps.LatLng(lat, lng));
+          //   let marker = new MarkerWithLabel({
+          //     position: {lat:lat,lng:lng},
+          //     // icon: '../../../static/img/qishou.png', //标记自定义图标
+          //     draggable: false, //不可拖动
+          //     map: map,   //地图实例 
+          //     // labelContent: item.name,    //label的内容
+          //     labelAnchor: new google.maps.Point(22, 100),    //label的位置，可以调
+          //     // labelClass: "markers_labels", // the CSS class for the label
+          //     // labelStyle: { background:'#fff',padding:'5px' }
+          //   });
+          //   //自定义信息窗口
+          //   let iw = new google.maps.InfoWindow({
+          //     content: `<div>
+          //                 <p>景点名称：${item.name}</p>
+          //               </div>`});
+          //   //点击信息窗口显示
+          //   google.maps.event.addListener(marker, "click", function (e) { iw.open(map, marker); });
+          // })
+          this.directionsDisplay.setMap(this.map);
+          this.calcRoute()
+        },
+        calcRoute: function() {   // 创建路径规划
+          //  分解数据  获得起 止 以及中间数据
+          let lat = parseFloat(this.dataList[0].lat)
+          let lng = parseFloat(this.dataList[0].lng)
+          let elat = parseFloat(this.dataList[this.dataList.length-1].lat)
+          let elng = parseFloat(this.dataList[this.dataList.length-1].lng)
+          let _this = this;
+          let start = lat + ',' + lng;
+          let end = elat + ',' + elng;
+          let waypoints = [];
+          if (this.dataList.length > 2) {
+            this.dataList.forEach((x, index) => {
+              if (index >= 1 && index !== (this.dataList.length-1)) {
+                let obj = {
+                  location: x.lat + ',' + x.lng
+                }
+                waypoints.push(obj)
+              }
+            });
+          }
+          let request = {  // 组装连线数据
+            origin:start,  // 起
+            destination:end,  // 止
+            travelMode: google.maps.TravelMode.DRIVING,
+            // waypoints: [{location:"30.5226477,104.05806469999993"},{location:"30.67416759999999,104.04721970000003"}]  // 中间点数据
+          };
+          if (waypoints.length > 0) {
+            request.waypoints = waypoints
+          }
+          console.log(waypoints)
+          _this.directionsService.route(request, function(result, status) {
+            if (status == google.maps.DirectionsStatus.OK) {
+              _this.directionsDisplay.setDirections(result);
+            }
+          });
+        },
+      },
+    }
+</script>
+

src/router/config.js

@@ -3239,6 +3239,14 @@ export default {
                                 title: '会员特权'
                             }
                         },
+                        {
+                            path: '/LocaltourMan',
+                            name: 'LocaltourMan',
+                            component: resolve => require(['@/components/activity/LocaltourMan'], resolve),
+                            meta: {
+                                title: '当地游'
+                            }
+                        },
                     ]
                 },
                 {