Skip to content

S
SuperMan
Commit 4a4f7327 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents bc176b4e f07c0ce5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2830 additions and 2805 deletions
config/index.js
View file @ 4a4f7327
...@@ -9,94 +9,10 @@ module.exports = { ...@@ -9,94 +9,10 @@ module.exports = {
assetsSubDirectory: `static`, assetsSubDirectory: `static`,
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: { proxyTable: {
// '/boundsearch': { // 矩形区域检索entity
// target: 'http://yingyan.baidu.com/api/v3/entity/boundsearch',
// changeOrigin: true,
// pathRewrite: {
// '^/boundsearch': ''
// }
// },
// '/getdistance': { // 获取track的distance
// target: 'http://yingyan.baidu.com/api/v3/track/getdistance',
// changeOrigin: true,
// pathRewrite: {
// '^/getdistance': ''
// }
// },
// '/api': { // 获取track信息
// target: 'http://yingyan.baidu.com/api/v3/track/gettrack',
// changeOrigin: true,
// pathRewrite: {
// '^/api': ''
// }
// },
// '/listcolumn': { // 获取自定义字段列表
// target: 'http://yingyan.baidu.com/api/v3/entity/listcolumn',
// changeOrigin: true,
// pathRewrite: {
// '^/listcolumn': ''
// }
// },
// '/getAddress': { // 经纬度解析
// target: 'http://api.map.baidu.com/geocoder/v2/',
// changeOrigin: true,
// pathRewrite: {
// '^/getAddress': ''
// }
// },
// '/searchEntity': { // 通过新的search接口获取数据，包括所有entity、模糊搜索entity、在线entity、离线entity
// target: 'http://yingyan.baidu.com/api/v3/entity/search',
// changeOrigin: true,
// pathRewrite: {
// '^/searchEntity': ''
// }
// },
// '/trackList': { // 获取track列表
// target: 'http://yingyan.baidu.com/api/v2/track/gethistory',
// changeOrigin: true,
// pathRewrite: {
// '^/trackList': ''
// }
// },
// '/getstaypoint': { // 获取停留点
// target: 'http://yingyan.baidu.com/api/v2/analysis/staypoint',
// changeOrigin: true,
// pathRewrite: {
// '^/getstaypoint': ''
// }
// },
// '/getBehaviorAnalysis': { // 获取驾驶行为分析信息
// target: 'http://yingyan.baidu.com/api/v2/analysis/drivingbehavior',
// changeOrigin: true,
// pathRewrite: {
// '^/getBehaviorAnalysis': ''
// }
// },
}, },
// // 矩形区域检索entity
// boundsearchEntity: '//yingyan.baidu.com/api/v3/entity/boundsearch',
// // 获取track的distance
// getDistance: '//yingyan.baidu.com/api/v3/track/getdistance',
// // 获取track信息
// getTrack: '//yingyan.baidu.com/api/v3/track/gettrack',
// // 获取自定义字段列表
// columnsList: '//yingyan.baidu.com/api/v3/entity/listcolumn',
//
// // 经纬度解析
// getAddress: '//api.map.baidu.com/geocoder/v2/',
// // 通过新的search接口获取数据，包括所有entity、模糊搜索entity、在线entity、离线entity
// searchEntity: '//yingyan.baidu.com/api/v3/entity/search',
// // 获取track列表
// trackList: '//yingyan.baidu.com/api/v2/track/gethistory',
// // 获取停留点
// getstaypoint: '//yingyan.baidu.com/api/v2/analysis/staypoint',
// // 获取驾驶行为分析信息
// getBehaviorAnalysis: '//yingyan.baidu.com/api/v2/analysis/drivingbehavior',
// Various Dev Server settings // Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST host: 'localhost', // can be overwritten by process.env.HOST
......
index.html
View file @ 4a4f7327
...@@ -8,24 +8,21 @@ ...@@ -8,24 +8,21 @@
<meta http-equiv="Pragma" content="no-cache"> <meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-cache, must-revalidate, no-store"> <meta http-equiv="Cache-Control" content="no-cache, must-revalidate, no-store">
<meta http-equiv="Expires" content="0"> <meta http-equiv="Expires" content="0">
<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=L5Qw0GlbbCIMwgR4Uug3ogM40Imkd3CV"></script> <!-- <script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=L5Qw0GlbbCIMwgR4Uug3ogM40Imkd3CV"></script>
<script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"> <script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js">
</script> </script> -->
<script type="text/javascript" src="static/MarkerClusterer.js"></script> <script type="text/javascript" src="static/MarkerClusterer.js"></script>
<script type="text/javascript" src="static/CurveLine.min.js"></script> <script type="text/javascript" src="static/CurveLine.min.js"></script>
<link href="https://api.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.css" rel="stylesheet"> <link href="https://api.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.css" rel="stylesheet">
<script src="https://api.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.js"></script> <script src="https://api.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.js"></script>
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=OV7BZ-ZT3HP-6W3DE-LKHM3-RSYRV-ULFZV"></script> <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=OV7BZ-ZT3HP-6W3DE-LKHM3-RSYRV-ULFZV"></script>
<script type="text/javascript"
src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OBd2bhrqKUSbQGpniCZ996suti9YG7Bc"></script> <!-- <script type="text/javascript"
src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OBd2bhrqKUSbQGpniCZ996suti9YG7Bc"></script> -->
<!--HK 2024-08-15 新加(避免提示为商用授权) Start--> <!--HK 2024-08-15 新加(避免提示为商用授权) Start-->
<script type="text/javascript" src="//api.map.baidu.com/api?key=&v=1.1&services=true&s=1"></script> <!-- <script type="text/javascript" src="//api.map.baidu.com/api?key=&v=1.1&services=true&s=1"></script>
<script type="text/javascript" src="https://api.map.baidu.com/getscript?v=2.0&ak=&services=&t=20240731110958"></script> <script type="text/javascript" src="https://api.map.baidu.com/getscript?v=2.0&ak=&services=&t=20240731110958"></script>
<!--
<script charset="utf8" src="https://dlswbr.baidu.com/heicha/mw/abclite-2063-s.original.js?_=9975"></script>
<script type="text/javascript" src="https://api.map.baidu.com/getscript?v=1.1&ak=&services=true&t=20130716024058"></script>
<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&s=1"></script>
--> -->
<!--HK 2024-08-15 新加 End --> <!--HK 2024-08-15 新加 End -->
<script src="/static/UE/ueditor.config.js"></script> <script src="/static/UE/ueditor.config.js"></script>
......
src/assets/utils/BMap.js
View file @ 4a4f7327
...@@ -3,11 +3,11 @@ export function MP(ak) { ...@@ -3,11 +3,11 @@ export function MP(ak) {
window.onload = function () { window.onload = function () {
resolve(BMap) resolve(BMap)
} }
var script = document.createElement("script"); // var script = document.createElement("script");
script.type = "text/javascript"; // script.type = "text/javascript";
script.src = "http://api.map.baidu.com/api?v=2.0&ak="+ak; // script.src = "http://api.map.baidu.com/api?v=2.0&ak="+ak;
script.onerror = reject; // script.onerror = reject;
document.head.appendChild(script); // document.head.appendChild(script);
}) })
} }
\ No newline at end of file
src/components/DomesticTravelcontract.vue
View file @ 4a4f7327
...@@ -896,7 +896,7 @@ ...@@ -896,7 +896,7 @@
<table class="TcTravel_Table"> <table class="TcTravel_Table">
<tbody> <tbody>
<tr> <tr>
<td colspan="5" contenteditable="true">组团社：印象之旅</td> <td colspan="5" contenteditable="true">组团社：四川和平国际旅行社有限公司</td>
</tr> </tr>
<tr> <tr>
<td colspan="5" contenteditable="true"> <td colspan="5" contenteditable="true">
...@@ -928,10 +928,7 @@ ...@@ -928,10 +928,7 @@
<tr> <tr>
<td colspan="5"> <td colspan="5">
<div style="display: flex"> <div style="display: flex">
<span>地接社名称：</span> <span>地接社名称：四川和平国际旅行社有限公司</span>
<div contenteditable="true" style="width: 250px">
株式会社 ピースインターナショナル
</div>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -1335,7 +1332,7 @@ ...@@ -1335,7 +1332,7 @@
TravelAgency_PostNum: "", TravelAgency_PostNum: "",
TravelAgency_Email: "", TravelAgency_Email: "",
TravelAgency_Scope: "出境游/境内游", //旅行社经营范围 TravelAgency_Scope: "出境游/境内游", //旅行社经营范围
TravelAgency_SignAddress: "", TravelAgency_SignAddress: "成都",
Guide_Name: "", Guide_Name: "",
Guide_Num: "", Guide_Num: "",
Guide_Tel: "", Guide_Tel: "",
...@@ -1558,10 +1555,13 @@ ...@@ -1558,10 +1555,13 @@
this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司"; this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 "; this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 ";
this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015"; this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015";
this.CtObj.TravelAgency_Tel = "028-81454056";
} else if (this.CtObj.SignType == 2) { } else if (this.CtObj.SignType == 2) {
this.CtObj.TravelAgency_Name = "成都欧亚旅行社有限公司"; this.CtObj.TravelAgency_Name = "成都欧亚旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市金牛区营门口路48号1栋3单元16楼1601"; this.CtObj.TravelAgency_Address = "成都市金牛区营门口路48号1栋3单元16楼1601";
this.CtObj.TravelAgency_LicenseNum = "L-SC-A00289"; this.CtObj.TravelAgency_LicenseNum = "L-SC-A00289";
this.CtObj.TravelAgency_Tel = "";
} }
}, },
//点击切换行程 //点击切换行程
...@@ -1769,12 +1769,18 @@ ...@@ -1769,12 +1769,18 @@
tempObj.Tourists_EmergencyLinkTel; tempObj.Tourists_EmergencyLinkTel;
this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan; this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan;
this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum; this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum;
this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel;
this.CtObj.TravelAgency_Fax = tempObj.TravelAgency_Fax; this.CtObj.TravelAgency_Fax = tempObj.TravelAgency_Fax;
this.CtObj.TravelAgency_PostNum = tempObj.TravelAgency_PostNum; this.CtObj.TravelAgency_PostNum = tempObj.TravelAgency_PostNum;
this.CtObj.TravelAgency_Email = tempObj.TravelAgency_Email; this.CtObj.TravelAgency_Email = tempObj.TravelAgency_Email;
this.CtObj.TravelAgency_SignAddress = if (this.CtObj.ID == 0) {
tempObj.TravelAgency_SignAddress; this.CtObj.TravelAgency_SignAddress = "四川成都";
this.CtObj.TravelAgency_Tel = "028-81454056";
} else {
this.CtObj.TravelAgency_SignAddress = tempObj.TravelAgency_SignAddress;
this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel;
}
this.CtObj.Guide_Name = tempObj.Guide_Name; this.CtObj.Guide_Name = tempObj.Guide_Name;
this.CtObj.Guide_Num = tempObj.Guide_Num; this.CtObj.Guide_Num = tempObj.Guide_Num;
this.CtObj.Guide_Tel = tempObj.Guide_Tel; this.CtObj.Guide_Tel = tempObj.Guide_Tel;
...@@ -1823,11 +1829,21 @@ ...@@ -1823,11 +1829,21 @@
this.CtObj.C_IncludeRemark = tempObj.C_IncludeRemark; this.CtObj.C_IncludeRemark = tempObj.C_IncludeRemark;
this.CtObj.C_IncludeFee = tempObj.C_IncludeFee; this.CtObj.C_IncludeFee = tempObj.C_IncludeFee;
this.CtObj.C_NonIncludeRemark = tempObj.C_NonIncludeRemark; this.CtObj.C_NonIncludeRemark = tempObj.C_NonIncludeRemark;
this.CtObj.TravelAgency_ServiceTel = if (this.CtObj.ID == 0) {
tempObj.TravelAgency_ServiceTel; this.CtObj.TravelAgency_ServiceTel = "17708046437";
this.CtObj.C_ComplaintProvince = tempObj.C_ComplaintProvince; this.CtObj.C_ComplaintTel = "028-12345";
this.CtObj.C_ComplaintCity = tempObj.C_ComplaintCity; this.CtObj.TravelAgency_Tel = "028-81454056";
this.CtObj.C_ComplaintTel = tempObj.C_ComplaintTel; this.CtObj.C_ComplaintProvince = "四川省";
this.CtObj.C_ComplaintCity = "成都市";
} else {
this.CtObj.TravelAgency_ServiceTel = tempObj.TravelAgency_ServiceTel;
this.CtObj.C_ComplaintTel = tempObj.C_ComplaintTel;
this.CtObj.TravelAgency_Tel = tempObj.C_ComplaintTel;
this.CtObj.C_ComplaintProvince = tempObj.C_ComplaintProvince;
this.CtObj.C_ComplaintCity = tempObj.C_ComplaintCity;
}
this.CtObj.C_ComplaintEmail = tempObj.C_ComplaintEmail; this.CtObj.C_ComplaintEmail = tempObj.C_ComplaintEmail;
this.CtObj.C_ComplaintAddress = tempObj.C_ComplaintAddress; this.CtObj.C_ComplaintAddress = tempObj.C_ComplaintAddress;
this.CtObj.C_ComplaintPostNum = tempObj.C_ComplaintPostNum; this.CtObj.C_ComplaintPostNum = tempObj.C_ComplaintPostNum;
......
src/components/Hotel/DiDa/HotelDetails.vue
View file @ 4a4f7327
...@@ -1296,13 +1296,13 @@ ...@@ -1296,13 +1296,13 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempObj = res.data.data; var tempObj = res.data.data;
this.DidaHotelDetails = tempObj; this.DidaHotelDetails = tempObj;
this.hotelMapUrl = `http://api.weboss.hk/baidu_map/api.php?prop1=` + this.DidaHotelDetails // this.hotelMapUrl = `http://api.weboss.hk/baidu_map/api.php?prop1=` + this.DidaHotelDetails
.Name_CN + `&prop2=` + this.DidaHotelDetails.Address_CN + `&prop3=` + this.DidaHotelDetails // .Name_CN + `&prop2=` + this.DidaHotelDetails.Address_CN + `&prop3=` + this.DidaHotelDetails
.Longitude + `,` + this.DidaHotelDetails // .Longitude + `,` + this.DidaHotelDetails
.Latitude + `&prop4=100%&prop5=100%`; // .Latitude + `&prop4=100%&prop5=100%`;
this.initMap(this.DidaHotelDetails.Longitude, this.DidaHotelDetails.Latitude, this.DidaHotelDetails // this.initMap(this.DidaHotelDetails.Longitude, this.DidaHotelDetails.Latitude, this.DidaHotelDetails
.Name_CN) // .Name_CN)
if (this.DidaHotelDetails.StarRating) { if (this.DidaHotelDetails.StarRating) {
this.startNum = Math.ceil(this.DidaHotelDetails.StarRating); this.startNum = Math.ceil(this.DidaHotelDetails.StarRating);
} }
...@@ -1442,36 +1442,36 @@ ...@@ -1442,36 +1442,36 @@
} }
}, },
initMap(lng, lat, name) { initMap(lng, lat, name) {
if (this.map) { // if (this.map) {
this.map.clearOverlays() // this.map.clearOverlays()
} // }
var that = this; // var that = this;
this.map = new BMap.Map("mapContainer", { // this.map = new BMap.Map("mapContainer", {
enableMapClick: false, // enableMapClick: false,
minZoom: 3, // minZoom: 3,
maxZoom: 50, // maxZoom: 50,
}) //新建地图实例，enableMapClick:false ：禁用地图默认点击弹框 // }) //新建地图实例，enableMapClick:false ：禁用地图默认点击弹框
var point = new BMap.Point(lng, lat); // var point = new BMap.Point(lng, lat);
this.map.centerAndZoom(new BMap.Point(lng, lat), 15) // this.map.centerAndZoom(new BMap.Point(lng, lat), 15)
this.map.enableScrollWheelZoom(false) // this.map.enableScrollWheelZoom(false)
var marker = new BMap.Marker(point); //标记点 // var marker = new BMap.Marker(point); //标记点
var label = new BMap.Label(name, { // var label = new BMap.Label(name, {
offset: new BMap.Size(0, 28) // offset: new BMap.Size(0, 28)
}); //标签 // }); //标签
label.setStyle({ // label.setStyle({
color: "#FFF", // color: "#FFF",
fontSize: "10px", // fontSize: "10px",
height: "24px", // height: "24px",
lineHeight: "20px", // lineHeight: "20px",
padding: "2px 5px", // padding: "2px 5px",
border: "1px solid rgba(230, 0, 0, 0.7)", // border: "1px solid rgba(230, 0, 0, 0.7)",
background: "rgba(230, 0, 0, 0.7)", // background: "rgba(230, 0, 0, 0.7)",
fontWeight: "bold", // fontWeight: "bold",
transform: 'translateX(-50%)', // transform: 'translateX(-50%)',
fontFamily: "微软雅黑" // fontFamily: "微软雅黑"
}) // })
marker.setLabel(label) // marker.setLabel(label)
this.map.addOverlay(marker); // this.map.addOverlay(marker);
}, },
getAveragePrice(PriceList) { getAveragePrice(PriceList) {
let totelPrice = 0 let totelPrice = 0
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 4a4f7327
...@@ -2359,21 +2359,23 @@ ...@@ -2359,21 +2359,23 @@
isreceive = 1; isreceive = 1;
} }
}); });
console.log("this.CurrencyListMoney",this.CurrencyListMoney);
this.CurrencyListMoney.forEach((cur, i) => { this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr.forEach(lead => { cur.LeaderGetPriceArr.forEach(lead => {
var tempMoney = (cur.money * this.comRate - cur.yiLing); var tempMoney = (cur.money * this.comRate - cur.yiLing);
var tempShowPrice = cur.money * this.comRate; var tempShowPrice = cur.money * this.comRate;
//日本 //日本
if (this.myLineId == 14) { if (this.myLineId == 14) {
tempShowPrice = Math.round(tempShowPrice / 10000) * 10000; tempShowPrice = Math.floor(tempShowPrice / 10000) * 10000;
} else { } else {
tempShowPrice = tempShowPrice; tempShowPrice = tempShowPrice;
} }
//未领取，日本线 *0.95 在精确到万 //未领取，日本线 *0.95 在精确到万
if (isreceive == 0) { if (isreceive == 0) {
if (this.myLineId == 14) { if (this.myLineId == 14) {
lead.LeaderGetPriceT = Math.round(tempMoney / 10000) * 10000; lead.LeaderGetPriceT = Math.floor(tempMoney / 10000) * 10000;
} else { } else {
//其它线路可能不精确到"万" //其它线路可能不精确到"万"
lead.LeaderGetPriceT = tempMoney; lead.LeaderGetPriceT = tempMoney;
...@@ -2382,12 +2384,15 @@ ...@@ -2382,12 +2384,15 @@
//领取过，直接用计划金额(精确到万)-已领取的金额 //领取过，直接用计划金额(精确到万)-已领取的金额
if (this.myLineId == 14) { if (this.myLineId == 14) {
lead.LeaderGetPriceT = tempShowPrice - cur.yiLing; lead.LeaderGetPriceT = tempShowPrice - cur.yiLing;
} else { } else {
lead.LeaderGetPriceT = tempShowPrice - cur.yiLing; lead.LeaderGetPriceT = tempShowPrice - cur.yiLing;
} }
} }
lead.ShowTotalPrice = tempShowPrice; lead.ShowTotalPrice = tempShowPrice;
lead.PlanPrice = cur.money * this.comRate; lead.PlanPrice = cur.money * this.comRate;
}); });
}); });
this.nav = nav; this.nav = nav;
......
src/components/SalesModule/VisitPlanMap.vue
View file @ 4a4f7327
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
div.appendChild(sanjiao); div.appendChild(sanjiao);
var that = this; var that = this;
var arrow = this._arrow = document.createElement("div"); var arrow = this._arrow = document.createElement("div");
arrow.style.background = "url(http://map.baidu.com/fwmap/upload/r/mrep/fwmap/static/house/images/label.png) no-repeat"; //arrow.style.background = "url(http://map.baidu.com/fwmap/upload/r/mrep/fwmap/static/house/images/label.png) no-repeat";
arrow.style.position = "absolute"; arrow.style.position = "absolute";
arrow.style.width = "11px"; arrow.style.width = "11px";
arrow.style.height = "10px"; arrow.style.height = "10px";
......
src/components/SalesModule/VisitRecord.vue
View file @ 4a4f7327
...@@ -166,14 +166,14 @@ export default { ...@@ -166,14 +166,14 @@ export default {
let end_time=start_time+86400 let end_time=start_time+86400
let url='?ak=L5Qw0GlbbCIMwgR4Uug3ogM40Imkd3CV&service_id=203768&entity_name='+this.account+'&start_time='+start_time+'&end_time='+end_time+'&is_processed=1&process_option=need_denoise=1,need_vacuate=1,need_mapmatch=1'; let url='?ak=L5Qw0GlbbCIMwgR4Uug3ogM40Imkd3CV&service_id=203768&entity_name='+this.account+'&start_time='+start_time+'&end_time='+end_time+'&is_processed=1&process_option=need_denoise=1,need_vacuate=1,need_mapmatch=1';
this.$http.get('https://bird.ioliu.cn/v1?url=http://yingyan.baidu.com/api/v3/track/gettrack'+url).then(res=>{ // this.$http.get('https://bird.ioliu.cn/v1?url=http://yingyan.baidu.com/api/v3/track/gettrack'+url).then(res=>{
let xy=res.data.points // let xy=res.data.points
this.Point=[] // this.Point=[]
xy.forEach(x=>{ // xy.forEach(x=>{
this.Point.push({xy:[x.latitude,x.longitude]}) // this.Point.push({xy:[x.latitude,x.longitude]})
}) // })
this.creatMap() // this.creatMap()
}) // })
}, },
showLocation(date){ showLocation(date){
...@@ -306,7 +306,7 @@ export default { ...@@ -306,7 +306,7 @@ export default {
div.appendChild(sanjiao); div.appendChild(sanjiao);
var that = this; var that = this;
var arrow = this._arrow = document.createElement("div"); var arrow = this._arrow = document.createElement("div");
arrow.style.background = "url(http://map.baidu.com/fwmap/upload/r/mrep/fwmap/static/house/images/label.png) no-repeat"; //arrow.style.background = "url(http://map.baidu.com/fwmap/upload/r/mrep/fwmap/static/house/images/label.png) no-repeat";
arrow.style.position = "absolute"; arrow.style.position = "absolute";
arrow.style.width = "11px"; arrow.style.width = "11px";
arrow.style.height = "10px"; arrow.style.height = "10px";
......
src/components/SalesModule/addPassenger.vue
View file @ 4a4f7327
...@@ -1513,15 +1513,15 @@ ...@@ -1513,15 +1513,15 @@
// 中国护照验证逻辑 // 中国护照验证逻辑
isValidPassport:function() { isValidPassport:function() {
var isCheck=true; var isCheck=true;
if(this.addMsg.Nationality===2){
if (this.addMsg.PassportNo.length !== 9) { if (this.addMsg.PassportNo.length !== 9) {
this.$message.error("请输入9位护照号") this.$message.error("请输入9位护照号")
isCheck=false; isCheck=false;
return ; return ;
} }
if(this.addMsg.Nationality===this.NationalityId){
// 单个字母开头（E或G）后跟8位数字 // 单个字母开头（E或G）后跟8位数字
const pattern1 = /^[EGH][0-9]{8}$/; const pattern1 = /^[EGHA][0-9]{8}$/;
// 两个字母开头（E开头，第二个字母不能是I或O）后跟7位数字 // 两个字母开头（E开头，第二个字母不能是I或O）后跟7位数字
const pattern2 = /^E[A-HJ-NP-Z][0-9]{7}$/; const pattern2 = /^E[A-HJ-NP-Z][0-9]{7}$/;
this.PassportNoSure= pattern1.test(this.addMsg.PassportNo) || pattern2.test(this.addMsg.PassportNo); this.PassportNoSure= pattern1.test(this.addMsg.PassportNo) || pattern2.test(this.addMsg.PassportNo);
...@@ -1536,22 +1536,24 @@ ...@@ -1536,22 +1536,24 @@
//中国护照验证逻辑 //中国护照验证逻辑
isValidPassport: function () { isValidPassport: function () {
var isCheck = true; var isCheck = true;
if (this.addMsg.PassportNo.length !== 9) { if(this.addMsg.Nationality===2){
this.$message.error("请输入9位护照号") if (this.addMsg.PassportNo.length !== 9) {
isCheck = false; this.$message.error("请输入9位护照号")
return;
}
if (this.addMsg.Nationality === 2) {
// 单个字母开头（E或G）后跟8位数字
const pattern1 = /^[EGH][0-9]{8}$/;
// 两个字母开头（E开头，第二个字母不能是I或O）后跟7位数字
const pattern2 = /^E[A-HJ-NP-Z][0-9]{7}$/;
this.PassportNoSure = pattern1.test(this.addMsg.PassportNo) || pattern2.test(this.addMsg.PassportNo);
if (!this.PassportNoSure) {
this.$message.error("护照格式不正确")
isCheck = false; isCheck = false;
return; return;
} }
if (this.addMsg.Nationality === 2) {
// 单个字母开头（E或G）后跟8位数字
const pattern1 = /^[EGH][0-9]{8}$/;
// 两个字母开头（E开头，第二个字母不能是I或O）后跟7位数字
const pattern2 = /^E[A-HJ-NP-Z][0-9]{7}$/;
this.PassportNoSure = pattern1.test(this.addMsg.PassportNo) || pattern2.test(this.addMsg.PassportNo);
if (!this.PassportNoSure) {
this.$message.error("护照格式不正确")
isCheck = false;
return;
}
}
} }
return isCheck; return isCheck;
}, },
......
src/components/SalesModule/customerMap.vue
View file @ 4a4f7327
...@@ -64,16 +64,16 @@ export default { ...@@ -64,16 +64,16 @@ export default {
baiduMapData: [], baiduMapData: [],
changebaiduMapData: [], changebaiduMapData: [],
centerP: null, centerP: null,
options0: { // options0: {
size: BMAP_POINT_SIZE_BIGGER, // size: BMAP_POINT_SIZE_BIGGER,
shape: BMAP_POINT_SHAPE_CIRCLE, // shape: BMAP_POINT_SHAPE_CIRCLE,
color: '#1eb3ff' // color: '#1eb3ff'
}, // },
options1: { // options1: {
size: BMAP_POINT_SIZE_BIGGER, // size: BMAP_POINT_SIZE_BIGGER,
shape: BMAP_POINT_SHAPE_CIRCLE, // shape: BMAP_POINT_SHAPE_CIRCLE,
color: '#5fffa3' // color: '#5fffa3'
}, // },
list0: [], list0: [],
list1: [], list1: [],
}; };
...@@ -98,42 +98,42 @@ export default { ...@@ -98,42 +98,42 @@ export default {
} }
}, },
creatMap(arr, type){ creatMap(arr, type){
let _this = this // let _this = this
//实例化，并设置最大最小缩放层级 // //实例化，并设置最大最小缩放层级
if(this.map) { // if(this.map) {
this.map.clearOverlays() // this.map.clearOverlays()
} else { // } else {
this.map = new BMap.Map("centerMpBaidu", { // this.map = new BMap.Map("centerMpBaidu", {
minZoom: 3, // minZoom: 3,
maxZoom: 20, // maxZoom: 20,
}); // });
//设置中心点、默认缩放层级 // //设置中心点、默认缩放层级
if (_this.centerP) { // if (_this.centerP) {
this.map.centerAndZoom(new BMap.Point(_this.centerP.Lng, _this.centerP.Lat), 10); // this.map.centerAndZoom(new BMap.Point(_this.centerP.Lng, _this.centerP.Lat), 10);
} else { // } else {
this.map.centerAndZoom(new BMap.Point(104.0727017791, 30.6643622306), 10); // this.map.centerAndZoom(new BMap.Point(104.0727017791, 30.6643622306), 10);
} // }
this.map.setMapStyleV2({ // this.map.setMapStyleV2({
styleId: '33046c341768c2774ab011cc7cf013d1' // styleId: '33046c341768c2774ab011cc7cf013d1'
}); // });
this.map.enableScrollWheelZoom(true); // this.map.enableScrollWheelZoom(true);
} // }
//可以鼠标缩放 // //可以鼠标缩放
const points = arr; // const points = arr;
let list0 = [], list1 = []; // let list0 = [], list1 = [];
points.forEach(item => { // points.forEach(item => {
let obj = new BMap.Point(item.Lng, item.Lat) // let obj = new BMap.Point(item.Lng, item.Lat)
obj.CustomerId = item.CustomerId // obj.CustomerId = item.CustomerId
if(item.type == 0) { // if(item.type == 0) {
list0.push(obj) // list0.push(obj)
} else if (item.type == 1){ // } else if (item.type == 1){
list1.push(obj) // list1.push(obj)
} // }
}) // })
this.list0 = list0; // this.list0 = list0;
this.list1 = list1; // this.list1 = list1;
this.changePointsColor(this.list0,this.options0); // this.changePointsColor(this.list0,this.options0);
this.changePointsColor(this.list1,this.options1); // this.changePointsColor(this.list1,this.options1);
}, },
changePointsColor(points, options){ changePointsColor(points, options){
var map = this.map; var map = this.map;
...@@ -187,7 +187,6 @@ export default { ...@@ -187,7 +187,6 @@ export default {
x.type = 1 x.type = 1
}) })
let baiduMapData = [...data.ActivateList, ...data.InActiveList, ...data.NotVisit]; let baiduMapData = [...data.ActivateList, ...data.InActiveList, ...data.NotVisit];
// let baiduMapData = [...data.NotVisit, ...data.ActivateList];
this.baiduMapData = baiduMapData this.baiduMapData = baiduMapData
this.creatMap(this.baiduMapData) this.creatMap(this.baiduMapData)
} }
......
src/components/SalesModule/passengerDetail.vue
View file @ 4a4f7327
...@@ -466,9 +466,6 @@ ...@@ -466,9 +466,6 @@
loading: false, loading: false,
appkey_ocr: "OGAhU38ib8EweXMtPVqCbkpN", appkey_ocr: "OGAhU38ib8EweXMtPVqCbkpN",
secretKey_ocr: "OcqfFF5hlleWovzA6vLweykxPgwE8XF2", secretKey_ocr: "OcqfFF5hlleWovzA6vLweykxPgwE8XF2",
BD_GET_ACCESS_TOKEN: "https://aip.baidubce.com/oauth/2.0/token",
BD_COMMON_TEXT_DISCERN_IDCARD: "https://aip.baidubce.com/rest/2.0/ocr/v1/idcard",
BD_COMMON_TEXT_DISCERN: "https://aip.baidubce.com/rest/2.0/solution/v1/iocr/recognise",
access_token_ocr: "", access_token_ocr: "",
templateType: 1, templateType: 1,
templateSign: "", templateSign: "",
......
src/components/SalesModule/yingyanMap.vue
View file @ 4a4f7327
This diff is collapsed.
src/components/SingleContract.vue
View file @ 4a4f7327
...@@ -653,10 +653,12 @@ ...@@ -653,10 +653,12 @@
<el-input type="text" placeholder="健康" v-model="item.CGuestHealth" v-else></el-input> <el-input type="text" placeholder="健康" v-model="item.CGuestHealth" v-else></el-input>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" v-if="item.IsShow == 0" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" v-if="item.IsShow == 0"
placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" v-if="item.IsShow == 1" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" v-if="item.IsShow == 1"
placement="top-start">
<el-button type="primary" icon="iconfont icon-baocun" @click="commonSave(item)" circle></el-button> <el-button type="primary" icon="iconfont icon-baocun" @click="commonSave(item)" circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -728,10 +730,12 @@ ...@@ -728,10 +730,12 @@
v-model="item.DepositPrice"></el-input> v-model="item.DepositPrice"></el-input>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" v-if="item.IsShow == 0"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
v-if="item.IsShow == 0">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow == 1"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow == 1">
<el-button type="primary" icon="iconfont icon-baocun" @click="commonSave(item)" circle></el-button> <el-button type="primary" icon="iconfont icon-baocun" @click="commonSave(item)" circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -856,10 +860,12 @@ ...@@ -856,10 +860,12 @@
placeholder=''></el-date-picker> placeholder=''></el-date-picker>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" v-if="item.IsShow==0" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" v-if="item.IsShow==0"
placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" v-if="item.IsShow==1" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" v-if="item.IsShow==1"
placement="top-start">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button> <el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -952,10 +958,12 @@ ...@@ -952,10 +958,12 @@
</el-select> </el-select>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" v-if="item.IsShow==0"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
v-if="item.IsShow==0">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow==1"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow==1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button> <el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -1021,10 +1029,12 @@ ...@@ -1021,10 +1029,12 @@
v-model="item.DepositPrice"></el-input> v-model="item.DepositPrice"></el-input>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" v-if="item.IsShow==0"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
v-if="item.IsShow==0">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow==1"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow==1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button> <el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -1111,10 +1121,12 @@ ...@@ -1111,10 +1121,12 @@
v-model="item.AirportPirce"></el-input> v-model="item.AirportPirce"></el-input>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" v-if="item.IsShow==0"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
v-if="item.IsShow==0">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow==1"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow==1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button> <el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -1186,10 +1198,12 @@ ...@@ -1186,10 +1198,12 @@
v-model="item.ChildrenPrice"></el-input> v-model="item.ChildrenPrice"></el-input>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" v-if="item.IsShow==0"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
v-if="item.IsShow==0">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow==1"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow==1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button> <el-button type="primary" icon="iconfont icon-baocun" circle @click="commonSave(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
...@@ -1274,12 +1288,12 @@ ...@@ -1274,12 +1288,12 @@
Tourists_EmergencyLinkMan: "", Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "", Tourists_EmergencyLinkTel: "",
SignType: 1, //合同章类型 SignType: 1, //合同章类型
TravelAgency_Name: "（株）ピースインターナショナル", //旅行社名称 TravelAgency_Name: "株式会社ピースインターナショナル", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015", TravelAgency_LicenseNum: "",
TravelAgency_DealMan: "", TravelAgency_DealMan: "",
TravelAgency_IDNum: "", TravelAgency_IDNum: "",
TravelAgency_Address: "", TravelAgency_Address: "〒114-0023東京都北区滝野川5-41-3TKビル9F",
TravelAgency_Tel: "", TravelAgency_Tel: "03-5972-1758",
TravelAgency_Fax: "", TravelAgency_Fax: "",
TravelAgency_PostNum: "", TravelAgency_PostNum: "",
TravelAgency_Email: "", TravelAgency_Email: "",
...@@ -1450,10 +1464,12 @@ ...@@ -1450,10 +1464,12 @@
changeSignType() { changeSignType() {
if (this.CtObj.SignType == 0) { if (this.CtObj.SignType == 0) {
this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司"; this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 " this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号";
this.CtObj.TravelAgency_Tel = "028-81454056";
} else { } else {
this.CtObj.TravelAgency_Name = "（株）ピースインターナショナル"; this.CtObj.TravelAgency_Name = "株式会社ピースインターナショナル";
this.CtObj.TravelAgency_Address = ""; this.CtObj.TravelAgency_Address = "〒114-0023東京都北区滝野川5-41-3TKビル9F";
this.CtObj.TravelAgency_Tel = "03-5972-1758";
} }
}, },
//跳转锚点 //跳转锚点
......
src/components/TravelContractDetail.vue
View file @ 4a4f7327
...@@ -990,11 +990,11 @@ ...@@ -990,11 +990,11 @@
<tr> <tr>
<td>{{$t('objFill.v101.Contract.qianyueriqi')}}：</td> <td>{{$t('objFill.v101.Contract.qianyueriqi')}}：</td>
<td> <td>
<span v-if="dataList.payDate">{{getDate(dataList.payDate)}}</span> <span v-if="dataList.updateTime">{{getDate(dataList.updateTime)}}</span>
</td> </td>
<td>{{$t('objFill.v101.Contract.qianyueriqi')}}：</td> <td>{{$t('objFill.v101.Contract.qianyueriqi')}}：</td>
<td> <td>
<span v-if="dataList.payDate">{{getDate(dataList.payDate)}}</span> <span v-if="dataList.updateTime">{{getDate(dataList.updateTime)}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -1003,21 +1003,21 @@ ...@@ -1003,21 +1003,21 @@
</tr> </tr>
<tr> <tr>
<td>{{$t('objFill.chujsjdtsdh')}}：</td> <td>{{$t('objFill.chujsjdtsdh')}}：</td>
<td colspan="3">{{dataList.regulatorComplainCall}}</td> <td colspan="3" style="color:red">{{dataList.regulatorComplainCall}}</td>
</tr> </tr>
<template v-if="dataList.signType==0"> <template v-if="dataList.signType==0">
<tr> <tr>
<td>四川省 成都市旅游质监执法机构：</td> <td>四川省 成都市旅游质监执法机构：</td>
<td colspan="3">{{dataList.regulatorName}}</td> <td colspan="3" style="color:red">{{dataList.regulatorName}}</td>
</tr> </tr>
</template> </template>
<tr> <tr>
<td>{{$t('objFill.toushudh')}}：</td> <td>{{$t('objFill.toushudh')}}：</td>
<td colspan="3">{{dataList.companyComplainCall}}</td> <td colspan="3" style="color:red">{{dataList.companyComplainCall}}</td>
</tr> </tr>
<tr> <tr>
<td>{{$t('objFill.dianziyx')}}：</td> <td>{{$t('objFill.dianziyx')}}：</td>
<td colspan="3">{{dataList.regulatorWebsite}}</td> <td colspan="3" style="color:red">{{dataList.regulatorWebsite}}</td>
</tr> </tr>
<tr> <tr>
<td>地 址：</td> <td>地 址：</td>
......
src/components/TravelContractNew.vue
View file @ 4a4f7327
...@@ -452,7 +452,7 @@ ...@@ -452,7 +452,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<el-form-item :label="$t('scen.sc_tel')"> <el-form-item :label="$t('scen.sc_tel')" prop="companyCall">
<el-input type="text" class="w300" v-model="CtObj.companyCall"></el-input> <el-input type="text" class="w300" v-model="CtObj.companyCall"></el-input>
</el-form-item> </el-form-item>
</td> </td>
...@@ -978,7 +978,7 @@ ...@@ -978,7 +978,7 @@
<table class="TcTravel_Table"> <table class="TcTravel_Table">
<tbody> <tbody>
<tr> <tr>
<td colspan="5" contenteditable="true">组团社：印象之旅</td> <td colspan="5" contenteditable="true">组团社：四川和平国际旅行社有限公司</td>
</tr> </tr>
<tr> <tr>
<td colspan="5" contenteditable="true"> <td colspan="5" contenteditable="true">
...@@ -1008,12 +1008,9 @@ ...@@ -1008,12 +1008,9 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="5"> <td colspan="5" contenteditable="true">
<div style="display: flex"> <div style="display: flex">
<span>地接社名称：</span> <span>地接社名称：株式会社ピースインターナショナル </span>
<div contenteditable="true" style="width: 250px">
株式会社 ピースインターナショナル
</div>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -1593,6 +1590,11 @@ ...@@ -1593,6 +1590,11 @@
message: this.$t('objFill.qingsrjbren'), message: this.$t('objFill.qingsrjbren'),
trigger: "blur", trigger: "blur",
}, ], }, ],
companyCall: [{
required: true,
message: this.$t("rule.EnterPNum"),
trigger: "blur",
}, ],
agentCall: [{ agentCall: [{
required: true, required: true,
message: this.$t("rule.EnterPNum"), message: this.$t("rule.EnterPNum"),
...@@ -1725,14 +1727,16 @@ ...@@ -1725,14 +1727,16 @@
if (this.CtObj.signType == 0) { if (this.CtObj.signType == 0) {
this.CtObj.company = "四川和平国际旅行社有限公司"; this.CtObj.company = "四川和平国际旅行社有限公司";
this.CtObj.companyAddress = this.CtObj.companyAddress =
"成都市锦江区青和里南段55号1栋2310、2311、2312号 "; "成都市锦江区青和里南段55号1栋2310、2311、2312号";
this.CtObj.businessCertificate = "L-SC-CJ00015"; this.CtObj.businessCertificate = "L-SC-CJ00015";
this.CtObj.regulatorName = "四川省成都市旅游质监执法机构"; this.CtObj.regulatorName = "四川省成都市旅游质监执法机构";
this.CtObj.companyCall = "028-81454056";
} else { } else {
this.CtObj.company = "（株）ピースインターナショナル"; this.CtObj.company = "株式会社ピースインターナショナル";
this.CtObj.companyAddress = ""; this.CtObj.companyAddress = "〒114-0023東京都北区滝野川5-41-3TKビル9F";
this.CtObj.businessCertificate = ""; this.CtObj.businessCertificate = "";
this.CtObj.regulatorName = ""; this.CtObj.regulatorName = "";
this.CtObj.companyCall = "03-5972-1758"
} }
}, },
goContract() { goContract() {
...@@ -1823,7 +1827,10 @@ ...@@ -1823,7 +1827,10 @@
"成都市锦江区青和里南段55号1栋2310、2311、2312号 "; "成都市锦江区青和里南段55号1栋2310、2311、2312号 ";
this.CtObj.regulatorComplainCall = "17708046437"; this.CtObj.regulatorComplainCall = "17708046437";
this.CtObj.companyComplainCall = "028-96927"; this.CtObj.companyComplainCall = "028-12345";
this.CtObj.regulatorName = "四川省成都市旅游质监执法机构";
this.CtObj.contractPlace = "四川成都";
this.CtObj.companyCall = "028-81454056";
//生成其他约定事项 //生成其他约定事项
let otherMatter = ""; let otherMatter = "";
......
src/components/WebSet/WebSiteArea.vue
View file @ 4a4f7327
This diff is collapsed.
src/components/busManagement/CharteringManagement/CharteringInfoManage.vue
View file @ 4a4f7327
...@@ -969,8 +969,8 @@ ...@@ -969,8 +969,8 @@
</el-dialog> </el-dialog>
<el-dialog custom-class="mapList" :title="$t('hotel.hotel_mapLocation')" center :visible.sync="selectAddress"> <el-dialog custom-class="mapList" :title="$t('hotel.hotel_mapLocation')" center :visible.sync="selectAddress">
<Map @refList="selectAddress = false" v-on:headCallBack="headCall" v-bind:Address="Address" <!-- <Map @refList="selectAddress = false" v-on:headCallBack="headCall" v-bind:Address="Address"
:type="MapType" :index="index"></Map> :type="MapType" :index="index"></Map> -->
</el-dialog> </el-dialog>
<div class="btn-list"> <div class="btn-list">
...@@ -984,11 +984,11 @@ ...@@ -984,11 +984,11 @@
</div> </div>
</template> </template>
<script> <script>
import Map from "../../public/Map.vue"; // import Map from "../../public/Map.vue";
import DMCchooseImg from "../../commonPage/DMCchooseImg.vue"; import DMCchooseImg from "../../commonPage/DMCchooseImg.vue";
export default { export default {
components: { components: {
Map: Map, // Map: Map,
DMCchooseImg: DMCchooseImg DMCchooseImg: DMCchooseImg
}, },
data() { data() {
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 4a4f7327
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading" :element-loading-text="loadingText"></div> <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading" :element-loading-text="loadingText"></div>
<el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;"> <el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;">
<el-col :span="14" class="row-aic"> <el-col :span="14" class="row-aic">
<a id="pdfDownLoad" style="display:none;" target="_blank" href="http://www.baidu.com" <a id="pdfDownLoad" style="display:none;" target="_blank" href=""
download="xx.pdf">{{$t('objFill.v101.yemiantiaoz')}}</a> download="xx.pdf">{{$t('objFill.v101.yemiantiaoz')}}</a>
<template v-if="orderId>0"> <template v-if="orderId>0">
<el-button type="primary" @click="toPDF_2023()"> <el-button type="primary" @click="toPDF_2023()">
......
src/components/onedayTripContract.vue
View file @ 4a4f7327
...@@ -927,7 +927,7 @@ ...@@ -927,7 +927,7 @@
<table class="TcTravel_Table"> <table class="TcTravel_Table">
<tbody> <tbody>
<tr> <tr>
<td colspan="5" contenteditable="true">组团社：印象之旅</td> <td colspan="5" contenteditable="true">组团社：四川和平国际旅行社有限公司</td>
</tr> </tr>
<tr> <tr>
<td colspan="5" contenteditable="true"> <td colspan="5" contenteditable="true">
...@@ -959,10 +959,7 @@ ...@@ -959,10 +959,7 @@
<tr> <tr>
<td colspan="5"> <td colspan="5">
<div style="display: flex"> <div style="display: flex">
<span>地接社名称：</span> <span>地接社名称：株式会社ピースインターナショナル</span>
<div contenteditable="true" style="width: 250px">
株式会社 ピースインターナショナル
</div>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -1279,12 +1276,12 @@ ...@@ -1279,12 +1276,12 @@
TravelAgency_DealMan: "", TravelAgency_DealMan: "",
TravelAgency_IDNum: "", TravelAgency_IDNum: "",
TravelAgency_Address: "成都市锦江区青和里南段55号1栋2310、2311、2312号 ", TravelAgency_Address: "成都市锦江区青和里南段55号1栋2310、2311、2312号 ",
TravelAgency_Tel: "", TravelAgency_Tel: "028-81454056",
TravelAgency_Fax: "", TravelAgency_Fax: "",
TravelAgency_PostNum: "", TravelAgency_PostNum: "",
TravelAgency_Email: "", TravelAgency_Email: "",
TravelAgency_Scope: "出境游/境内游", //旅行社经营范围 TravelAgency_Scope: "出境游/境内游", //旅行社经营范围
TravelAgency_SignAddress: "", TravelAgency_SignAddress: "成都",
Guide_Name: "", Guide_Name: "",
Guide_Num: "", Guide_Num: "",
Guide_Tel: "", Guide_Tel: "",
...@@ -1468,10 +1465,12 @@ ...@@ -1468,10 +1465,12 @@
this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司"; this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 "; this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 ";
this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015"; this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015";
this.CtObj.TravelAgency_Tel = "028-81454056";
} else { } else {
this.CtObj.TravelAgency_Name = "（株）ピースインターナショナル"; this.CtObj.TravelAgency_Name = "株式会社ピースインターナショナル";
this.CtObj.TravelAgency_Address = ""; this.CtObj.TravelAgency_Address = "〒114-0023東京都北区滝野川5-41-3TKビル9F";
this.CtObj.TravelAgency_LicenseNum = ""; this.CtObj.TravelAgency_LicenseNum = "";
this.CtObj.TravelAgency_Tel = "03-5972-1758";
} }
}, },
//跳转锚点 //跳转锚点
...@@ -1644,11 +1643,27 @@ ...@@ -1644,11 +1643,27 @@
} }
this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan; this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan;
this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum; this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum;
this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel;
this.CtObj.TravelAgency_Fax = tempObj.TravelAgency_Fax; this.CtObj.TravelAgency_Fax = tempObj.TravelAgency_Fax;
this.CtObj.TravelAgency_PostNum = tempObj.TravelAgency_PostNum; this.CtObj.TravelAgency_PostNum = tempObj.TravelAgency_PostNum;
this.CtObj.TravelAgency_Email = tempObj.TravelAgency_Email; this.CtObj.TravelAgency_Email = tempObj.TravelAgency_Email;
this.CtObj.TravelAgency_SignAddress = tempObj.TravelAgency_SignAddress; if (this.CtObj.ID == 0) {
this.CtObj.TravelAgency_SignAddress = "四川成都";
this.CtObj.TravelAgency_Tel = "028-81454056";
this.CtObj.C_ComplaintTel = "028-12345";
this.CtObj.C_ComplaintProvince = "四川省";
this.CtObj.C_ComplaintCity = "成都市";
this.CtObj.TravelAgency_ServiceTel = "17708046437";
this.CtObj.C_ZhiFaTel = "028-12345";
} else {
this.CtObj.TravelAgency_SignAddress = tempObj.TravelAgency_SignAddress;
this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel;
this.CtObj.C_ComplaintTel = tempObj.C_ComplaintTel;
this.CtObj.C_ComplaintProvince = tempObj.C_ComplaintProvince;
this.CtObj.C_ComplaintCity = tempObj.C_ComplaintCity;
this.CtObj.TravelAgency_ServiceTel = tempObj.TravelAgency_ServiceTel;
this.CtObj.C_ZhiFaTel = tempObj.C_ZhiFaTel;
}
this.CtObj.Guide_Name = tempObj.Guide_Name; this.CtObj.Guide_Name = tempObj.Guide_Name;
this.CtObj.Guide_Num = tempObj.Guide_Num; this.CtObj.Guide_Num = tempObj.Guide_Num;
this.CtObj.Guide_Tel = tempObj.Guide_Tel; this.CtObj.Guide_Tel = tempObj.Guide_Tel;
...@@ -1697,15 +1712,12 @@ ...@@ -1697,15 +1712,12 @@
this.CtObj.C_IncludeRemark = tempObj.C_IncludeRemark; this.CtObj.C_IncludeRemark = tempObj.C_IncludeRemark;
this.CtObj.C_IncludeFee = tempObj.C_IncludeFee; this.CtObj.C_IncludeFee = tempObj.C_IncludeFee;
this.CtObj.C_NonIncludeRemark = tempObj.C_NonIncludeRemark; this.CtObj.C_NonIncludeRemark = tempObj.C_NonIncludeRemark;
this.CtObj.TravelAgency_ServiceTel =
tempObj.TravelAgency_ServiceTel;
this.CtObj.C_ComplaintProvince = tempObj.C_ComplaintProvince;
this.CtObj.C_ComplaintCity = tempObj.C_ComplaintCity;
this.CtObj.C_ComplaintTel = tempObj.C_ComplaintTel;
this.CtObj.C_ComplaintEmail = tempObj.C_ComplaintEmail; this.CtObj.C_ComplaintEmail = tempObj.C_ComplaintEmail;
this.CtObj.C_ComplaintAddress = tempObj.C_ComplaintAddress; this.CtObj.C_ComplaintAddress = tempObj.C_ComplaintAddress;
this.CtObj.C_ComplaintPostNum = tempObj.C_ComplaintPostNum; this.CtObj.C_ComplaintPostNum = tempObj.C_ComplaintPostNum;
this.CtObj.C_ZhiFaTel = tempObj.C_ZhiFaTel;
this.CtObj.C_XFZXHTSTel = tempObj.C_XFZXHTSTel; this.CtObj.C_XFZXHTSTel = tempObj.C_XFZXHTSTel;
this.CtObj.C_TicketDayNum = tempObj.C_TicketDayNum; this.CtObj.C_TicketDayNum = tempObj.C_TicketDayNum;
this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum; this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum;
......
src/components/public/Map.vue
View file @ 4a4f7327
<template> <template>
<div> <div>
<baidu-map v-bind:style="mapStyle" class="bm-view" <!-- <baidu-map v-bind:style="mapStyle" class="bm-view" ak="L5Qw0GlbbCIMwgR4Uug3ogM40Imkd3CV" :center="center"
ak="L5Qw0GlbbCIMwgR4Uug3ogM40Imkd3CV" :zoom="zoom" :scroll-wheel-zoom="true" @click="getClickInfo" @moving="syncCenterAndZoom"
:center="center" :zoom="zoom" :scroll-wheel-zoom="true" @moveend="syncCenterAndZoom" @zoomend="syncCenterAndZoom">
@click="getClickInfo" @moving="syncCenterAndZoom" @moveend="syncCenterAndZoom" @zoomend="syncCenterAndZoom"> <bm-view style="width: 100%; height:400px;"></bm-view>
<bm-view style="width: 100%; height:400px;"></bm-view> <bm-marker :position="{lng: center.lng, lat: center.lat}" :dragging="true" animation="BMAP_ANIMATION_BOUNCE">
<bm-marker :position="{lng: center.lng, lat: center.lat}" <bm-label v-if="radius>0" :content="$t('objFill.jiesongdianfw')" :position="center"
:dragging="true" :labelStyle="{color: 'red', fontSize : '16px','border':'0px','margin-top':'20px'}" title="Hover me" />
animation="BMAP_ANIMATION_BOUNCE"> </bm-marker>
<bm-label v-if="radius>0" :content="$t('objFill.jiesongdianfw')" :position="center" :labelStyle="{color: 'red', fontSize : '16px','border':'0px','margin-top':'20px'}" title="Hover me"/> <bm-control :offset="{width: '10px', height: '10px'}">
</bm-marker> <bm-auto-complete v-model="keyword" :sugStyle="{zIndex: 999999}">
<bm-control :offset="{width: '10px', height: '10px'}"> <input v-model="keyword" type="text" :placeholder="$t('objFill.qingshugjcss')" class="serachinput">
<bm-auto-complete v-model="keyword" :sugStyle="{zIndex: 999999}"> </bm-auto-complete>
<input v-model="keyword" type="text" :placeholder="$t('objFill.qingshugjcss')" class="serachinput"> <button class="normalBtn" type="primary" @click="determineLngLat">
</bm-auto-complete> {{$t('pub.sureBtn')}}
<button class="normalBtn" type="primary" @click="determineLngLat"> </button>
{{$t('pub.sureBtn')}} </bm-control>
</button> <bm-local-search v-if="radius>0" :keyword="keyword" :nearby="nearby" :auto-viewport="true" :panel="false"
</bm-control> style="width:0px;height:0px;overflow: hidden;"></bm-local-search>
<bm-local-search v-if="radius>0" :keyword="keyword" :nearby="nearby" :auto-viewport="true" :panel="false" <bm-local-search v-else :keyword="keyword" :auto-viewport="true" :panel="false"
style="width:0px;height:0px;overflow: hidden;"></bm-local-search> style="width:0px;height:0px;overflow: hidden;"></bm-local-search>
<bm-local-search v-else :keyword="keyword" :auto-viewport="true" :panel="false" <template v-show="radius>0">
style="width:0px;height:0px;overflow: hidden;"></bm-local-search> <bm-circle :center="center" :radius="radius" stroke-color="red" :stroke-opacity="0.8" :stroke-weight="0.5">
<template v-show="radius>0"> </bm-circle>
<bm-circle :center="center" :radius="radius" stroke-color="red" :stroke-opacity="0.8" :stroke-weight="0.5"></bm-circle> </template>
</template> </baidu-map> -->
</baidu-map> </div>
</div> </template>
</template>
<script> <script>
import {BaiduMap, BmControl, import {
BmView, BmAutoComplete, BaiduMap,
BmLocalSearch, BmMarker,BmPolygon,BmCircle,BmLabel} from 'vue-baidu-map' BmControl,
BmView,
BmAutoComplete,
BmLocalSearch,
BmMarker,
BmPolygon,
BmCircle,
BmLabel
} from 'vue-baidu-map'
export default { export default {
props: ["Address", "type", "index","GetOff"], props: ["Address", "type", "index", "GetOff"],
components: { components: {
BaiduMap, BaiduMap,
BmControl, BmControl,
...@@ -48,14 +55,20 @@ ...@@ -48,14 +55,20 @@
}, },
data() { data() {
return { return {
radius:0, radius: 0,
keyword: '', keyword: '',
mapStyle: { mapStyle: {
width: '100%', width: '100%',
height: '100%' height: '100%'
}, },
center: {lng: 116.404, lat: 39.915}, center: {
newCenter: {lng: '', lat: ''}, lng: 116.404,
lat: 39.915
},
newCenter: {
lng: '',
lat: ''
},
zoom: 20, zoom: 20,
nearby: { nearby: {
center: { center: {
...@@ -68,58 +81,59 @@ ...@@ -68,58 +81,59 @@
}, },
watch: { watch: {
Address: { Address: {
handler(newValue,onldValue) { handler(newValue, onldValue) {
this.keyword = newValue this.keyword = newValue
}, },
deep:true, deep: true,
immediate: true immediate: true
}, },
GetOff: { GetOff: {
handler(newValue,onldValue) { handler(newValue, onldValue) {
if(this.GetOff){ if (this.GetOff) {
this.center.lng = this.GetOff.Lng this.center.lng = this.GetOff.Lng
this.center.lat = this.GetOff.Lat this.center.lat = this.GetOff.Lat
if(this.GetOff.Range){ if (this.GetOff.Range) {
this.radius = this.GetOff.Range this.radius = this.GetOff.Range
} }
} }
this.nearby = { this.nearby = {
center: { center: {
lng:this.center.lng, lng: this.center.lng,
lat:this.center.lat lat: this.center.lat
}, },
radius: this.radius radius: this.radius
} }
}, },
deep:true, deep: true,
immediate: true immediate: true
}, },
}, },
mounted() { mounted() {
if(this.GetOff){ if (this.GetOff) {
this.center.lng = this.GetOff.Lng this.center.lng = this.GetOff.Lng
this.center.lat = this.GetOff.Lat this.center.lat = this.GetOff.Lat
if(this.GetOff.Range){ if (this.GetOff.Range) {
this.radius = this.GetOff.Range this.radius = this.GetOff.Range
} }
} }
this.keyword = this.Address this.keyword = this.Address
this.nearby = { this.nearby = {
center: { center: {
lng:this.center.lng, lng: this.center.lng,
lat:this.center.lat lat: this.center.lat
}, },
radius: this.radius radius: this.radius
} }
}, },
methods: { methods: {
getClickInfo (e) { getClickInfo(e) {
let that= this let that = this
var gc = new BMap.Geocoder(); var gc = new BMap.Geocoder();
gc.getLocation(e.point, function (rs) { gc.getLocation(e.point, function (rs) {
if(rs.addressComponents){ if (rs.addressComponents) {
var addComp = rs.addressComponents; var addComp = rs.addressComponents;
let address_detail = addComp.province + addComp.city + addComp.district + addComp.street + addComp.streetNumber let address_detail = addComp.province + addComp.city + addComp.district + addComp.street + addComp
.streetNumber
that.keyword = address_detail that.keyword = address_detail
} }
}) })
...@@ -128,9 +142,12 @@ ...@@ -128,9 +142,12 @@
this.newCenter.lng = e.point.lng this.newCenter.lng = e.point.lng
this.newCenter.lat = e.point.lat this.newCenter.lat = e.point.lat
}, },
syncCenterAndZoom (e) { syncCenterAndZoom(e) {
if(this.GetOff) return if (this.GetOff) return
const {lng, lat} = e.target.getCenter() const {
lng,
lat
} = e.target.getCenter()
this.center.lng = lng this.center.lng = lng
this.center.lat = lat this.center.lat = lat
this.newCenter.lng = lng this.newCenter.lng = lng
...@@ -138,25 +155,30 @@ ...@@ -138,25 +155,30 @@
this.zoom = e.target.getZoom() this.zoom = e.target.getZoom()
}, },
// 经纬度 // 经纬度
determineLngLat(){ determineLngLat() {
if(this.newCenter.lng){ if (this.newCenter.lng) {
this.$emit("headCallBack", this.newCenter, this.type, this.index, this.keyword); this.$emit("headCallBack", this.newCenter, this.type, this.index, this.keyword);
this.$emit("refList"); this.$emit("refList");
this.newCenter = {lng: '', lat: ''} this.newCenter = {
}else{ lng: '',
lat: ''
}
} else {
this.Error(this.$t('objFill.qingsousuobxznddz')); this.Error(this.$t('objFill.qingsousuobxznddz'));
} }
}, },
} }
} }
</script>
<style scoped> </script>
.serachinput{
<style scoped>
.serachinput {
margin-left: 10px; margin-left: 10px;
margin-top: 10px; margin-top: 10px;
width: 350px; width: 350px;
height: 30px; height: 30px;
margin-right: 10px; margin-right: 10px;
} }
</style>
</style>
src/components/public/echoMap.vue
View file @ 4a4f7327
<template> <template>
<div> <div>
<baidu-map v-bind:style="mapStyle" class="bm-view" <!-- <baidu-map v-bind:style="mapStyle" class="bm-view" ak="L5Qw0GlbbCIMwgR4Uug3ogM40Imkd3CV" :center="center"
ak="L5Qw0GlbbCIMwgR4Uug3ogM40Imkd3CV" :zoom="zoom" :scroll-wheel-zoom="true" @click="getClickInfo" @moving="syncCenterAndZoom"
:center="center" :zoom="zoom" :scroll-wheel-zoom="true" @moveend="syncCenterAndZoom" @zoomend="syncCenterAndZoom">
@click="getClickInfo" @moving="syncCenterAndZoom" @moveend="syncCenterAndZoom" @zoomend="syncCenterAndZoom"> <bm-view style="width: 100%; height:300px;"></bm-view>
<bm-view style="width: 100%; height:300px;"></bm-view> <bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE">
<bm-marker :position="center" <bm-label v-if="radius>0" :content="$t('objFill.jieongdfw')" :position="center"
:dragging="true" :labelStyle="{color: 'red', fontSize : '16px','border':'0px','margin-top':'20px'}" title="Hover me" />
animation="BMAP_ANIMATION_BOUNCE"> </bm-marker>
<bm-label v-if="radius>0" :content="$t('objFill.jieongdfw')" :position="center" :labelStyle="{color: 'red', fontSize : '16px','border':'0px','margin-top':'20px'}" title="Hover me"/> <template v-show="radius>0">
</bm-marker> <bm-circle :center="center" :radius="radius" stroke-color="red" :stroke-opacity="0.8" :stroke-weight="0.5">
<!-- <bm-control :offset="{width: '10px', height: '10px'}" style="display: flex;justify-content: space-between;align-items: center;"> </bm-circle>
<bm-auto-complete v-model="keyword" :sugStyle="{zIndex: 999999}"> </template>
<input v-model="keyword" type="text" placeholder="请输入搜索关键字" class="serachinput"> </baidu-map> -->
</bm-auto-complete> </div>
<button style="margin-top: 10px;" class="normalBtn" type="primary" @click="determineLngLat"> </template>
{{$t('pub.sureBtn')}}
</button>
</bm-control> -->
<!-- <bm-local-search :keyword="keyword" :auto-viewport="true" :bounds="bounds" :panel="false"
style="width:0px;height:0px;overflow: hidden;"></bm-local-search>
<bm-polygon :path="polygonPath"></bm-polygon> -->
<template v-show="radius>0"> <script>
<bm-circle :center="center" :radius="radius" stroke-color="red" :stroke-opacity="0.8" :stroke-weight="0.5"></bm-circle> import {
</template> BaiduMap,
</baidu-map> BmControl,
</div> BmView,
</template> BmAutoComplete,
BmLocalSearch,
<script> BmMarker,
import {BaiduMap, BmControl, BmPolygon,
BmView, BmAutoComplete, BmCircle,
BmLocalSearch, BmMarker, BmLabel
BmPolygon,BmCircle,BmLabel} from 'vue-baidu-map' } from 'vue-baidu-map'
export default { export default {
props: ["obj"], props: ["obj"],
components: { components: {
...@@ -59,7 +53,7 @@ ...@@ -59,7 +53,7 @@
lat: 39.961627 lat: 39.961627
// lng: 116.404, lat: 39.915 // lng: 116.404, lat: 39.915
}, },
radius: 0,//1000 radius: 0, //1000
zoom: 15, zoom: 15,
pStart: { pStart: {
lng: 116.294625, lng: 116.294625,
...@@ -72,83 +66,106 @@ ...@@ -72,83 +66,106 @@
} }
}, },
watch: { watch: {
obj: { obj: {
handler(newValue,onldValue) { handler(newValue, onldValue) {
this.center.lng = this.obj.lng this.center.lng = this.obj.lng
this.center.lat = this.obj.lat this.center.lat = this.obj.lat
if(this.obj.Range){ if (this.obj.Range) {
this.radius = this.obj.Range this.radius = this.obj.Range
} }
this.keyword = this.obj.Address this.keyword = this.obj.Address
}, },
deep:true, deep: true,
immediate: true immediate: true
}, },
}, },
mounted() { mounted() {
this.center.lng = this.obj.lng this.center.lng = this.obj.lng
this.center.lat = this.obj.lat this.center.lat = this.obj.lat
if(this.obj.Range){ if (this.obj.Range) {
this.radius = this.obj.Range this.radius = this.obj.Range
} }
this.keyword = this.obj.Address this.keyword = this.obj.Address
}, },
methods: { methods: {
bounds () { bounds() {
return { return {
sw: {lng: this.pStart.lng, lat: this.pStart.lat}, sw: {
ne:{lng: this.pEnd.lng, lat: this.pEnd.lat} lng: this.pStart.lng,
lat: this.pStart.lat
},
ne: {
lng: this.pEnd.lng,
lat: this.pEnd.lat
}
} }
}, },
polygonPath () { polygonPath() {
return [ return [{
{lng: this.pStart.lng, lat: this.pStart.lat}, lng: this.pStart.lng,
{lng: this.pEnd.lng, lat: this.pStart.lat}, lat: this.pStart.lat
{lng: this.pEnd.lng, lat: this.pEnd.lat}, },
{lng: this.pStart.lng, lat: this.pEnd.lat} {
lng: this.pEnd.lng,
lat: this.pStart.lat
},
{
lng: this.pEnd.lng,
lat: this.pEnd.lat
},
{
lng: this.pStart.lng,
lat: this.pEnd.lat
}
] ]
}, },
getClickInfo (e) { getClickInfo(e) {
let that= this let that = this
var gc = new BMap.Geocoder(); var gc = new BMap.Geocoder();
gc.getLocation(e.point, function (rs) { gc.getLocation(e.point, function (rs) {
if(rs.addressComponents){ if (rs.addressComponents) {
var addComp = rs.addressComponents; var addComp = rs.addressComponents;
let address_detail = addComp.province + addComp.city + addComp.district + addComp.street + addComp.streetNumber let address_detail = addComp.province + addComp.city + addComp.district + addComp.street + addComp
.streetNumber
that.keyword = address_detail that.keyword = address_detail
} }
}) })
this.center.lng = e.point.lng this.center.lng = e.point.lng
this.center.lat = e.point.lat this.center.lat = e.point.lat
}, },
syncCenterAndZoom (e) { syncCenterAndZoom(e) {
return return
const {lng, lat} = e.target.getCenter() const {
lng,
lat
} = e.target.getCenter()
this.center.lng = lng this.center.lng = lng
this.center.lat = lat this.center.lat = lat
this.zoom = e.target.getZoom() this.zoom = e.target.getZoom()
}, },
// 经纬度 // 经纬度
determineLngLat(){ determineLngLat() {
return return
if(this.center.lng){ if (this.center.lng) {
this.$emit("headCallBack", this.center, this.type, this.index, this.keyword); this.$emit("headCallBack", this.center, this.type, this.index, this.keyword);
this.$emit("refList"); this.$emit("refList");
}else{ } else {
this.Error(this.$t('objFill.v101.myOrdersAllType.qingssnxyddiz')); this.Error(this.$t('objFill.v101.myOrdersAllType.qingssnxyddiz'));
} }
}, },
} }
} }
</script>
<style scoped> </script>
.serachinput{
<style scoped>
.serachinput {
margin-left: 10px; margin-left: 10px;
margin-top: 10px; margin-top: 10px;
width: 200px; width: 200px;
height: 30px; height: 30px;
margin-right: 10px; margin-right: 10px;
} }
</style>
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment