Skip to content

S
SuperMan
Commit 933edeb8 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

地图，领队报账手配书

parent d90c828b
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 41 deletions
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 933edeb8
...@@ -176,10 +176,10 @@ ...@@ -176,10 +176,10 @@
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<th colspan="25" class="bgwhite">酒店使用 </th> <th colspan="26" class="bgwhite">酒店使用 </th>
</tr> </tr>
<tr> <tr>
<th colspan="25" class="bgwhite"> <th colspan="26" class="bgwhite">
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br /> 税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br /> 税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br />
司导间【月结】不计入总金额 司导间【月结】不计入总金额
...@@ -188,6 +188,7 @@ ...@@ -188,6 +188,7 @@
<tr class="title"> <tr class="title">
<th width="90">使用时间</th> <th width="90">使用时间</th>
<th width="150">酒店名称</th> <th width="150">酒店名称</th>
<th width="150">手配书</th>
<th width="150">更换酒店</th> <th width="150">更换酒店</th>
<th width="70">占床<br />不占床</th> <th width="70">占床<br />不占床</th>
<th width="70">实际<br />用房数</th> <th width="70">实际<br />用房数</th>
...@@ -226,6 +227,9 @@ ...@@ -226,6 +227,9 @@
{{subItem.HotelName}} {{subItem.HotelName}}
</template> </template>
</td> </td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
<a target="_blank" v-if="subItem.ContractUrl!==''" :href="subItem.ContractUrl" style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
</td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; "> <td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; ">
{{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}} {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
</td> </td>
...@@ -684,7 +688,7 @@ ...@@ -684,7 +688,7 @@
<input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn" <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
@click="goZhiDan(item, 2)" /> @click="goZhiDan(item, 2)" />
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top"> <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn" <input type="button" v-if="item.hideZDBtn && ContractUrlCount == 0" value="制单" class="normalBtn"
@click="goZhiDan(item,0,leadr,cur)" /> @click="goZhiDan(item,0,leadr,cur)" />
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -823,6 +827,7 @@ ...@@ -823,6 +827,7 @@
currencyTypeObj: [], currencyTypeObj: [],
//判断是否显示人民币 //判断是否显示人民币
IsShowRMB: false, IsShowRMB: false,
ContractUrlCount: 1
} }
}, },
components: { components: {
...@@ -1308,6 +1313,7 @@ ...@@ -1308,6 +1313,7 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.list = res.data.data; this.list = res.data.data;
this.ContractUrlCount = res.data.data.ContractUrlCount;
this.UseCount = this.list.UseCount; this.UseCount = this.list.UseCount;
if (this.list.OtherOrderReportList.OtherList && this.list.OtherOrderReportList.OtherList.length > 0) { if (this.list.OtherOrderReportList.OtherList && this.list.OtherOrderReportList.OtherList.length > 0) {
this.list.OtherOrderReportList.OtherList.forEach(x => { this.list.OtherOrderReportList.OtherList.forEach(x => {
......
src/components/SalesModule/customerMap.vue
View file @ 933edeb8
...@@ -14,15 +14,8 @@ export default { ...@@ -14,15 +14,8 @@ export default {
data() { data() {
return { return {
map: {}, map: {},
baiduMapData: [ baiduMapData: [],
{ lng: 120.03469, lat: 30.303904, type: 2}, centerP: null
{ lng: 120.088499, lat: 30.275182, type: 2},
{ lng: 120.089249, lat: 30.317759, type: 0},
{ lng: 120.161941, lat: 30.283073, type: 0 },
{ lng: 120.174941, lat: 30.275073, type: 0 },
{ lng: 120.186941, lat: 30.297073, type: 1 },
{ lng: 120.198941, lat: 30.299073, type: 1 },
]
}; };
}, },
methods: { methods: {
...@@ -35,8 +28,8 @@ export default { ...@@ -35,8 +28,8 @@ export default {
maxZoom: 20, maxZoom: 20,
}); });
//设置中心点、默认缩放层级 //设置中心点、默认缩放层级
if (data.length > 0) { if (_this.centerP) {
map.centerAndZoom(new BMap.Point(data[0].lng, data[0].lat), 10); map.centerAndZoom(new BMap.Point(_this.centerP.Lng, _this.centerP.Lat), 10);
} else { } else {
map.centerAndZoom(new BMap.Point(104.0727017791, 30.6643622306), 10); map.centerAndZoom(new BMap.Point(104.0727017791, 30.6643622306), 10);
} }
...@@ -46,82 +39,82 @@ export default { ...@@ -46,82 +39,82 @@ export default {
const markerClusterers = [[], [], []] const markerClusterers = [[], [], []]
points.forEach(item => { points.forEach(item => {
//实例化点 //实例化点
const point = new BMap.Point(item.lng, item.lat) const point = new BMap.Point(item.Lng, item.Lat)
//自定义点的样式 //自定义点的样式
// type 0 激活 绿色 20191125015057879 // type 0 激活 绿色 20191125022113414
// 1 未拜访 紫色 20191125015102111 // 1 未拜访 紫色 20191125022118834
// 2 未激活 红色 20191125015100234 // 2 未激活 蓝色 20191125022116319
const icon = new BMap.Icon( const icon = new BMap.Icon(
item.type === 0 ? 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015057879.png' : item.type === 1 ? 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015102111.png' : 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015100234.png', item.type === 0 ? 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022113414.png' : item.type === 1 ? 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022118834.png' : 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022116319.png',
new BMap.Size(30, 30) new BMap.Size(34, 34)
); );
//生成点标注 //生成点标注
const marker = new BMap.Marker(point, { icon: icon }); const marker = new BMap.Marker(point, { icon: icon });
// const infoWindow = new BMap.InfoWindow('简易的信息窗口') // const infoWindow = new BMap.InfoWindow('简易的信息窗口')
//绑定事件，显示窗口 //绑定事件，显示窗口
marker.addEventListener("click", function(){ // marker.addEventListener("click", function(){
_this.markerClick(point, item) // _this.markerClick(point, item)
// map.openInfoWindow(infoWindow,point); // // map.openInfoWindow(infoWindow,point);
}); // });
markerClusterers[item.type || 0].push(marker) markerClusterers[item.type || 0].push(marker)
//添加点标注即添加覆盖物 //添加点标注即添加覆盖物
map.addOverlay(marker); map.addOverlay(marker);
}) })
// //2种聚合的实现 // //2种聚合的实现
const size = new BMap.Size( 30, 30 ) const size = new BMap.Size( 34, 34 )
var markerClusterer1 = new window.BMapLib.MarkerClusterer(map, { var markerClusterer1 = new window.BMapLib.MarkerClusterer(map, {
markers: markerClusterers[1], markers: markerClusterers[1],
styles: [{ styles: [{
url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015102111.png', url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022118834.png',
size: size, size: size,
textSize: 18, textSize: 18,
textColor: 'white', textColor: 'white',
}, { }, {
url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015102111.png', url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022118834.png',
size: size, size: size,
textSize: 18, textSize: 16,
textColor: 'white', textColor: 'white',
}, { }, {
url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015102111.png', url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022118834.png',
size: size, size: size,
textSize: 18, textSize: 14,
textColor: 'white', textColor: 'white',
}] }]
}) })
var markerClusterer2 = new window.BMapLib.MarkerClusterer(map, { var markerClusterer2 = new window.BMapLib.MarkerClusterer(map, {
markers: markerClusterers[2], markers: markerClusterers[2],
styles: [{ styles: [{
url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015100234.png', url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022116319.png',
size: size, size: size,
textSize: 18, textSize: 18,
textColor: 'white', textColor: 'white',
}, { }, {
url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015100234.png', url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022116319.png',
size: size, size: size,
textSize: 18, textSize: 16,
textColor: 'white', textColor: 'white',
}, { }, {
url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015100234.png', url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022116319.png',
size: size, size: size,
textSize: 18, textSize: 14,
textColor: 'white', textColor: 'white',
}] }]
}) })
var markerClusterer4 = new window.BMapLib.MarkerClusterer(map, { markers: markerClusterers[0], var markerClusterer4 = new window.BMapLib.MarkerClusterer(map, { markers: markerClusterers[0],
styles: [{ styles: [{
url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015057879.png', url:'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022113414.png',
size: size, size: size,
textSize: 18, textSize: 18,
textColor: 'white', textColor: 'white',
}, { }, {
url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015057879.png', url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022113414.png',
size: size, size: size,
textSize: 18, textSize: 16,
textColor: 'white', textColor: 'white',
}, { }, {
url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125015057879.png', url: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191125022113414.png',
size: size, size: size,
textSize: 18, textSize: 14,
textColor: 'white', textColor: 'white',
}] }) }] })
this.map = map this.map = map
...@@ -141,7 +134,31 @@ export default { ...@@ -141,7 +134,31 @@ export default {
} }
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage();
let RB_Branch_id = userInfo.RB_Branch_id;
this.apipost('admin_get_GetBranchLngLat', {BranchId: RB_Branch_id}, r=>{
if (r.data.resultCode == 1) {
this.centerP = r.data.data[0]
}
})
this.apipost('financestatistics_post_GetB2BBoardClientAddressList', {BranchId: RB_Branch_id, ProvinceName: ''}, r=>{
if (r.data.resultCode == 1) {
console.log(r.data.data)
let data = r.data.data
data.ActivateList.map(x=>{
x.type = 0
})
data.InActiveList.map(x=>{
x.type = 2
})
data.NotVisit.map(x=>{
x.type = 1
})
let baiduMapData = [...data.ActivateList, ...data.InActiveList, ...data.NotVisit]
this.baiduMapData = baiduMapData
this.creatMap() this.creatMap()
} }
})
}
}; };
</script> </script>
\ No newline at end of file
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