Skip to content

S
SuperMan
Commit 49cd2fab authored by youjie's avatar youjie
Browse files
Options

no message

parents f47927c8 cc8f9fc2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2367 additions and 2229 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 49cd2fab
......@@ -350,7 +350,8 @@
<div class="illustrate-text">
<p class="illustrate-left">附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0" @click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span>
<span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
<span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="(GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64" @click="GoOPurl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
<span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
<span v-if="GetDetail.OtherType==6" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
......@@ -369,6 +370,18 @@
<div v-if="GetDetail.OtherType==56||GetDetail.OtherType==57"
class="illustrate-right fygsbumen-box-right"
@click="ImpressionTicketDetails('ImpressionTicketUserDetails')">{{GetDetail.OtherType==56?'票务提成详情':'票务工资详情'}}</div>
<div v-if="GetDetail.OtherType==61||GetDetail.OtherType==62" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails('singleProductHotelOrderOP')">{{'单项酒店订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==66" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails('SingleticketOrderListOP')">{{'单项门票订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==67" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails('SingleCarOrderListOP')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div>
<div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',2)">{{'单项OP提成详情'}}</div>
</div>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
<tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
......@@ -1558,6 +1571,28 @@ export default {
},
methods:{
// 单项服务提成
ImpressionSingleCommissionDetails(path,type){
this.$router.push({
path: path,
query: {
PeriodId: this.GetDetail.ReFinanceId,
Type:type,
blank: 'y',
tab: '单项服务提现详情'
}
});
},
// 单项酒店订单
ImpressionSingleDetails(path){
this.$router.push({
path: path,
query: {
OrderId: this.GetDetail.ReFinanceId,
blank: 'y'
}
});
},
// 印象票务制单详情
ImpressionTicketDetails(path){
this.$router.push({
......@@ -1663,6 +1698,19 @@ export default {
},
GoOPurl(GetDetail){
this.$router.push({
name: 'OpComPersonDetails',
query: {
EmployeeId:GetDetail.AccountEmployeeId,
PeriodsId:GetDetail.OPPeriodsId,
RB_Branch_Id:GetDetail.RB_Branch_Id,
blank: "y",
tab: "op提成明细"
}
});
},
Gourl(GetDetail){
if(GetDetail.OtherType==43){//9月9号新增 如果是43 就跳转到国内的详情 反之按之前的来用
this.$router.push({
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 49cd2fab
......@@ -418,8 +418,8 @@
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==15" @click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商采购单:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==16" @click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商出库单:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17" @click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
<span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState" @click="GoOPurl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="(GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64" @click="GoOPurl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
<span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
<span v-if="GetDetail.OtherType==5" @click="GourlHotelZr" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">酒店折让</span>
......@@ -438,6 +438,18 @@
<div v-if="GetDetail.OtherType==56||GetDetail.OtherType==57"
class="illustrate-right fygsbumen-box-right"
@click="ImpressionTicketDetails('ImpressionTicketUserDetails')">{{GetDetail.OtherType==56?'票务提成详情':'票务工资详情'}}</div>
<div v-if="GetDetail.OtherType==61||GetDetail.OtherType==62" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails('singleProductHotelOrderOP')">{{'单项酒店订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==66" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails('SingleticketOrderListOP')">{{'单项门票订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==67" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails('SingleCarOrderListOP')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div>
<div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',2)">{{'单项OP提成详情'}}</div>
</div>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
......@@ -1022,6 +1034,28 @@ export default {
}
},
methods:{
// 单项服务提成
ImpressionSingleCommissionDetails(path,type){
this.$router.push({
path: path,
query: {
PeriodId: this.GetDetail.ReFinanceId,
Type:type,
blank: 'y',
tab: '单项服务提现详情'
}
});
},
// 单项酒店订单
ImpressionSingleDetails(path){
this.$router.push({
path: path,
query: {
OrderId: this.GetDetail.ReFinanceId,
blank: 'y'
}
});
},
// 印象票务制单详情
ImpressionTicketDetails(path){
this.$router.push({
......
src/components/Hotel/reservation/HotelOrderList.vue
View file @ 49cd2fab
......@@ -171,11 +171,15 @@
},
methods: {
getDates(){
console.log(this.Datelist)
if(this.Datelist[0]){
this.msg.StartTime = this.Datelist[0]
}if(this.Datelist[1]){
this.msg.EndTime = this.Datelist[1]
if(this.Datelist){
if(this.Datelist[0]){
this.msg.StartTime = this.Datelist[0]
}if(this.Datelist[1]){
this.msg.EndTime = this.Datelist[1]
}
}else{
this.msg.StartTime = ''
this.msg.EndTime = ''
}
},
setEdate() {
......
src/components/busManagement/CharteringManagement/CharteringInfoManage.vue
View file @ 49cd2fab
......@@ -719,6 +719,14 @@
border-bottom-right-radius: 0 !important;
}
</style>
<style scoped>
.underline {
border-bottom: 1px dotted #d1d1d1;
margin-bottom: 14px;
width: 450px;
}
</style>
<template>
<div class="flexOne scenicSpotInfoManage">
<div class="resource-content clearfix">
......@@ -739,37 +747,28 @@
<el-input type="textarea" maxlength="300" v-model="addMsg.Description" class="w300"></el-input>
</el-form-item>
<template v-for="(item, index) in addMsg.CityList">
<el-form-item label="国家" :prop="`CityList.${index}.Country`" :rules="rules.Country">
<el-select placeholder="请选择国家" filterable v-model="item.Country" class='multiple_input w300'
<el-form-item label="所在城市" :prop="`CityList.${index}.Country`" :rules="rules.Country">
<el-select placeholder="国家" filterable v-model="item.Country" class='multiple_input w100'
@change="GetSubAreaList(item.Country, 1), item.Province = '', item.City = '', item.District = ''">
<el-option v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="省" :prop="`CityList.${index}.Province`" :rules="rules.Province">
<el-select placeholder="请选择省" filterable class='multiple_input w300' v-model="item.Province"
<el-select placeholder="省" filterable class='multiple_input w100' v-model="item.Province"
@change="GetSubAreaList(item.Province, 2), item.City = '', item.District = ''">
<el-option v-for="childItem in ProvinceList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="市" :prop="`CityList.${index}.City`" :rules="rules.City">
<el-select placeholder="请选择市" filterable
<el-select placeholder="市" filterable
@change="GetSubAreaList(item.City, 3), item.District = '', getaAirport(item.City, false)"
class='multiple_input w300' v-model="item.City">
class='multiple_input w100' v-model="item.City">
<el-option v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="区" prop="District" v-if="item.City>0">
<el-select v-model="item.District" class="w300" @change="getArea" filterable :placeholder="$t('hotel.hotel_area')">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in district" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="包车时长" prop="TravelHours" v-if="addMsg.CarType == 3">
<el-input type="Number" placeholder="请输入包车时长" class="w300 addAddress" :min="0"
v-model="addMsg.TravelHours">
......@@ -805,18 +804,18 @@
<i v-else class="el-icon-delete addlist" @click="clickAirport(index)"></i>
</div>
</el-form-item>
<el-form-item :label="`机场(IATA)${index + 1}`" :prop="`AirportList.${index}.Name`" :rules="rules.Name2">
<el-form-item :label="`机场航站楼${index + 1}`" :prop="`AirportList.${index}.Name`" :rules="rules.Name2">
{{ item.AirportName }}
<el-input maxlength="100" placeholder="请输入机场地址(IATA)" class="w300 addAddress"
<el-input maxlength="100" placeholder="请输入机场航站楼" class="w300 addAddress"
v-model="item.Name"></el-input>
</el-form-item>
<el-form-item :label="`机场详细地址${index + 1}`" :prop="`AirportList.${index}.Address`" :rules="rules.Address">
<el-input maxlength="600" placeholder="请输入机场详细地址" class="w300 addAddress" v-model="item.Address">
<el-button slot="append" @click="clickMapAddress(1, item.Address, index)"
<el-button slot="append" @click="clickMapAddress(1, index, item.Address)"
icon="iconfont icon-img_dw"></el-button>
</el-input>
</el-form-item>
<div class="toolOne" style="margin: 0 0 28px 13px;">
<div class="toolOne" style="margin: 0 0 14px 13px;">
<span class="fanbili">机场地理位置{{ index+ 1}}</span>
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
......@@ -829,6 +828,7 @@
</div>
</div>
</div>
<div class="underline"></div>
</div>
</template>
<span class="resource-lititle sheshi" style="width: 100%;">
......
src/components/busManagement/CharteringManagement/components/Map.vue
View file @ 49cd2fab
<template>
<div>
<div style="text-align: center;display: flex;justify-content: center;">
<el-input class="w300" style="margin-right: 10px;" id="suggestId" v-model="city"
placeholder="请输入需要检索的地名" name="address_detail" @input="search"/>
<el-input class="w300" style="margin-right: 10px;" id="suggestId" v-model="city" placeholder="请输入需要检索的地名"
name="address_detail" @input="search" />
<!-- <input type="button" class="normalBtn sureBtn" value="搜索" @click="search"/> -->
</div>
<div style="height: 310px;width: 100%;margin-top: 15px;" :id="`allmap_${id}${type}_${index}`"></div>
<div style="margin-top: 10px;" v-if="address_detail">已选地址：{{address_detail}}</div>
<div style="margin-top: 10px;" v-if="address_detail">已选地址：{{ address_detail }}</div>
<div class="btnList">
<input type="button" class="normalBtn sureBtn" value="确定" @click="sendMsg"/>
<input type="button" class="hollowFixedBtn" value="取消" @click="closeDialog"/>
<input type="button" class="normalBtn sureBtn" value="确定" @click="sendMsg" />
<input type="button" class="hollowFixedBtn" value="取消" @click="closeDialog" />
</div>
</div>
</template>
<script>
export default {
props: ["Address","id","type","index"],
data(){
return{
props: ["Address", "id", "type", "index"],
data() {
return {
city: '',
address_detail: null, //详细地址
userlocation: null,
dataList: null,
point: {
lng:'',
lng: '',
lat: ''
},
}
},
watch: {
Address: {
handler(newValue) {
this.city = this.Address
if(!newValue){
this.getcity()
}else{
this.search()
}
},
immediate: true
handler(newValue) {
this.city = this.Address
if (!newValue) {
this.getcity()
} else {
this.search()
}
},
immediate: true
},
},
mounted() {
this.city = this.Address
this.getcity()
},
methods:{
methods: {
closeDialog() {
this.$emit("refList");
},
sendMsg() {
if (!this.point.lng) {
this.Error("请点击地图上你需要选择的地址");
} else {
this.$emit("headCallBack", this.point,this.type,this.index,this.address_detail);
this.$emit("refList");
}
},
search(){
if (!this.point.lng) {
this.Error("请点击地图上你需要选择的地址");
} else {
this.$emit("headCallBack", this.point, this.type, this.index, this.address_detail);
this.$emit("refList");
}
},
search() {
var that = this
var map = new BMap.Map(`allmap_${that.id}${that.type}_${that.index}`)
var map = new BMap.Map(`allmap_${that.id}${that.type}_${that.index}`, { enableMapClick: false })
var local = new BMap.LocalSearch(map, { // 智能搜索
onSearchComplete: function (){
if(local.getResults()&&local.getResults().getPoi(0)&&local.getResults().getPoi(0).point){
onSearchComplete: function () {
if (local.getResults() && local.getResults().getPoi(0) && local.getResults().getPoi(0).point) {
that.userlocation = local.getResults().getPoi(0).point // 获取第一个智能搜索的结果
that.point.lat = that.userlocation.lat
that.point.lng = that.userlocation.lng
......@@ -73,81 +73,81 @@ export default {
}
})
local.search(that.city)
map.addEventListener('click', function(e,target) {
// var point = new BMap.Point(e.point.lng, e.point.lat) // 创建点坐标，汉得公司的经纬度坐标
// map.centerAndZoom(point, 11)
// that.point = e.point
map.addEventListener('click', function (e, target) {
// var point = new BMap.Point(e.point.lng, e.point.lat) // 创建点坐标，汉得公司的经纬度坐标
// map.centerAndZoom(point, 11)
// that.point = e.point
})
var gc = new BMap.Geocoder();
map.addEventListener('mousedown', function(type) {
map.addEventListener('mousedown', function (type) {
var pt = type.point;
gc.getLocation(pt, function(rs){
var addComp = rs.addressComponents;
that.address_detail = addComp.province + ", " + addComp.city + ", " + addComp.district + ", " + addComp.street + ", " + addComp.streetNumber
})
gc.getLocation(pt, function (rs) {
var addComp = rs.addressComponents;
that.address_detail = addComp.province + ", " + addComp.city + ", " + addComp.district + ", " + addComp.street + ", " + addComp.streetNumber
})
})
},
getcity(){
this.$nextTick(function() {
getcity() {
this.$nextTick(function () {
var that = this
// 创建Map实例
var map = new BMap.Map(`allmap_${that.id}${that.type}_${that.index}`)
var map = new BMap.Map(`allmap_${that.id}${that.type}_${that.index}`, { enableMapClick: false })
// 获取当前位置
var geolocation = new BMap.Geolocation();
geolocation.getCurrentPosition(function(r){
if(r){
geolocation.getCurrentPosition(function (r) {
if (r) {
var mk = new BMap.Marker(r.point);
map.addOverlay(mk);
map.panTo(r.point);
// map.mapClick = false
that.address_detail = addComp.province + "" + addComp.city + "" + addComp.district + "" + addComp.street + "" + addComp.streetNumber
that.point.lng = r.point.lng
that.point.lat = r.point.lat
console.log(that.address_detail,'城市===')
console.log('您的位置：'+r.point.lng+','+r.point.lat);
console.log(that.address_detail, '城市===')
console.log('您的位置：' + r.point.lng + ',' + r.point.lat);
}
else {
console.log('failed');
}
}
});
// 点击地图
map.addEventListener('click', function(e,target) {
map.addEventListener('click', function (e, target) {
// var point = new BMap.Point(e.point.lng, e.point.lat) // 创建点坐标，汉得公司的经纬度坐标
// map.centerAndZoom(point, 11)
// that.point = e.point
})
var gc = new BMap.Geocoder();
map.addEventListener('mousedown', function(type) {
map.centerAndZoom(type.point, 11)
map.addEventListener('mousedown', function (type) {
// map.centerAndZoom(type.point, 11)
that.point = type.point
var pt = type.point;
gc.getLocation(pt, function(rs){
gc.getLocation(pt, function (rs) {
var addComp = rs.addressComponents;
that.address_detail = addComp.province + "" + addComp.city + "" + addComp.district + "" + addComp.street + "" + addComp.streetNumber
})
})
// 初始化地图,设置中心点坐标，
if(that.point.lat){
if (that.point.lat) {
var point = new BMap.Point(that.point.lat, that.point.lng) // 创建点坐标
map.centerAndZoom(point, 11)
}else{
map.centerAndZoom(new BMap.Point(104.073652,30.664369), 11);
} else {
map.centerAndZoom(new BMap.Point(104.073652, 30.664369), 11);
}
map.enableScrollWheelZoom()
if(that.Address){
if (that.Address) {
that.search()
}
})
},
}
}
}
</script>
<style scoped>
.btnList {
margin: 15px 0 0 auto;
text-align: right;
margin-bottom: 15px;
}
.btnList {
margin: 15px 0 0 auto;
text-align: right;
margin-bottom: 15px;
}
</style>
\ 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