Skip to content

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

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

parents e249be9a e4842613
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 513 additions and 121 deletions
src/assets/css/cssReset.css
View file @ c167fbe1
......@@ -103,6 +103,7 @@ input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;}
.w220{width: 220px!important;}
.w230{width: 230px!important;}
.w240{width: 240px!important;}
.w250{width: 250px!important;}
.w260{width: 260px!important;}
.w272{width: 272px!important;}
.w275{width: 275px!important;}
......
src/components/BusExport.vue
View file @ c167fbe1
......@@ -147,6 +147,7 @@
MakeEndDate:'',
CurrType:'',
CurrName:'',
ClientId:''
},
Year:'',
Month:'',
......@@ -160,7 +161,7 @@
this.msg.MakeStartDate = this.$route.query.MakeStartDate;
this.msg.MakeEndDate = this.$route.query.MakeEndDate;
this.msg.CurrType = this.$route.query.CurrType;
this.msg.ClientId=this.$route.query.ClientId;
this.Year = this.msg.Month.split('-')[0];
this.Month = this.msg.Month.split('-')[1];
......
src/components/Login.vue
View file @ c167fbe1
......@@ -338,7 +338,7 @@ export default {
);
},
getCode() {
var phoneReg = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/;
var phoneReg = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/;
//电话
var phone = this.mobileNumber.replace(/^\s+|\s+$/gm, "");
if (!phoneReg.test(phone)) {
......
src/components/SalesModule/groupTourOrder.vue
View file @ c167fbe1
......@@ -1425,8 +1425,8 @@
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click">
<div class="personNolayer">
<!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{item.manNum}}人</span>
<span>儿童：{{item.chirdNum}}人</span>
......@@ -1453,14 +1453,14 @@
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div>
</div> -->
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference"
@click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference"
@click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference"
@click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
</el-popover>
<!-- </el-popover> -->
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">{{item.unit_Price}}</td>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ c167fbe1
......@@ -1447,8 +1447,8 @@
<p class="fz12">{{item.contactMobile}}</p> -->
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click" >
<div class="personNolayer">
<!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{item.manNum}}人</span>
<span>儿童：{{item.chirdNum}}人</span>
......@@ -1475,11 +1475,11 @@
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div>
</div> -->
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
</el-popover>
<!-- </el-popover> -->
</td>
<td style="color:#FF9C00">
<span>{{item.tC_Price}}</span>
......@@ -1624,7 +1624,9 @@
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<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>
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click">
......@@ -1734,8 +1736,8 @@
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click" >
<div class="personNolayer">
<!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{item.manNum}}人</span>
<span>儿童：{{item.chirdNum}}人</span>
......@@ -1762,11 +1764,11 @@
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div>
</div> -->
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
</el-popover>
<!-- </el-popover> -->
</td>
<td style="color:#FF9C00">
<span>{{item.tC_Price}}</span>
......@@ -2314,6 +2316,18 @@ export default {
}
},
methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
//是否可以修改成交单价
canEditUnitPrice() {
let userInfo = this.getLocalStorage();
......
src/components/SalesModule/productQuery.vue
View file @ c167fbe1
......@@ -289,7 +289,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单地接人数" prop="AirticketNum">
<el-form-item label="单地接人数" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo();autoRemarks("AirticketNum","单地接数量")'></el-input>
</el-form-item>
</el-col>
......@@ -1110,6 +1110,11 @@
this.getNumber();
this.getHouseNo();
this.getTotalPrice()
} else if (val === '1') {
this.addMsg.AirticketNum = 0
this.getNumber();
this.getHouseNo();
this.getTotalPrice()
}
},
downloadFile: function (item) {
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ c167fbe1
......@@ -5,7 +5,7 @@
}
.shoppingStore .resourceList {
width: 215px;
height: 288px;
height: 230px;
background-color: #fff;
border: 1px solid #ededed;
border-radius: 4px;
......@@ -434,10 +434,9 @@
<div class="hotelResource clearfix" v-loading="loading" :class="{'divTop':isShow,'fillTop':fillShow}">
<div class="resourceList" v-for="item in dataInfo" :key="item.subCode">
<div class="reTopInfo">
<img v-if="item.PicPath!=''" :src="'https://reborndev.oss-cn-hangzhou.aliyuncs.com'+item.PicPath" :onerror='defaultImg' />
<img v-else src="../../assets/img/shoppingstore.jpg" :onerror='defaultImg' />
<div class="profitList">
<div class="profitList" style="display:none">
<div class="profOne">一<span class="cumlaProfit">累计利润</span>一</div>
<div>￥{{item.TotalProfit}}</div>
</div>
......@@ -453,8 +452,8 @@
No.{{item.Sort}}
</div>
</div>
<div class="AccumuTrading">累计交易</div>
<div class="amountOf">￥{{item.TotalPrice}}</div>
<div class="AccumuTrading" style="display:none">累计交易</div>
<div class="amountOf" style="display:none">￥{{item.TotalPrice}}</div>
<div class="PhoneNum">
<i class="iconfont icon-img_dianhua"></i>{{item.Tel}}
</div>
......@@ -477,7 +476,6 @@
<input type="button" class="hollowFixedBtn" @click="isShow=false,resetForm('addMsg')" value="取消" />
</el-col>
</el-row>
<!-- <div class="combottomTitle">{{titleInfo}}</div> -->
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<ul class="changeMsg">
<li>
......@@ -575,15 +573,10 @@
</div>
</div>
</el-form>
<!-- <div class="btmBtn">
<div style="float:right;">
<input type="button" class="hollowFixedBtn" @click="isShow=false,resetForm('addMsg')" value="取消"/>
<input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存"/>
</div>
</div> -->
</div>
<div class="btmAddStore" :class="{'fillShow':fillShow}">
<div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div>
<div style="height:250px;overflow-y: auto;">
<table class="impoTable" style="border-spacing: 0px 1px;">
<thead>
<tr>
......@@ -633,6 +626,7 @@
</tr>
</thead>
</table>
</div>
<div class="btmBtn impotBtn">
<input type="button" class="normalBtn" @click="importInfo" value="确认导入" />
<input type="button" class="hollowFixedBtn" @click="hideFill" value="取消" />
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ c167fbe1
......@@ -1404,13 +1404,14 @@
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click">
<div class="personNolayer">
<!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{item.ManNum}}人</span>
<span>儿童：{{item.ChirdNum}}人</span>
<span>老人：{{item.OldPeopleNum}}人</span>
<span>婴儿：{{item.BabyNum}}人</span>
<span>单地接：{{item.AirticketNum}}人</span>
</p>
<table border="0" cellspacing="1" cellpadding="1">
<tr>
......@@ -1431,11 +1432,11 @@
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div>
</div> -->
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
</el-popover>
<!-- </el-popover> -->
</td>
<td>{{item.TC_Price}}</td>
<td>{{item.Unit_Price}}</td>
......@@ -1585,13 +1586,14 @@
<p v-if="childItem.IsOwn==2&&userId!=1&&userId!=5">*****</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click">
<div class="personNolayer">
<!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{childItem.ManNum}}人</span>
<span>儿童：{{childItem.ChirdNum}}人</span>
<span>老人：{{childItem.OldPeopleNum}}人</span>
<span>婴儿：{{childItem.BabyNum}}人</span>
<span>单地接：{{childItem.AirticketNum}}人</span>
</p>
<table border="0" cellspacing="1" cellpadding="1">
<tr>
......@@ -1612,11 +1614,11 @@
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div>
</div> -->
<span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
</el-popover>
<!-- </el-popover> -->
</td>
<td class="nowrap">{{childItem.TC_Price}}</td>
<td>{{childItem.Unit_Price}}</td>
......@@ -1723,6 +1725,7 @@
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span>
<p 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}}订单
{{childItem.PlatformOrder}};</span>
{{childItem.Remarks}}
......@@ -1804,13 +1807,14 @@
<p v-if="item.IsOwn==2&&userId!=1&&userId!=5">*****</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click">
<div class="personNolayer">
<!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{item.ManNum}}人</span>
<span>儿童：{{item.ChirdNum}}人</span>
<span>老人：{{item.OldPeopleNum}}人</span>
<span>婴儿：{{item.BabyNum}}人</span>
<span>单地接：{{item.AirticketNum}}人</span>
</p>
<table border="0" cellspacing="1" cellpadding="1">
<tr>
......@@ -1831,11 +1835,11 @@
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div>
</div> -->
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
</el-popover>
<!-- </el-popover> -->
</td>
<td>{{item.TC_Price}}</td>
<td>{{item.Unit_Price}}</td>
......@@ -2498,6 +2502,18 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan:updateSalesMan
},
methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
......
src/components/busManagement/BusApportionManagement.vue
View file @ c167fbe1
......@@ -298,6 +298,16 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="客户名称" class='multiple_input countryList'>
<el-select filterable v-model='exportInfo.ClientId' placeholder="请选择客户名称" class="w200 _border_b_1">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ClientAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="goToExport('BusExport')">{{$t('pub.saveBtn')}}</button> &nbsp;
......@@ -388,7 +398,8 @@ export default {
DCDate:'',
StartGroupDate:'',
EndGroupDate:'',
CurrType:3
CurrType:3,
ClientId:0
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -818,6 +829,7 @@ export default {
MakeStartDate:this.exportInfo.StartGroupDate,
MakeEndDate:this.exportInfo.EndGroupDate,
CurrType:this.exportInfo.CurrType,
ClientId:this.exportInfo.ClientId
}
});
window.open(routeData.href, "_blank");
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ c167fbe1
......@@ -579,7 +579,6 @@
res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
console.log('tempData',tempData)
if (tempData.Feature != null) {
this.FeatureData.ID = tempData.Feature.ID;
this.FeatureData.ConfigId = tempData.Feature.ConfigId;
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ c167fbe1
......@@ -2,7 +2,7 @@
<!--<div id='newFeatureBox' v-if="!Refresh" v-loading="RenderingOk">-->
<div id='newFeatureBox' v-if="!Refresh">
<!-- 酒店 -->
<div class="travle_page" v-for="(item, index) in hotelObj.pageList" :key="'hotel'+index " v-if="item === 0">
<div class="travle_page" v-for="(item, index) in hotelObj.pageList" :key="'hotel'+index " v-if="hotelObj.list.length>0">
<!-- 酒店1 -->
<div class="travel_hotel_1" v-if="item === 0 && hotelObj.list!=null && hotelObj.list.length>0">
<div class="hotel_1_header">
......@@ -1354,7 +1354,8 @@
init: function () { //初始化
let dataList = JSON.parse(JSON.stringify(this.FeatureData));
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = deleteDataList==="" ? this.deleteArray : deleteDataList;
this.deleteArray = !deleteDataList ? [] : deleteDataList;
console.log("this.deleteArray", this.deleteArray)
console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
// console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4) || (this.$route.query.configId && this.FeatureData.FeatureType<4)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType<4)){
......@@ -1841,6 +1842,7 @@
},
// 版块删除
bolckToDelete: function (name, index1, index2) {
console.log(name, index1)
let blockList = [];
if (name === 'hotel') {
blockList = this.hotelObj.list
......@@ -1849,6 +1851,7 @@
} else if (name === 'restaurant') {
blockList = this.restaurantObj.list
}
console.log(blockList)
this.imgTopReset(name, index1, index2);
this.deleteArray.push(blockList[index1]);
console.log("删除",blockList[index1])
......
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