Skip to content

S
SuperMan
Commit 52a16e5f authored by 王悦's avatar 王悦
Browse files
Options

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

parents 868f355b 954b1705
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 408 additions and 148 deletions
index.html
View file @ 52a16e5f
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script> <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script>
<script type="text/javascript" src="http://api.map.baidu.com/library/CurveLine/1.5/src/CurveLine.min.js"></script> <script type="text/javascript" src="http://api.map.baidu.com/library/CurveLine/1.5/src/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script> <script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
<script src="http://code.jquery.com/jquery-2.1.1.min.js"></script>
<title>四川和平国际旅行社</title> <title>四川和平国际旅行社</title>
</head> </head>
<body> <body>
......
src/assets/css/feture2.css
View file @ 52a16e5f
...@@ -69,6 +69,8 @@ div{ ...@@ -69,6 +69,8 @@ div{
font-family: SimSun; font-family: SimSun;
font-size: 60px; font-size: 60px;
color: #000000; color: #000000;
position: relative;
z-index: 5;
} }
.hotel_1_header>.hotel_1_header_title>div:nth-child(2){ .hotel_1_header>.hotel_1_header_title>div:nth-child(2){
margin: auto; margin: auto;
...@@ -92,6 +94,8 @@ div{ ...@@ -92,6 +94,8 @@ div{
text-align: center; text-align: center;
font-family: SimSun; font-family: SimSun;
font-size: 34px; font-size: 34px;
position: relative;
z-index: 5;
} }
.hotel_1_header>.hotel_1_header_title>div:nth-child(2)>img:nth-child(3){ .hotel_1_header>.hotel_1_header_title>div:nth-child(2)>img:nth-child(3){
position: absolute; position: absolute;
...@@ -231,6 +235,8 @@ div{ ...@@ -231,6 +235,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.hotel_1_info_1_info>.hotel_1_info_1_info_right>div:nth-child(2){ .hotel_1_info_1_info>.hotel_1_info_1_info_right>div:nth-child(2){
margin: 12px 0; margin: 12px 0;
...@@ -249,6 +255,8 @@ div{ ...@@ -249,6 +255,8 @@ div{
font-size: 16px; font-size: 16px;
line-height: 25px; line-height: 25px;
color: #535353; color: #535353;
position: relative;
z-index: 5;
} }
.hotel_1_info_2{ .hotel_1_info_2{
...@@ -375,6 +383,8 @@ div{ ...@@ -375,6 +383,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.hotel_1_info_2_bottom>.hotel_1_info_2_bottom_right>div:nth-child(2){ .hotel_1_info_2_bottom>.hotel_1_info_2_bottom_right>div:nth-child(2){
margin: 12px 0; margin: 12px 0;
...@@ -434,6 +444,8 @@ div{ ...@@ -434,6 +444,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.hotel_2_info_1>.hotel_2_info_1_content>div:nth-child(2){ .hotel_2_info_1>.hotel_2_info_1_content>div:nth-child(2){
margin: 12px 0; margin: 12px 0;
...@@ -452,6 +464,8 @@ div{ ...@@ -452,6 +464,8 @@ div{
font-size: 16px; font-size: 16px;
line-height: 25px; line-height: 25px;
color: #535353; color: #535353;
position: relative;
z-index: 5;
} }
.hotel_2_info_1>.hotel_2_info_1_img{ .hotel_2_info_1>.hotel_2_info_1_img{
...@@ -617,6 +631,8 @@ div{ ...@@ -617,6 +631,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.hotel_2_info_2_top>.hotel_2_info_2_top_right>div:nth-child(2){ .hotel_2_info_2_top>.hotel_2_info_2_top_right>div:nth-child(2){
margin: 12px 0; margin: 12px 0;
...@@ -635,6 +651,8 @@ div{ ...@@ -635,6 +651,8 @@ div{
font-size: 16px; font-size: 16px;
line-height: 25px; line-height: 25px;
color: #535353; color: #535353;
position: relative;
z-index: 5;
} }
.hotel_2_info_2>.hotel_2_info_2_bottom{ .hotel_2_info_2>.hotel_2_info_2_bottom{
...@@ -721,6 +739,8 @@ div{ ...@@ -721,6 +739,8 @@ div{
font-family: SimSun; font-family: SimSun;
font-size: 52px; font-size: 52px;
color: #000000; color: #000000;
position: relative;
z-index: 5;
} }
.viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(1)>div:nth-child(2){ .viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(1)>div:nth-child(2){
display: inline-block; display: inline-block;
...@@ -733,6 +753,8 @@ div{ ...@@ -733,6 +753,8 @@ div{
font-family: SimSun; font-family: SimSun;
font-size: 70px; font-size: 70px;
color: #000000; color: #000000;
position: relative;
z-index: 5;
} }
.viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(1)>div:nth-child(3){ .viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(1)>div:nth-child(3){
display: inline-block; display: inline-block;
...@@ -741,6 +763,8 @@ div{ ...@@ -741,6 +763,8 @@ div{
font-family: SimSun; font-family: SimSun;
font-size: 52px; font-size: 52px;
color: #000000; color: #000000;
position: relative;
z-index: 5;
} }
.viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(2){ .viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(2){
margin: auto; margin: auto;
...@@ -763,6 +787,8 @@ div{ ...@@ -763,6 +787,8 @@ div{
text-align: center; text-align: center;
font-family: SimSun; font-family: SimSun;
font-size: 14px; font-size: 14px;
position: relative;
z-index: 5;
} }
.viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(2)>img:nth-child(3){ .viewSpot_1_header>.viewSpot_1_header_title>div:nth-child(2)>img:nth-child(3){
position: absolute; position: absolute;
...@@ -855,6 +881,8 @@ div{ ...@@ -855,6 +881,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.viewSpot_1_info_1_info>.viewSpot_1_info_1_info_right>div:nth-child(2){ .viewSpot_1_info_1_info>.viewSpot_1_info_1_info_right>div:nth-child(2){
margin: 10px 0 0 0; margin: 10px 0 0 0;
...@@ -1020,6 +1048,8 @@ div{ ...@@ -1020,6 +1048,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.viewSpot_1_info_2_bottom>.viewSpot_1_info_2_bottom_right>div:nth-child(2){ .viewSpot_1_info_2_bottom>.viewSpot_1_info_2_bottom_right>div:nth-child(2){
margin: 12px 0; margin: 12px 0;
...@@ -1038,6 +1068,8 @@ div{ ...@@ -1038,6 +1068,8 @@ div{
font-size: 16px; font-size: 16px;
line-height: 25px; line-height: 25px;
color: #535353; color: #535353;
position: relative;
z-index: 5;
} }
/* 景点2 */ /* 景点2 */
...@@ -1101,6 +1133,8 @@ div{ ...@@ -1101,6 +1133,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.viewSpot_2_info_1_info>.viewSpot_2_info_1_info_right>div:nth-child(2){ .viewSpot_2_info_1_info>.viewSpot_2_info_1_info_right>div:nth-child(2){
width: 100%; width: 100%;
...@@ -1261,6 +1295,8 @@ div{ ...@@ -1261,6 +1295,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.viewSpot_2_info_2>.viewSpot_2_info_2_info_1>div:nth-child(2){ .viewSpot_2_info_2>.viewSpot_2_info_2_info_1>div:nth-child(2){
width: 100%; width: 100%;
...@@ -1298,6 +1334,8 @@ div{ ...@@ -1298,6 +1334,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.viewSpot_2_info_2>.viewSpot_2_info_2_info_2>div:nth-child(2){ .viewSpot_2_info_2>.viewSpot_2_info_2_info_2>div:nth-child(2){
display: inline-block; display: inline-block;
...@@ -1338,6 +1376,8 @@ div{ ...@@ -1338,6 +1376,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.viewSpot_2_info_2>.viewSpot_2_info_2_info_3>div:nth-child(2){ .viewSpot_2_info_2>.viewSpot_2_info_2_info_3>div:nth-child(2){
width: 100%; width: 100%;
...@@ -1550,6 +1590,8 @@ div{ ...@@ -1550,6 +1590,8 @@ div{
font-family: SimSun; font-family: SimSun;
font-size: 52px; font-size: 52px;
color: #000000; color: #000000;
position: relative;
z-index: 5;
} }
.restaurant_1_header>.restaurant_1_header_title>div:nth-child(1)>div:nth-child(2){ .restaurant_1_header>.restaurant_1_header_title>div:nth-child(1)>div:nth-child(2){
display: inline-block; display: inline-block;
...@@ -1562,6 +1604,8 @@ div{ ...@@ -1562,6 +1604,8 @@ div{
font-family: SimSun; font-family: SimSun;
font-size: 70px; font-size: 70px;
color: #000000; color: #000000;
position: relative;
z-index: 5;
} }
.restaurant_1_header>.restaurant_1_header_title>div:nth-child(1)>div:nth-child(3){ .restaurant_1_header>.restaurant_1_header_title>div:nth-child(1)>div:nth-child(3){
display: inline-block; display: inline-block;
...@@ -1570,6 +1614,8 @@ div{ ...@@ -1570,6 +1614,8 @@ div{
font-family: SimSun; font-family: SimSun;
font-size: 52px; font-size: 52px;
color: #000000; color: #000000;
position: relative;
z-index: 5;
} }
.restaurant_1_header>.restaurant_1_header_title>div:nth-child(2){ .restaurant_1_header>.restaurant_1_header_title>div:nth-child(2){
margin: auto; margin: auto;
...@@ -1592,6 +1638,8 @@ div{ ...@@ -1592,6 +1638,8 @@ div{
text-align: center; text-align: center;
font-family: SimSun; font-family: SimSun;
font-size: 14px; font-size: 14px;
position: relative;
z-index: 5;
} }
.restaurant_1_header>.restaurant_1_header_title>div:nth-child(2)>img:nth-child(3){ .restaurant_1_header>.restaurant_1_header_title>div:nth-child(2)>img:nth-child(3){
position: absolute; position: absolute;
...@@ -1684,6 +1732,8 @@ div{ ...@@ -1684,6 +1732,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.restaurant_1_info_1_info>.restaurant_1_info_1_info_right>div:nth-child(2){ .restaurant_1_info_1_info>.restaurant_1_info_1_info_right>div:nth-child(2){
margin: 10px 0 0 0; margin: 10px 0 0 0;
...@@ -1841,6 +1891,8 @@ div{ ...@@ -1841,6 +1891,8 @@ div{
font-size: 30px; font-size: 30px;
line-height: 30px; line-height: 30px;
color: #222222; color: #222222;
position: relative;
z-index: 5;
} }
.restaurant_1_info_2_right_bottom>.restaurant_1_info_2_right_bottom_right>div:nth-child(2){ .restaurant_1_info_2_right_bottom>.restaurant_1_info_2_right_bottom_right>div:nth-child(2){
margin: 12px 0; margin: 12px 0;
......
src/components/BusExport.vue
View file @ 52a16e5f
...@@ -5,14 +5,15 @@ ...@@ -5,14 +5,15 @@
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
margin-top:10px; margin-top:10px;
font-size:16px;
} }
.Bus_Content{ .Bus_Content{
width:800px; width:100%;
height:auto; height:auto;
margin:auto; margin:auto;
} }
.Bus_detailTable { .Bus_detailTable {
width: 100%; width: 800px;
font-size: 12px; font-size: 12px;
color: #333; color: #333;
margin: 10px auto; margin: 10px auto;
...@@ -24,11 +25,14 @@ ...@@ -24,11 +25,14 @@
.Bus_detailTable td { .Bus_detailTable td {
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
padding: 3px 10px; padding: 3px 10px;
font-size:16px;
} }
.Bus_detailTable th { .Bus_detailTable th {
background-color: #fff; background-color: #fff;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
font-size:16px;
font-weight:bold;
} }
.txLeft{ .txLeft{
text-align: left; text-align: left;
...@@ -42,6 +46,9 @@ ...@@ -42,6 +46,9 @@
.totalTabal td{ .totalTabal td{
height:33px; height:33px;
} }
/* body{
min-width: 100%!important;
} */
</style> </style>
<template> <template>
...@@ -79,7 +86,7 @@ ...@@ -79,7 +86,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="Bus_detailTable totalTabal" style="page-break-before: always;margin: 0px;"> <table class="Bus_detailTable totalTabal" style="border:0px;page-break-before:always;margin:0 auto;">
<tr> <tr>
<td class="txRight" colspan="4"> <td class="txRight" colspan="4">
<div style="width:275px;text-align:right;float:right;">{{Year}}年{{Month}}月应付公社车资：</div> <div style="width:275px;text-align:right;float:right;">{{Year}}年{{Month}}月应付公社车资：</div>
...@@ -105,7 +112,7 @@ ...@@ -105,7 +112,7 @@
</tr> </tr>
</table> </table>
<table class="Bus_detailTable" v-for="item in dataList" style="margin: 0px;page-break-before: always;"> <table class="Bus_detailTable" v-for="item in dataList" style="margin: 5px auto;border:0px;page-break-before:always;">
<tr> <tr>
<th>做账主体</th> <th>做账主体</th>
<th width="200">团号</th> <th width="200">团号</th>
...@@ -164,11 +171,10 @@ ...@@ -164,11 +171,10 @@
getList(){ getList(){
this.apipost('bus_get_CarfareApportionExport',this.msg, res => { this.apipost('bus_get_CarfareApportionExport',this.msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
console.log(res,'res');
this.dataList = res.data.data.RObj; this.dataList = res.data.data.RObj;
this.msg.CurrName = res.data.data.CurrName; this.msg.CurrName = res.data.data.CurrName;
this.TotalJan = res.data.data.TotalStatistics.TSumOMoney; this.TotalJan = res.data.data.TotalStatistics.TSumOMoney;
this.TotalCn = res.data.data.TotalStatistics.TSumMoney this.TotalCn = res.data.data.TotalStatistics.TSumMoney;
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/Complaints/ComplaintsDetail.vue
View file @ 52a16e5f
...@@ -236,14 +236,19 @@ ...@@ -236,14 +236,19 @@
</li> </li>
<li <li
v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)"> v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
<span>单据详情：</span> <span>赔偿列表：</span>
<span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)" <span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)"
@click="setFinance(compensation)">{{compensation.CompensateMoney}}</span> @click="setFinance(compensation)">{{compensation.CompensateMoney}}</span>
</li> </li>
<li <li
v-if="ComplainInfo.DisposeStatus===4&&getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy"> v-if="ComplainInfo.DisposeStatus===4&&getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy">
</li> </li>
<li>{{ComplainInfo.Description}}</li> <li></li>
</ul>
<ul>
<li style="height:auto;line-height: 20px;padding:5px 0;">
<p>{{ComplainInfo.Description}}</p>
</li>
</ul> </ul>
</div> </div>
<div class="CD_Conditions"> <div class="CD_Conditions">
......
src/components/SalesModule/groupTourOrder.vue
View file @ 52a16e5f
...@@ -1595,7 +1595,7 @@ ...@@ -1595,7 +1595,7 @@
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注：</span> <div><span>备注：</span>
<p><span <p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span
v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}} v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}
</p></div> </p></div>
<div> <div>
...@@ -1962,6 +1962,18 @@ ...@@ -1962,6 +1962,18 @@
} }
}, },
methods: { methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
getItem (obj) { getItem (obj) {
this.checkedObj = obj this.checkedObj = obj
}, },
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 52a16e5f
...@@ -1046,20 +1046,20 @@ ...@@ -1046,20 +1046,20 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<!-- <el-form-item label="成交单价" prop="Unit_Price"> <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input> <el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item> --> </el-form-item>
<el-form-item label="成交单价" prop="Unit_Price"> <!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price' <el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()"> filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'> <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item> <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p> <!-- <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> <p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -1616,7 +1616,7 @@ ...@@ -1616,7 +1616,7 @@
<tr> <tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div> <div><span>备注：</span><p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div> <div>
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> --> <!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click"> <el-popover width="600" placement="bottom-end" trigger="click">
...@@ -2305,6 +2305,18 @@ export default { ...@@ -2305,6 +2305,18 @@ export default {
} }
}, },
methods: { methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
maxCommissionMinusRate: function () { maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,''); this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.',''); this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
......
src/components/SalesModule/productQuery.vue
View file @ 52a16e5f
...@@ -933,7 +933,7 @@ ...@@ -933,7 +933,7 @@
CommissionShareMoney: '0', CommissionShareMoney: '0',
OrderForm: '1', OrderForm: '1',
SonControlID: '-1', SonControlID: '-1',
IsShowMessagesMoney: '1' IsShowMessagesMoney: '2'
}, },
employeeMsg: { employeeMsg: {
BranchId: '-1', BranchId: '-1',
...@@ -1704,7 +1704,7 @@ ...@@ -1704,7 +1704,7 @@
this.ScenicRefundMoney = 0; this.ScenicRefundMoney = 0;
this.addMsg.CommissionSharePeople = '-1' this.addMsg.CommissionSharePeople = '-1'
this.addMsg.CommissionShareMoney = '0' this.addMsg.CommissionShareMoney = '0'
this.addMsg.IsShowMessagesMoney = '1' this.addMsg.IsShowMessagesMoney = '2'
this.remarkMsg = { this.remarkMsg = {
zc: '', zc: '',
bzc: '', bzc: '',
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 52a16e5f
...@@ -1091,17 +1091,17 @@ ...@@ -1091,17 +1091,17 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="成交单价" prop="Unit_Price"> <el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price' <!-- <el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()"> filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'> <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select> -->
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> --> <el-input v-model='addMsg.Unit_Price' :disabled="isChecked" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p> <!-- <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> <p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -1707,6 +1707,7 @@ ...@@ -1707,6 +1707,7 @@
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span> <span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
<span v-if="childItem.TsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',childItem.TsId,childItem.OrderId,'投诉详情')">{{childItem.TsId}}</a> ;</span>
<span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单 <span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
{{childItem.PlatformOrder}};</span> {{childItem.PlatformOrder}};</span>
{{childItem.Remarks}} {{childItem.Remarks}}
...@@ -2488,6 +2489,18 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2488,6 +2489,18 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan:updateSalesMan updateSalesMan:updateSalesMan
}, },
methods: { methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
maxCommissionMinusRate: function () { maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,''); this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.',''); this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
......
src/components/confirmationOrderDownLoad.vue
View file @ 52a16e5f
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<div class="travelControlTrip detail-box"> <div class="travelControlTrip detail-box">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div> <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" class="travelControlTripBtn" value="下载PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> <input type="button" class="travelControlTripBtn" value="下载PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input style="display:none;" type="button" class="travelControlTripBtn" value="下载WORD" @click="ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> <input type="button" style="width: auto !important;display:none" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature()" />
<!-- <input type="button" class="travelControlTripBtn" value="下载Word" @click="toWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> --> <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息--> <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" /> <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
<div id="pdfNode"> <div id="pdfNode">
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
<div class="short-line"></div> <div class="short-line"></div>
<div class="english-title">Trip characteristics</div> <div class="english-title">Trip characteristics</div>
</div> </div>
<div v-html="feature.featureHtml"></div> <div v-html="feature.featureHtml" id="gernalCanvas"></div>
</div> </div>
<div id="teamacitvy"> </div> <div id="teamacitvy"> </div>
</div> </div>
...@@ -642,6 +642,86 @@ ...@@ -642,6 +642,86 @@
}, 2000) }, 2000)
}, },
methods: { methods: {
gernalFeature(){
this.pdfLoading = true;
let tcid = this.$route.query.tcid;
let UploadUrl = this.domainManager().UploadUrl
$.ajax({
url: UploadUrl + '/Upload/RemoveImage?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
type: "POST",
datatype:"jsonP",
success: function (data) {
// console.log("上传成功",data);
},
error: function () {
// console.log("上传失败");
}
});
if (this.showType===4 || this.showType===5) {
document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
let src = x.src
src = src.replace('https:','http:')
if(src.indexOf('http')!=-1){
x.setAttribute('crossOrigin','anonymous')
}
x.src = src
});
let cName=''
if(this.showType==4){
cName='.feature-box'
}else if(this.showType==5){
cName='.travle_page'
}
if(cName!=''){
let allNum = 1
document.querySelectorAll(cName).forEach((x, index) => {
html2Canvas(x,{
useCORS:true,
scale:0.7,
backgroundColor:'#FFFFFF',
}).then((canvas) => {
if(canvas){
var context = canvas.getContext('2d')
context.mozImageSmoothingEnabled = false
context.webkitImageSmoothingEnabled = false
context.msImageSmoothingEnabled = false
context.imageSmoothingEnabled = false
var image = new Image();
image.src = canvas.toDataURL("image/png");
// document.body.appendChild(image) upload.oytour.com
$.ajax({
url: UploadUrl + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
type: "POST",
data: {
myfile: image.src,
fileIndex: index
},
datatype:"jsonP",
success: function (data) {
// console.log("上传成功",data);
},
error: function () {
// console.log("上传失败");
}
});
// this.uploadImg(tcid,{'myfile': image.src}, res=>{
// console.log(res)
// }, err=>{
// console.log("GHJK",err);
// })
if (allNum!==document.querySelectorAll(cName).length) {
allNum += 1
} else {
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游')
}
}
});
});
}
}else {
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游')
}
},
//保存基础数据 //保存基础数据
submitForm: function () { submitForm: function () {
this.editForm.travelOrderFlightList.forEach(x => { this.editForm.travelOrderFlightList.forEach(x => {
...@@ -826,9 +906,36 @@ ...@@ -826,9 +906,36 @@
cityId: this.$route.query.cityId, cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid, tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId, orderId: this.$route.query.orderId,
FileName:title FileName:title,
//是否显示基础信息
isShowBase:this.vshowA?1:0,
//是否显示航班
isShowFlight:this.vshowB?1:0,
//是否显示行程特色
isShowFeature:this.vshowC?1:0,
//自费、费用包含、费用不含
isShowFee:this.vshowE?1:0,
//购物说明，购物安排
isShowShop:this.vshowF?1:0,
//重要提示、温馨提示
isShowTip:this.vshowG?1:0,
//是否显示同行备注
isShowB2B:this.vshowI?1:0,
//是否显示行程
isShowTrip:this.vshowK?1:0,
//是否显示标题
isShowTitle:this.vshowL?1:0,
//是否显示旅客名单
isShowGuest:this.vshowM?1:0,
//是否显示紧急联系人
isShowMan:this.vshowLLR?1:0,
//是否显示团号
isShowTCNUM:this.vshowTCNUM?1:0
}; };
this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc"); this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
this.pdfLoading = false
});
}, },
DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式 DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
var aDate, oDate1, oDate2, iDays var aDate, oDate1, oDate2, iDays
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ 52a16e5f
...@@ -1354,7 +1354,7 @@ ...@@ -1354,7 +1354,7 @@
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)); let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = deleteDataList==="" ? this.deleteArray : deleteDataList; this.deleteArray = deleteDataList==="" ? this.deleteArray : deleteDataList;
console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5) console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) ){ if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.FeatureData.FeatureType !== 4 || this.FeatureData.FeatureType !== 5) ){
for (let i = 0; i < dataList.DayList.length; i++) { //组装数据 for (let i = 0; i < dataList.DayList.length; i++) { //组装数据
let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮 let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
let hotelObj = travelFeatureTwo.HotelInit(i, dataList.DayList) // 酒店 let hotelObj = travelFeatureTwo.HotelInit(i, dataList.DayList) // 酒店
......
src/plug/index.js
View file @ 52a16e5f
...@@ -115,13 +115,14 @@ export default { ...@@ -115,13 +115,14 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.214:8082"; //214主域名 domainUrl = "http://127.0.0.1"; //214主域名
// 127.0.0.12
// domainUrl = "http://192.168.2.88"; //王悦主域名 // domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名 // domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.16:8083"; //王悦主域名 // domainUrl = "http://192.168.2.16:8083"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名 // domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //吴春主域名 // domainUrl = "http://192.168.2.65:8025"; //吴春主域名
domainUrl = "http://192.168.2.106:8082"; //罗超主域名 // domainUrl = "http://192.168.2.106:8082"; //罗超主域名
if (locationName.indexOf('oytour')!==-1) { if (locationName.indexOf('oytour')!==-1) {
domainUrl = "https://reborn.oytour.com"; domainUrl = "https://reborn.oytour.com";
}else if (locationName.indexOf('viitto')!==-1) { }else if (locationName.indexOf('viitto')!==-1) {
...@@ -147,7 +148,8 @@ export default { ...@@ -147,7 +148,8 @@ export default {
//google地图Url //google地图Url
GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN", GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN",
//google地图图片地址 //google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com" GoogleMapImageUrl: "http://super.oytour.com",
UploadUrl: "http://upload.oytour.com"
}; };
return obj; return obj;
}, },
...@@ -213,6 +215,15 @@ export default { ...@@ -213,6 +215,15 @@ export default {
window.open('http://' + URL, '_blank'); window.open('http://' + URL, '_blank');
} }
} }
Vue.prototype.uploadImg = function (tcID, msg, successCall, faildCall) {
var apiurl = this.domainManager().Upload + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Freature/TCID' + tcID;
this.$http.post(apiurl, msg, {
datatype:"jsonP",
}).then(res => {
successCall(res);
}, faildCall)
}
//HTTP提交数据 //HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) { Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
...@@ -267,7 +278,7 @@ export default { ...@@ -267,7 +278,7 @@ export default {
}, },
//下载文件 //下载文件
Vue.prototype.GetLocalFile = function (cmd, msg, fileName) { Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
var apiurl = this.domainManager().LocalFileStreamDownLoadUrl; var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;
var timestamp = (new Date()).valueOf(); var timestamp = (new Date()).valueOf();
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") { if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
...@@ -302,6 +313,7 @@ export default { ...@@ -302,6 +313,7 @@ export default {
link.setAttribute("download", fileName); link.setAttribute("download", fileName);
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
successCall(res);
}).catch(function (res) {}); }).catch(function (res) {});
}, },
Vue.prototype.getCookieItem = function () { Vue.prototype.getCookieItem = function () {
......
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