Skip to content

S
SuperMan
Commit f6cd44e8 authored by Mac's avatar Mac
Browse files
Options

解决冲突

parents 87d1c45c 055765ae
Show whitespace changes
Inline Side-by-side
Showing with 963 additions and 963 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ f6cd44e8
......@@ -1933,7 +1933,9 @@ export default {
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
if(res.data.resultCode==1){
let data=res.data.data;
if(this.RB_Post_Id!=5){
console.log(1);
if(this.RB_Post_Id!=5&&this.userId!=1648){
console.log(2);
data.forEach(item=>{
if(item.Name!="公社资金池" && item.Name!="水口资金池" && item.Name!="橡胶资金池" && item.Name!="地接部专户" && item.Name!="老挝购物店资金池"){
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ f6cd44e8
......@@ -923,6 +923,7 @@ export default {
},err=>{})
},
getList(){ //获取列表
this.checkList=[];
this.loading = true;
if( this.msg.ClientID === '' ){
this.msg.ClientID = 0;
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ f6cd44e8
......@@ -547,6 +547,7 @@ export default {
}, err => {})
},
getList(){ //获取列表
this.checkList=[];
// this.loading = true
if( this.msg.ClientID == '' ){
this.msg.ClientID = 0;
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ f6cd44e8
......@@ -544,6 +544,7 @@ export default {
}, err => {})
},
getList(){ //获取列表
this.checkList=[];
this.loading = true
if( this.msg.ClientID == '' ){
this.msg.ClientID = 0;
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ f6cd44e8
......@@ -591,6 +591,7 @@ export default {
}, err => {})
},
getList(){ //获取列表
this.checkList=[];
this.loading = true
if( this.msg.ClientID == '' ){
this.msg.ClientID = 0;
......
src/components/Hotel/HotelSalesBoard.vue
View file @ f6cd44e8
......@@ -264,8 +264,9 @@
</div>
<div class="title">
酒店统计 共
<span class="Owe_Room">{{TotalInventory}}</span> 间, 使用
<span class="Owe_Room">{{UseInventory}}</span>间
<span class="Owe_Room">{{TotalInventory}}</span> 间, 当前使用
<span class="Owe_Room">{{UseInventory}}</span> 间,占比
<span class="Owe_Room">{{((UseInventory/TotalInventory)*100).toFixed(2)}}</span> %.
&nbsp;&nbsp;
<span class="hasStock_1" style="padding:2px 4px;border-radius:5px">红日</span>
<span class="hasStock_2" style="padding:2px 4px;border-radius:5px">旺季</span>
......
src/components/SalesModule/MyCustomer.vue
View file @ f6cd44e8
......@@ -95,6 +95,10 @@
未通过客户
<div class="divActive" v-show="type==3"></div>
</li>
<li :class="{active:type==4}" @click="type=4;clickGetList(4)">
黑名单客户
<div class="divActive" v-show="type==4"></div>
</li>
</div>
<div class="_mc_list _scrollbar" :class="addShow==true?'_edHeight':''">
<ul class="clearfix">
......@@ -108,7 +112,9 @@
<img v-if='item.icon' :onerror="defaultImg" :src='item.icon'/>
<p>{{item.contact}}</p>
<p><i class="iconfont icon-img_dianhua"></i>{{item.contactNumber}}</p>
<p class="_addr">{{item.customerName}} <i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></p>
<p class="_addr">{{item.customerName}} <i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i>
<i class="iconfont icon-heimingdan" v-show="item.customerStatus===4" title="已加入黑名单"></i>
</p>
</div>
<div class="_record" v-if="item.customerAccountId!=0">
<p class="_fist_n" v-if="item.customerVisitList.length>0">近期约访：{{item.customerVisitList[0].visitDateTime}}</p>
......
src/components/SalesModule/enrollTotal.vue
View file @ f6cd44e8
......@@ -214,6 +214,10 @@
</td>
<td>
{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}
<br/>
<span v-if="item.refuseVisaNum>0" style="color:red">
(拒签 {{item.refuseVisaNum}}人)
</span>
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">￥{{item.unit_Price}}</td>
......
src/components/SalesModule/groupTourOrder.vue
View file @ f6cd44e8
......@@ -1572,6 +1572,10 @@
@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>
<br/>
<span v-if="item.refuseVisaNum>0" style="color:red">
(拒签 {{item.refuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
......
src/components/SalesVisa/ModifyVisaProduct.vue
View file @ f6cd44e8
......@@ -896,7 +896,7 @@ export default {
"dmc_get_visa_GetVisaProductInfo_V1",
{Pid:Pid},
res => {
console.log(res);
// console.log(res);
if (res.data.resultCode == 1) {
let data=res.data.data;
this.addMsg=res.data.data;
......
src/components/Supplier/HotelQueryList.vue
View file @ f6cd44e8
......@@ -71,7 +71,8 @@
<input type="button" class="normalBtn" style="padding:0 12px;margin-left:0" value="温馨提示"
@click="showNotice=true,resetPageIndex(),GetHotelTipList()" />
<input type="button" class="normalBtn" value="查询" style="padding:0 12px;margin-left:5px" @click="getList()" />
<input type="button" class="normalBtn" value="下载" style="padding:0 12px;margin-left:5px" @click="DownLoadHotelQuery()" />
<input type="button" class="normalBtn" value="下载" style="padding:0 12px;margin-left:5px"
@click="DownLoadHotelQuery()" />
</li>
</ul>
</div>
......@@ -86,13 +87,15 @@
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div>
<template v-if="isShow">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading'
:height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div>
{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
<input type="button" class="normalBtn" style="margin-left:0;height:22px;padding:0 10px;" @click="getLogsList(scope.row.HotelId)" value="操作日志"/>
<input type="button" class="normalBtn" style="margin-left:0;height:22px;padding:0 10px;"
@click="getLogsList(scope.row.HotelId)" value="操作日志" />
</template>
</el-table-column>
<el-table-column label="价格&库存" fixed min-width="120">
......@@ -116,8 +119,7 @@
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv"
>
<div class="Hotel_kong Com_hoteldiv">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div>
<div class="Hotel_kong Com_hoteldiv">
......@@ -236,7 +238,8 @@
<el-dialog custom-class="w800" title="操作日志" :visible.sync="showLogInfo" center :before-close="closeChangeMachie">
<el-form>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable logsTable" style="width:100%;">
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable logsTable"
style="width:100%;">
<tr>
<th width="50">操作人</th>
<th>日期</th>
......@@ -287,7 +290,7 @@
//价格等级
PriceLevel: 0,
},
tableHeight:0,
tableHeight: 0,
beforeCheck: {
disabledDate: time => {
if (this.msg.StartDate) {
......@@ -323,25 +326,25 @@
pageSize: 5,
currentPage: 1,
total: 0,
OpType:1,
OpType: 1,
},
postMsg: {
Id: 0,
TipContent: '',
OpType:1
OpType: 1
},
queryLogMsg:{
queryLogMsg: {
pageIndex: 1,
pageSize: 6,
currentPage: 1,
total: 0,
HotelId:0
HotelId: 0
},
//默认显示弹窗信息
showHQinfo: true,
showLogInfo: false,
LogsList:[],
HotelId:0,
LogsList: [],
HotelId: 0,
//酒店温馨提示列表
HotelTipList: [],
HotelList: [],
......@@ -486,7 +489,7 @@
this.queryMsg.pageIndex = val;
this.GetHotelTipList();
},
handleCurrentChange2(val){
handleCurrentChange2(val) {
this.queryLogMsg.pageIndex = val;
this.getLogsList(this.HotelId);
},
......@@ -608,31 +611,29 @@
this.loading = false;
});
},
com_onresize(){
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 134 - 50;
if(h < 110){
if (h < 110) {
return;
}
//设置table的行高
this.tableHeight = h;
},
//获取日志
getLogsList(HotelId){
getLogsList(HotelId) {
this.showLogInfo = true;
this.HotelId = HotelId;
this.queryLogMsg.HotelId = HotelId;
this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
console.log(res,'ressss');
if (res.data.resultCode == 1) {
this.LogsList = res.data.data.pageData;
console.log(this.LogsList,'loglist');
this.queryLogMsg.total = res.data.data.count;
}
}, err => {})
},
closeChangeMachie(){
closeChangeMachie() {
this.showLogInfo = false;
this.queryLogMsg.pageIndex = 1;
}
......@@ -659,7 +660,7 @@
.classHong {
background-color: rgb(255, 55, 55);
color:#fff;
color: #fff;
}
.classWang {
......@@ -773,10 +774,13 @@
.HotelQueryList .el-table td {
padding: 0;
}
.hotelQury2 .w150 .el-input{
width:150px;
.hotelQury2 .w150 .el-input {
width: 150px;
}
.HQ_em{
min-width: 75px!important;
.HQ_em {
min-width: 75px !important;
}
</style>
src/components/Supplier/HotelSalesBoard.vue
View file @ f6cd44e8
......@@ -264,8 +264,9 @@
</div>
<div class="title">
酒店统计 共
<span class="Owe_Room">{{TotalInventory}}</span> 间, 使用
<span class="Owe_Room">{{UseInventory}}</span>间
<span class="Owe_Room">{{TotalInventory}}</span> 间, 当前使用
<span class="Owe_Room">{{UseInventory}}</span> 间,占比
<span class="Owe_Room">{{((UseInventory/TotalInventory)*100).toFixed(2)}}</span> %.
&nbsp;&nbsp;
<span class="hasStock_1" style="padding:2px 4px;border-radius:5px">红日</span>
<span class="hasStock_2" style="padding:2px 4px;border-radius:5px">旺季</span>
......
src/components/Supplier/roomQuery.vue
View file @ f6cd44e8
<template>
<div>
<div class="roomQuery">
<div class="query-box" style="border-bottom: none;">
<ul style="position:relative;">
<li>
......@@ -102,13 +102,19 @@
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="font-size:12px;padding:2px 4px 3px 20px; color:red">注意事项:每次导出数据最好不要超过一个月。</div><br/>
<div style="font-size:12px;padding:2px 4px 3px 20px;">颜色说明: <a>未操作</a> <a>操作中</a> <a>操作完成</a> <a>机位数和人数不相符</a> 。</div>
<div style="font-size:12px;padding:2px 4px 3px 20px;">
<div style="display:inline-block;color:red">注意事项:每次导出数据最好不要超过一个月。</div>
<div class="rq_comSpan" style="display:inline-block;">颜色说明:
<span class="rq_span1">未操作</span><span class="rq_span2">操作中</span><span class="rq_span3">操作完成</span><span
class="rq_span4">机位数和人数不相符</span>
</div>
</div><br />
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
<tr>
<th width="100">序号</th>
<th width="120">出发地</th>
<th width="100">公司团号</th>
<th width="80">团队状态</th>
<th width="100">系列</th>
<th width="120">机位总数<br />(Y/E/F)</th>
<th width="100">时间</th>
......@@ -131,6 +137,11 @@
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
{{subItem.TCNUMS}}
</td>
<td v-if="childIndex==0"
:rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<span v-if="subItem.TCState==3&&subItem.Status==1">正常</span>
<span v-else>取消</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
{{subItem.LineteamIdNames}}
</td>
......@@ -176,16 +187,17 @@
<template v-else-if="childItem.SupplierHotelStatus==2"><a style="color:blue">操作完成</a></template>
</template>
</td>
<td v-if="childIndex==0"
:rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<el-tooltip class="item" effect="dark" content="操作信息" placement="top-start">
<el-popover placement="bottom" width="460" trigger="click">
<el-popover placement="bottom" width="500" trigger="click">
<table>
<tr>
<th width="100">
<th width="90">
时间
</th>
<th width="150">
<th width="160">
酒店
</th>
<th width="100">
......@@ -200,7 +212,7 @@
<td>
{{opItem.CheckInDateStr}}
</td>
<td>
<td style="padding-right:10px;">
{{opItem.NewHotelName}}
</td>
<td>
......@@ -229,6 +241,37 @@
@click="GetItemHotelData(subItem.hotelList)">操作</a>
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="日志信息" placement="top-start">
<el-popover placement="bottom" width="500" trigger="click">
<table border="0" cellspacing="1" cellpadding="0" class="queryLogTable" style=" border-collapse:collapse;">
<tr>
<th width="100" style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">操作人</th>
<th width="100" style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">日期</th>
<th width="100" style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">操作时间</th>
<th width="190" style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">内容</th>
</tr>
<template v-if="LogsList.length>0">
<tr v-for="(item,index) in LogsList">
<td style="height: 35px; font-size: 12px;text-align:center;border:1px solid #d1d1d1;">{{item.CreateByName}}</td>
<td style="height: 35px; font-size: 12px;text-align:center;border:1px solid #d1d1d1;">{{item.UseTimeStr}}</td>
<td style="height: 35px; font-size: 12px;text-align:center;border:1px solid #d1d1d1;">
{{item.CreateTimeStr}}
</td>
<td style="height: 35px; font-size: 12px;text-align:left;border:1px solid #d1d1d1;">{{item.Remarks}}</td>
</tr>
</template>
<tr v-else>
<td colspan="5">暂无数据...</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange2"
:current-page.sync="queryLogMsg.currentPage" :page-size="queryLogMsg.pageSize"
layout="total,prev, pager, next, jumper" :total="queryLogMsg.total">
</el-pagination>
<a style="text-decoration:underline;color:blue;cursor:pointer" slot="reference" @click="getLogsList(subItem.TCID)">日志</a>
</el-popover>
</el-tooltip>
<a style="text-decoration:underline;color:blue;cursor:pointer"
@click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
<template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template>
......@@ -240,7 +283,7 @@
</tr>
<template v-if="subItem.SupplierRemarks">
<tr v-if="subIndex==0" :class="{roomQuerySplitTrCss:index%2!=0}">
<td colspan="8" class="redTip">
<td colspan="9" class="redTip">
<p>备注：{{subItem.SupplierRemarks}}</p>
</td>
</tr>
......@@ -291,6 +334,16 @@
LineTeamList: [],
thLengthTitle: [],
dataList: [],
//日志信息
LogsList: [],
queryLogMsg: {
pageIndex: 1,
pageSize: 5,
currentPage: 1,
total: 0,
HotelId: 0,
TCID: 0
},
queryCommonData: {
//公司数据
BranchList: [],
......@@ -322,6 +375,22 @@
}
},
methods: {
handleCurrentChange2(val) {
this.queryLogMsg.pageIndex = val;
this.getLogsList();
},
//获取日志
getLogsList(TCID) {
if (TCID) {
this.queryLogMsg.TCID = TCID;
}
this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
if (res.data.resultCode == 1) {
this.LogsList = res.data.data.pageData;
this.queryLogMsg.total = res.data.data.count;
}
}, err => {})
},
GetItemHotelData(hotelList) {
this.CurrentHotelList = JSON.parse(JSON.stringify(hotelList));
},
......@@ -627,4 +696,34 @@
padding-left: 5px;
}
.roomQuery .rq_comSpan {
font-size: 14px;
margin-left: 20px;
}
.roomQuery .rq_comSpan>span {
display: inline-block;
padding: 2px 4px;
color: #fff;
border-radius: 5px;
margin-right: 10px;
}
.roomQuery .rq_span1 {
background-color: #333;
}
.roomQuery .rq_span2 {
background-color: #7abd53;
}
.roomQuery .rq_span3 {
background-color: blue;
}
.roomQuery .rq_span4 {
background-color: red;
}
</style>
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ f6cd44e8
......@@ -987,7 +987,7 @@
<el-col :span="4">
<el-form-item label="婴儿人数" prop="BabyNum">
<el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')"
@input='getNumber();getTotalPrice()'></el-input>
@input='getNumber();getTotalPrice();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1094,7 +1094,7 @@
<input type="button" class="normalBtn" value="保存" @click="submitForm('addMsg')" />
</span>
</p>
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="80px">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType">
......@@ -1105,7 +1105,7 @@
</el-select>
</el-form-item>
<el-form-item label="参团类型" prop="GroupType">
<el-select v-model='addMsg.GroupType' filterable :placeholder="$t('pub.pleaseSel')" @change="gettypechange(addMsg.GroupType)">
<el-select v-model='addMsg.GroupType' filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ctlxList" :label='item.Name' :value='item.Id' :key='item.Id'
v-if="item.Id!=5">
</el-option>
......@@ -1167,7 +1167,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="5">
<el-form-item label="本团单价" prop="TC_Price">
<el-input v-model='addMsg.TC_Price' :disabled="true" class="w210"></el-input>
</el-form-item>
......@@ -1180,24 +1180,15 @@
<span class="colorE95252" v-show='!returnPriceShow'>暂无报价！</span>
</el-form-item>
</el-col>
<el-col :span="3" v-if="isChecked==true">
<template>
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-col :span="5" v-if="isChecked==true">
<el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')"
@change="getTotalPrice()">
<el-option v-for="(item,index) in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='index'>
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="成交单价" prop="Unit_Price" v-else>
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)"></el-input>
</el-form-item>
</template>
<el-form-item label="高于本团单价" v-show="addMsg.GroupType != 4" >
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
</el-form-item>
<el-form-item v-show="addMsg.GroupType != 4">
<el-form-item>
<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>
......@@ -1216,7 +1207,7 @@
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'">
<el-form-item label="成人人数" prop="ManNum">
<el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
......@@ -1224,38 +1215,37 @@
<el-col :span="4">
<p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
本团不支持儿童出游!</p>
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum" v-show="addMsg.GroupType !== '4'">
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="儿童占床" prop="ChirdNeedBedNum" v-show="addMsg.GroupType !== '4'">
<el-form-item label="儿童占床" prop="ChirdNeedBedNum">
<el-input v-model='addMsg.ChirdNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')"
@input='getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="婴儿人数" prop="BabyNum" v-show="addMsg.GroupType !== '4'">
<el-form-item label="婴儿人数" prop="BabyNum">
<el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')"
@input='getNumber();getTotalPrice()'></el-input>
@input='getNumber();getTotalPrice();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="老人人数" prop="OldPeopleNum" v-show="addMsg.GroupType !== '4'">
<el-form-item label="老人人数" prop="OldPeopleNum">
<el-input v-model='addMsg.OldPeopleNum' @keyup.native="checkInteger(addMsg,'OldPeopleNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="单地接数量" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单地接数量" prop="AirticketNum">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')"
......@@ -1564,6 +1554,10 @@
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>
<br/>
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
</td>
<td>{{item.TC_Price}}</td>
<td>{{item.Unit_Price}}</td>
......@@ -1698,9 +1692,9 @@
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</p>
<!-- <p class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </p>-->
<!-- <p class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </p>-->
<span>房间信息：{{item.OrderGuestHouseStr}}</span>
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td>
......@@ -1807,6 +1801,10 @@
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>
<br/>
<span v-if="childItem.RefuseVisaNum>0" style="color:red">
(拒签 {{childItem.RefuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td class="nowrap">{{childItem.TC_Price}}</td>
......@@ -1965,9 +1963,9 @@
<span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息：{{childItem.OrderGuestHouseStr}}</span>
<span v-if="childItem.TipMoney" style="color:red">（小费：{{childItem.TipMoney}}）</span>
</td>
......@@ -2141,6 +2139,10 @@
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>
<br/>
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td>{{item.TC_Price}}</td>
......@@ -2284,9 +2286,9 @@
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td>
</tr>
......@@ -3073,9 +3075,7 @@
OrderUnitPrice: 0
},
SuperiorPeople: [],
IsBackStatus: 1,
HightUnitPrice: '2',
Unit_Price:0,
IsBackStatus: 1
};
},
components: {
......@@ -3093,6 +3093,7 @@
if (res.data.resultCode === 1) {
this.$message.success(res.data.message)
this.getList()
this.FyongLoading = false
} else {
this.$message.error(res.data.message)
}
......@@ -3181,13 +3182,7 @@
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
this.OpSetLossMoney = x.OpSetLossMoney;
if(this.addMsg.GroupType == 4){
this.HightUnitPrice = '1'
this.Unit_Price = x.Unit_Price
}else {
this.HightUnitPrice = '2'
this.Unit_Price = this.addObj.SingleDMCPrice
}
this.stratPrice = 0;
if (res.data.data.modelPrice && res.data.data.modelPrice.GoAddPrice) {
this.stratPrice = res.data.data.modelPrice.GoAddPrice;
......@@ -3222,7 +3217,7 @@
this.Unit_PriceList = [];
this.apipost('sellorder_post_GetLessPrice', {
"TCID": obj.TCID,
"MaxPeopleNum": maxPeopleNum
"MaxPeopleNum": MaxPeopleNum
}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney) > 0) {
......@@ -3734,19 +3729,7 @@
}
},
getTotalPrice(t) {
if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error('请输入正确的价格！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
if (this.addMsg.Unit_Price < this.addMsg.TC_Price) {
this.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
}
getTotalPrice() {
if (this.addMsg.GroupType != 5) {
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
if (this.addObj.IsBirdDiscount == 1) {
......@@ -3799,14 +3782,8 @@
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)) *
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if(this.addMsg.GroupType == 4){
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
}else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
let dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
this.addMsg.PreferPrice =
this.OpSetLossMoney +
dandijie +
......@@ -3861,15 +3838,8 @@
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)) *
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if(this.addMsg.GroupType == 4){
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
}else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
let dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
this.addMsg.PreferPrice =
this.OpSetLossMoney +
dandijie +
......@@ -3890,9 +3860,6 @@
this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney;
}
this.getTicheng();
if (!t) {
this.getTypePrice2()
}
},
yzBigBed2() {
let x =
......@@ -4855,122 +4822,7 @@
// }
// },
// err => {})
},
gettypechange(type){
//切换参团类型时 把值初始化
if(type == 4){
this.addMsg.Unit_Price = this.Unit_Price; //成交单价
this.HightUnitPrice = '1';
this.addMsg.AirticketNum = 0;
this.addMsg.ManNum = 0;
// this.addMsg.ChirdNum = 0;
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.ChirdNoNeedBedNum = 0;
this.addMsg.ChirdNeedBedNum = 0;
this.addMsg.PreferPrice = 0;
this.addMsg.SafeNum = 0;
this.addMsg.VisaNum = 0;
this.addMsg.PredictRoomNum = 0;
this.addMsg.YSeatNum = 0;
}else {
this.HightUnitPrice = '2';
this.addMsg.AirticketNum = 0;
this.addMsg.ManNum = 0;
// this.addMsg.ChirdNum = 0; //?
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.ChirdNoNeedBedNum = 0;
this.addMsg.ChirdNeedBedNum = 0;
this.addMsg.PreferPrice = 0;
this.addMsg.SafeNum = 0;
this.addMsg.VisaNum = 0;
this.addMsg.PredictRoomNum = 0;
this.addMsg.YSeatNum = 0;
};
if (this.addMsg.CustomerType == 1) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2BMemberPrice;
this.addMsg.Unit_Price = this.addObj.B2BMemberPrice;
}
}
if (this.addMsg.CustomerType == 2) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2BPrice
this.addMsg.Unit_Price = this.addObj.B2BPrice;
}
}
if (this.addMsg.CustomerType == 3) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2CMemberPrice
this.addMsg.Unit_Price = this.addObj.B2CMemberPrice;
}
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
if (this.addMsg.CustomerType == 4) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2CPrice
this.addMsg.Unit_Price = this.addObj.B2CPrice;
}
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
},
getTypePrice2() {
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList = [];
console.log(this.Unit_PriceList)
this.apipost('sellorder_post_GetLessPrice', {
"TCID": this.addMsg.TCID,
"MaxPeopleNum": maxPeopleNum
}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney) > 0) {
for (var i = 0; i <= parseInt(this.LessMoney) / 10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price - i * 10;
obj.LessMoney = this.addMsg.TC_Price - i * 10;
this.Unit_PriceList.push(obj);
}
if (this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price) < 0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
} else {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
},
},
mounted() {
let userInfo = this.getLocalStorage();
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ f6cd44e8
......@@ -157,10 +157,10 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'>
<tr>
<th width="50">{{$t('active.ad_xuhao')}}</th>
<th width="60">{{$t('Operation.Op_chutuan')}}</th>
<th width="100">{{$t('Operation.Op_chutuan')}}</th>
<th width='120'>{{$t('Operation.Op_TeamName')}}</th>
<th width="80">{{$t('fnc.tuanqi')}}</th>
<th width="130">团期编号</th>
<th width="80">团期编号</th>
<th width="80">{{$t('Operation.Op_jinchudian')}}</th>
<th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
<th width="50">{{$t('Operation.Op_price')}}</th>
......@@ -179,7 +179,7 @@
'Rs_Start4':item.StartCityNum==4,'Rs_Start5':item.StartCityNum==5,'Rs_Start6':item.StartCityNum==6,
'Rs_Start7':item.StartCityNum==7,'Rs_Start8':item.StartCityNum==8,'Rs_Start9':item.StartCityNum==9,
'Rs_Start10':item.StartCityNum==10,'Rs_Start11':item.StartCityNum==11,'Rs_Start12':item.StartCityNum==12,'Rs_Start13':item.StartCityNum==13}">
{{item.StartCityName}}</td>
{{item.StartCityName}} ({{item.OutBranchName}})</td>
<td>{{item.LtName}}</td>
<td>{{item.StartDateStr}} {{item.AlCode}}</td>
<td><span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrlTCList('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span></td>
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ f6cd44e8
......@@ -193,6 +193,7 @@
<div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
<div>实收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div>
<div>待收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div>
<div>挂账总收入：<span>￥{{moneyFormat(AllCont.Income)}}</span></div>
<!--<div>
注：应收=订单应收总额，实收=订单实收总额
</div>-->
......@@ -210,6 +211,7 @@
<div>应付：<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div>
<div>实付：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div>
<div>待付：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div>
<div>挂账总支出：<span>￥{{moneyFormat(AllCont.Expend)}}</span></div>
<div>
注：成本单据总额(包含退款)+提成-小费收入-地接收入
</div>
......@@ -249,7 +251,7 @@
<div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
</div>
</el-col>
<el-col :span="4">
<!-- <el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
......@@ -262,7 +264,7 @@
<div>挂账总收入：<span>￥{{moneyFormat(AllCont.Income)}}</span></div>
</div>
</div>
</el-col>
</el-col> -->
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ f6cd44e8
......@@ -231,7 +231,11 @@
</p>
<p style="max-width: 160px;display: block;text-decoration:underline;cursor:pointer;" title="点击跳转到报名清单" class="over_ellipsis" :title="item.ltName" @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">{{item.ltName}}</p>
</td>
<td>{{item.guestNum}}</td>
<td>{{item.guestNum}}
<span v-if="item.refuseVisaNum>0" style="color:red">
(拒签 {{item.refuseVisaNum}}人)
</span>
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">￥{{item.unit_Price}}</td>
<td>
......
src/components/activity/IntegralMall.vue
View file @ f6cd44e8
......@@ -85,6 +85,8 @@
</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
......@@ -108,8 +110,10 @@ export default {
dataList:[],
GoodsTypeList: [],
GoodsSeriesList: [],
total:0,
};
},
mounted() {
this.getList();
this.getGoodsTypeManager();
......@@ -119,6 +123,10 @@ export default {
},
methods: {
handleCurrentChange(val){
this.msg.pageIndex=val;
this.getList();
},
getHotName: function (id) {
for(let i = 0; i < this.GoodsSeriesList.length; i++ ) {
if (this.GoodsSeriesList[i].id === id) {
......@@ -168,6 +176,7 @@ export default {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total= res.data.data.count;
} else {
this.Error(res.data.message)
}
......
src/components/activity/TravelInfoList.vue
View file @ f6cd44e8
......@@ -133,7 +133,7 @@
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=form.pageSize :total=total>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size='form.pageSize' :total='total'>
</el-pagination>
<el-dialog custom-class='w400' title="分配定制师" :visible.sync="Visible">
<el-form :model="pwdMsg" label-width="80px">
......
src/components/activity/addIntegralMall.vue
View file @ f6cd44e8
......@@ -617,8 +617,8 @@ export default {
let obj = localStorage.editIntegralMall ? JSON.parse(localStorage.editIntegralMall) : false
if (obj) {
this.addMsg = obj
if (obj.images) {
this.apiUrl = 'updateGoodsInfo'
if (obj.images) {
this.DiningImageArray = obj.images.split(',')
this.DiningImageArray2 = obj.descripImg.split(',')
}
......
src/components/scenicSpot/scenicSpotPackagePrice.vue
View file @ f6cd44e8
......@@ -394,7 +394,7 @@ input[type="number"] {
<el-col :span="2">
<div class="LM_BTNList">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" circle icon="el-icon-edit" @click="isShowDIv = true,divTitle='修改报价',updateData(index)"></el-button>
<el-button type="primary" circle icon="el-icon-edit" @click="isShowDIv = true,divTitle='修改报价',updateData(item.ID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" circle icon="el-icon-delete" @click="isdelete(item.ID)"></el-button>
......@@ -691,9 +691,17 @@ export default {
this.addMsg.CurrentRate = "";
},
//修改报价信息
updateData(index) {
var ticketPrice = this.tableData[index];
this.addMsg = JSON.parse(JSON.stringify(ticketPrice));
updateData(ID) {
this.apipost(
"ticketcouponsprice_post_Get",
{ID:ID},
res => {
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
}
},
err => {}
);
},
//获取所有币种
getAllCurrency() {
......
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