Skip to content

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

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

parents 06058588 3a615393
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1310 additions and 2034 deletions
src/assets/common/lang/zh.js
View file @ a67b4ece
......@@ -39,7 +39,6 @@ export const pub={
clickToView:'点击查看',
man:'男',
woman:'女',
delete:'删除',
}
......@@ -265,12 +264,6 @@ export const admin={ //行政
admin_Bindingposition:'绑定岗位',
admin_sort:'排序',
admin_level:'级',
admin_logincount:'登陆账号',
admin_Validaccount:'有效账号',
admin_logintel:'登录手机号',
}
//zk
export const hotel = {
......@@ -662,9 +655,6 @@ export const visa = {
v_yibaoru:'已报入',
v_houbu:'候补',
v_yxhoubu:'允许候补',
v_Japanese:'日本',
v_Othervisas:'其他签证',
......@@ -740,9 +730,6 @@ export const active = {
cl_dkjezk: '抵扣金额/折扣',
cl_mdskeyong: '满多少可用',
cl_yxjzhiri: '有效截止日',
cl_sytiaojian: '使用条件',
cl_huoqufangshi: '获取方式',
cl_hqriqi: '获取日期',
cl_zuofei: '作废',
cl_syfanwei: '适用范围',
cl_tongyong: '通用',
......@@ -763,8 +750,6 @@ export const active = {
cl_zanwu: '暂无',
cl_qita: '其他',
cjjiangxiang: '抽奖奖项',
cl_man: '满',
cl_keyong: '可用',
}
export const fnc = {
......@@ -1019,7 +1004,6 @@ export const fnc = {
day: '日',
fyshuoming: '费用说明',
danjia: '单价',
cjdanjia: '成交单价',
jine: '金额',
yuanbi: '原币',
sfjine: '实付金额',
......@@ -1071,9 +1055,6 @@ export const fnc = {
yingfu: '应付',
shishou: '实收',
shifu: '实付',
youhui: '优惠',
xiaofei: '小费',
tuikuan: '退款',
zjdiaobo: '资金调拨',
tuanqi: '团期',
hkriqi: '汇款日期',
......@@ -1093,7 +1074,6 @@ export const fnc = {
shoukuan: '收款',
fukuan: '付款',
duixiang: '对象',
zhikuan: '支款',
dqzhuangtai: '当前状态',
gnjpqishu: '国内票务期数',
qzbianhao: '签证编号',
......@@ -1137,58 +1117,6 @@ export const fnc = {
ljhaoshi: '累计耗时',
xsfujian: '显示附件',
ycfujian: '隐藏附件',
bmxuanze: '部门选择',
ryxuanze: '人员选择',
ctleixing: '参团类型',
bmriqi: '报名日期',
bmzrenshu: '总报名人数',
zcbmrenshu: '正常报名人数',
qxrenshu: '取消人数',
qtxtongji: '其他统计项',
nbbaoming: '内部报名',
B2BWAP: 'B2B/WAP网络报名',
cwdjshuoming: '财务单据说明',
yidadan: '已打单',
ptcnyshenhe: '平台出纳已审核',
yhcnyshenhe: '银行出纳已审核',
ytongguo: '已通过',
ysjine: '应收金额',
yishoujine: '已收金额',
tkjine: '退款金额',
ptshuijin: '平台税金',
ztjine: '在途金额',
wsjine: '未收金额',
khxinxi: '客户信息',
yszonge: '应收总额',
zaitu: '在途',
weishou: '未收',
sun: '损',
shousun: '收损',
dingdan: '订单',
lsbeizhu: '历史备注',
skdanju: '收款单据',
fkdanju: '付款单据',
w_ckmingcheng: '窗口名称',
w_ywrenyuan: '业务人员',
w_fzfangxiang: '负责方向',
w_djxinxi: '单据信息',
w_gong: '共',
w_chuangkou: '窗口',
w_shou: '收',
w_zhi: '支',
w_sqzhanghu: '授权账户',
w_ycldanju: '已处理单据',
w_dcldanju: '待处理单据',
w_zhbieming: '账户别名',
w_gsdgong: '公',
w_gsdsi: '私',
w_kscaozuo: '快速操作',
w_sygongzhang: '所有公账',
w_sysizhang: '所有私账',
w_sypingtai: '所有平台',
w_syzjinchi: '所有资金池',
w_syyhzhu: '所有银行账户',
w_syxjzhanghu: '所有现金账户',
}
export const tips = {
tips: '提示',
......@@ -1246,14 +1174,8 @@ export const tips = {
qzcpbianhao: '签证产品编号',
qishu: '期数',
jiaoyifangshi: '交易方式',
tips_deletealldepart: '删除该部门，会将其子部门全部删除！是否删除?',
zwtqxinxi: '暂无团期信息',
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！',
jsrqbndyksriqi: '结束日期不能大于开始日期',
hqsjshibai: '数据获取失败！',
accWorkTips: '注：指定银行卡收支方向的单据会自动分发到各个窗口，管理员在设定时应注意以下窗口是否涵盖了所有的业务，如果没有请及时设定，以免造成单据混乱',
qrscchuangkou: '确定删除窗口？',
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！'
}
export const Operation = {
Op_ShortName:'线路简称',
......@@ -1378,9 +1300,6 @@ export const rule = {
qtxshuoming: '请填写说明',
qxzygxytjddanju: '请选择一个需要提交的单据！',
qxzbmen: '请选择部门',
qtxckmingcheng: '请填写窗口名称',
qxzywuyuan: '请选择业务员',
qxzsyfangxiang: '请选择使用方向',
}
export const adm={
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ a67b4ece
......@@ -90,14 +90,14 @@
</div>
<div class="rb_top_row _r_mb5" v-if="isPrintPage">
<p>
<span class="">{{$t('visa.v_tuanhao')}}：
<span class="">{{$t('fnc.v_tuanhao')}}：
<template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
<span v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" >{{o.TCNUM}}（{{o.TCID}}）</span>
</template>
<span v-else>{{$t('fnc.no')}}</span>
</span>
</p>
<span class="">{{$t('hotel.order_Number')}}：<span>{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></span>
<span class="">{{$t(hotel.order_Number)}}：<span>{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></span>
</div>
<!---->
<div class="rb_top_row _r_mb5" v-if="isPrintPage&&OrderSource==4">
......@@ -114,7 +114,7 @@
</div>
<div class="rb_top_row _r_mb5" v-if="isPrintPage&&OrderSource==10">
<p>
<span class="">{{$t('tips.qzcpbianhao')}}：
<span class="">{{$t('fnc.qzcpbianhao')}}：
<span>{{GetDetail.SourceID}}</span>
</span>
</p>
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ a67b4ece
......@@ -903,16 +903,6 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YouHui",
formatter: this.moneyFormat,
title: "优惠",
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "DaiShou",
formatter: this.moneyFormat,
......@@ -1012,16 +1002,6 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "BaoXian",
title: "保险费",
formatter: this.moneyFormat,
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "QiTa",
formatter: this.moneyFormat,
......@@ -1514,7 +1494,6 @@ export default {
"实收金额",
"退款",
"平台税金",
"优惠金额",
"待收金额",
"溢收金额",
"人数",
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ a67b4ece
......@@ -286,7 +286,6 @@
</el-radio-group>
</div>
</div>
</div>
<div class="approval_page_layer_bottom">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="closeLayer" /> &nbsp;&nbsp;
......
src/components/Hotel/HotelInfo.vue
View file @ a67b4ece
......@@ -211,6 +211,7 @@
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<div class="imgzhe">
<div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
......@@ -251,6 +252,9 @@
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
</div>
</template>
<script>
......@@ -259,6 +263,10 @@ import googleMap from "../commonPage/googleMap.vue";
export default {
data() {
return {
imageOptions:{
navbar:false,
title:false
},
//是否显示添加图片
addimg: false,
//地图选中地址
......@@ -304,6 +312,7 @@ export default {
HotelTypeList: [],
//酒店价格
HotelPirceTypeList:[],
images: [],
addMsg: {
ID: 0,
Name: "",
......@@ -415,6 +424,23 @@ export default {
//this.updatePic();
});
},
inited (viewer){
this.$viewer = viewer
},
//显示图片详情
showImg: function (src) {
let srcArr = src.split('?')
src = srcArr[0]
let isExsit=false
this.images.forEach(x=>{
if(x===src)
isExsit=true
})
if(!isExsit)
this.images.push(src)
this.$viewer.show()
this.$viewer.view(this.images.indexOf(src))
},
//更新酒店图片
updatePic() {
if (this.hotelID > 0) {
......
src/components/Hotel/roomReservationsDetails.vue
View file @ a67b4ece
......@@ -104,18 +104,6 @@
</el-option>
</el-select>
</div>
<el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="danger" icon="el-icon-upload2">
<!-- <i class="el-icon-plus avatar-uploader-icon" @click="ClickItem=item"></i> -->
<div class="el-upload__text" @click="ClickItem=item">点击上传</div>
</el-button>
</el-upload>
<div class="RoomfileList" v-for="(subItem,subIndex) in item.ContractUrlArray" v-if="item.ContractUrlArray!=null && item.ContractUrlArray.length>0">
<p title="点击下载" @click="downLoadPZ(subItem)" style="cursor: pointer;">{{ '附件' + (index + 1)}}</p>
<span>
<i class="iconfont icon-close" @click="deleteFile(item,subIndex)"></i>
</span>
</div>
</td>
<td>
<div class="w80">
......@@ -225,26 +213,10 @@
CreateByAccount: '',
//创建人姓名
CreateByName: '',
//点击项
ClickItem: {},
}
},
methods: {
//联系op
downLoadPZ: function (src) {
let dom = document.querySelector("#blankLink")
dom.href=src
dom.click()
},
//删除
deleteFile(item,index){
item.ContractUrlArray.splice(index,1);
var str = "";
item.ContractUrlArray.forEach(subItem => {
str += subItem + ",";
})
item.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
},
openChart() {
this.MsgBus.$emit('openChat', {
account: this.CreateByAccount,
......@@ -293,15 +265,11 @@
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
this.list.forEach(item => {
this.calculationPrice(item);
this.calculationPrice(item)
item.hotelList.push({
Name: item.NewHotelName,
ID: item.NewHotelId
})
item.ContractUrlArray = [];
if (item.ContractUrl && item.ContractUrl != '') {
item.ContractUrlArray = item.ContractUrl.split(',');
}
item.PayStyle = item.PayStyle.toString()
item.OrderDetailsList.forEach((x, index1) => {
if (x.HouseTypeCount <= 0) {
......@@ -313,22 +281,22 @@
x.UnitPrice = x.UnitPrice.toString();
x.HotelDiscount = x.HotelDiscount.toString();
})
if (item.ReserveNo == '' || item.ReserveNo == null) {
if(item.ReserveNo==''||item.ReserveNo==null){
item.ReserveNo = this.$route.query.NewCombinationNum;
}
})
} else {
this.$message.error(res.data.message);
this.$message.error(res.data.message)
}
}, err => {})
},
calculationPrice(obj) {
let totalPrice = 0;
let totalPrice = 0
obj.OrderDetailsList.forEach(item => {
totalPrice += item.UnitPrice * (item.HouseGuestNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
totalPrice += item.UnitPrice * (item.HouseGuestNum - item.HotelDiscount) * (1 - item.RebateRatio / 100)
})
obj.TotalPrice = totalPrice.toFixed(2);
this.$forceUpdate();
obj.TotalPrice = totalPrice.toFixed(2)
this.$forceUpdate()
},
getHotelList(obj) {
this.apipost('hotel_post_GetLineHotelList', {
......@@ -337,32 +305,32 @@
QCity: obj.QCity
}, res => {
if (res.data.resultCode == 1) {
obj.hotelList = res.data.data;
obj.hotelList = res.data.data
} else {
this.$message.error(res.data.message);
this.$message.error(res.data.message)
}
}, err => {})
},
sendValue(obj) {
if (obj.hotelList.length > 0) {
let ckedObj = obj.hotelList.find(item => item.ID == obj.NewHotelId);
obj.Address = ckedObj.Address;
obj.Tel = ckedObj.Tel;
obj.NewHotelName = ckedObj.Name;
let ckedObj = obj.hotelList.find(item => item.ID == obj.NewHotelId)
obj.Address = ckedObj.Address
obj.Tel = ckedObj.Tel
obj.NewHotelName = ckedObj.Name
} else {
obj.Address = '';
obj.Tel = '';
obj.Address = ''
obj.Tel = ''
}
},
saveList(type) {
if (type == 0) {
this.list.forEach(item => {
item.HotelOrderState = 0;
item.HotelOrderState = 0
})
}
if (type == 1) {
this.list.forEach(item => {
item.HotelOrderState = 1;
item.HotelOrderState = 1
})
}
this.list.forEach(x => {
......@@ -374,10 +342,9 @@
})
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.getList();
this.Success(res.data.message);
this.Success(res.data.message)
} else {
this.Error(res.data.message);
this.Error(res.data.message)
}
}, err => {})
},
......@@ -386,33 +353,13 @@
item.HotelOrderState = 1;
this.apipost('dmcstatistics_post_SetNewHotelOrder', item, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.Success(res.data.message)
} else {
this.Error(res.data.message);
this.Error(res.data.message)
}
}, err => {})
},
//合同上传
uploadFileBtn(file) {
if (file.file.size > 1024 * 1024 * 100) {
this.$message.warning("文件大小不能超过100M！");
return;
}
let newArr = [];
newArr.push(file.file);
let path = "/Upload/DMC/";
this.$message.info("上传中...");
this.UploadSelfFileT(path, newArr, x => {
var fileUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.ClickItem.ContractUrlArray.push(fileUrl);
var str = "";
this.ClickItem.ContractUrlArray.forEach(subItem => {
str += subItem + ",";
})
this.ClickItem.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
});
},
}
},
mounted() {
this.TCNUM = this.$route.query.TCNUM;
......@@ -421,32 +368,8 @@
this.getList();
},
}
</script>
<style>
.RoomfileList{
width:100%;
height:20px;
text-align: center;
position: relative;
cursor: pointer;
}
.RoomfileList p{
display: inline-block;
}
.RoomfileList i:hover{
color:#E95252;
}
.roomReservationsDetailsTalbe .el-button--small {
padding: 0 20px 0 10px;
margin-top: 10px;
height:28px;
line-height: 10px;
}
.roomReservationsDetailsTalbe .el-button--small i{
float: left;
margin-top:9px;
}
.roomReservationsDetailsTalbe .roomBtn {
color: #fff;
padding: 0 10px !important;
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ a67b4ece
......@@ -315,7 +315,6 @@
this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
}
......
src/components/Restaurant/restaurantInfoManage.vue
View file @ a67b4ece
......@@ -858,6 +858,7 @@
<img v-if="!item" src="../../assets/img/bg_c3@3x.png">
<img :src="item.ShowPath" :onerror='defaultImg' />
<div class="imgzhe">
<div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
......@@ -899,6 +900,9 @@
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('restaurantList')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
</div>
</template>
<script>
......@@ -908,6 +912,11 @@
export default {
data() {
return {
imageOptions:{
navbar:false,
title:false
},
images: [],
selectAddress: false,
addimg: false,
//图片选取数组
......@@ -1043,6 +1052,23 @@
DMCchooseImg: DMCchooseImg
},
methods: {
inited (viewer){
this.$viewer = viewer
},
//显示图片详情
showImg: function (src) {
let srcArr = src.split('?')
src = srcArr[0]
let isExsit=false
this.images.forEach(x=>{
if(x===src)
isExsit=true
})
if(!isExsit)
this.images.push(src)
this.$viewer.show()
this.$viewer.view(this.images.indexOf(src))
},
//上传餐厅图片
UploadImage(file) {
let newArr = [];
......
src/components/SalesModule/VisaFinancialDocuments.vue deleted 100644 → 0
View file @ 06058588
This diff is collapsed.
src/components/SalesModule/groupInquiry.vue
View file @ a67b4ece
This diff is collapsed.
src/components/Ticketing/TicketManager.vue
View file @ a67b4ece
......@@ -2294,13 +2294,13 @@
beforeCheck: {
disabledDate: time => {
let endTime = new Date(this.msg.QFlightDateEnd);
return endTime.getTime() < time.getTime();
return time.getTime() > endTime.getTime();
}
},
afterCheck: {
disabledDate: time => {
let startTime = new Date(this.msg.QFlightDateStart);
return startTime.getTime() >= time.getTime();
return time.getTime() < (startTime.getTime() -1 * 24 * 60 * 60 * 1000);
}
},
rules: {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ a67b4ece
......@@ -854,53 +854,6 @@
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">保险费：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'保险费') || isExists(item.CostTypeList,'旅游责任险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr> </template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">其他：</div>
</div>
......@@ -916,7 +869,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
<tr v-if="NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1139,7 +1092,7 @@
gridData:[],
TCID: 0,
//数据列表
DataList: [],
DataList: "",
OutBranchId: 0,
ishowBtn: true,
CloseIncomeBtn: false,
......@@ -1241,7 +1194,7 @@
x.checked = false;
})
this.DataList = data;
console.log("resa",this.DataList)
// console.log("resa",this.DataList)
}
});
},
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a67b4ece
......@@ -676,7 +676,7 @@
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
<el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
@click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">收入确认单
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue
View file @ a67b4ece
......@@ -49,14 +49,6 @@
height:34px;
padding:10px;
}
.priceContent .pri_EmpName{
float:left;
margin-left:20px;
}
.priceContent .pri_DateTime{
float:right;
margin-right: 20px;
}
</style>
<template>
......@@ -67,7 +59,9 @@
<th>部门</th>
<th>{{dataList.DepartmentName}}</th>
<th>单号</th>
<th width="200">{{dataList.Id}}</th>
<th width="200" style="text-align:left;">
<span class="princeOrderSpan" v-for="item in dataList.OrderIds">{{item}}</span>
</th>
</tr>
<tr>
<th>团号</th>
......@@ -99,13 +93,8 @@
<td colspan="2">{{dataList.PlatformIncome}}</td>
</tr>
<tr>
<td colspan="4">
<span class="pri_EmpName">
操作人：{{dataList.EmpName}}
</span>
<span class="pri_DateTime">
操作时间：{{dataList.DateTimeStr}}
</span>
<td colspan="4" style="text-align:left;">
备注：{{dataList.Remark}}
</td>
</tr>
</table>
......
src/components/VisaCenter/VisaApplicationDetails.vue
View file @ a67b4ece
......@@ -21,16 +21,13 @@
<el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
{{$t('visa.v_tvisa')}}
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1" :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visa.v_Othervisas')}}</el-dropdown-item>
<el-dropdown-item v-for="(item,index) in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1" :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
{{$t('visa.v_gvisa')}}
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>{{$t('visa.v_Othervisas')}}</el-dropdown-item>
<el-dropdown-item v-for="(item,index) in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -47,10 +44,7 @@
<th>{{$t('hotel.table_operat')}}</th>
</tr>
<tr v-for="(item,index) in dataList">
<td width=150 class="text_left">
<input v-if="LineID==14" type="checkbox" :disabled="item.ApplyStatus!=-1" v-model="checkList" :value="item.Id" @change="checkThis">
<input v-else type="checkbox" :disabled="item.VisaManageStatus>1" v-model="checkList" :value="item.Id" @change="checkThis">
{{item.OrderId}}</td>
<td width=150 class="text_left"> <input type="checkbox" :disabled="item.ApplyStatus!=-1" v-model="checkList" :value="item.Id" @change="checkThis"> {{item.OrderId}}</td>
<td>{{item.GuestName}}</td>
<td><img class="_head_img" :src="item.SalesManPhoto" alt=""> {{item.SalesMan}}</td>
<td>
......@@ -60,42 +54,17 @@
<i v-if="item.IsDataFull==1||item.IsDataFull==0" class="iconfont icon-iconfontremind" @click="UrgeGuestInfo(item.Id,item.EmployeeId)" style="vertical-align:middle;"></i>
</td>
<td>
<span v-if="LineID==14">
{{item.VisaName}}
<span v-if="item.SignStatus==1" class="_radius" >{{$t('visa.v_dan')}}</span>
<span v-if="item.SignStatus==2" class="_radius _tuan">{{$t('visa.v_tuan')}}</span>
</span>
<span v-else>
<span v-if="item.VisaCountryType==1">{{$t('visa.v_Japanese')}}</span>
<span v-if="item.VisaCountryType==-1">{{$t('active.cl_qita')}}</span>
<span v-if="item.VisaType==1" class="_radius" >{{$t('visa.v_dan')}}</span>
<span v-if="item.VisaType==2" class="_radius _tuan">{{$t('visa.v_tuan')}}</span>
</span>
</td>
<td>
<span v-if="LineID==14">
<span v-if="item.ApplyStatus==0">{{$t('visa.v_chulizhong')}}</span>
<img v-if="item.ApplyStatus==1" src="../../assets/img/pass@2x.png" alt="">
<img v-if="item.ApplyStatus==2" src="../../assets/img/fail@2x.png" alt="">
</span>
<span v-else>
<span v-if="item.VisaCountryType!=0">
<span v-if="item.VisaManageStatus==1">未办理</span>
<span v-if="item.VisaManageStatus==2">办理中</span>
<span v-if="item.VisaManageStatus==3">办理完成</span>
</span>
</span>
</td>
<td>{{item.UpdateName}} <img class="_head_img" :src="item.UpdatePhoto" alt=""></td>
<td> <i @click="deletelist(item.Id)" class="iconfont icon-img_delete_small"></i>
<span v-if="LineID!=14">
<!-- <button v-if="item.VisaManageStatus==1" @click="UpdateGuestStatus(item,2)" style='background:#3EABFF;padding:4px 6px;color:#fff;cursor:pointer'>办理</button> -->
<button v-if="item.VisaManageStatus==2" @click="UpdateGuestStatus(item,3)" style='background:#3EABFF;padding:4px 6px;color:#fff;cursor:pointer'>办理完成</button>
</span>
</td>
<td> <i @click="deletelist(item.Id)" class="iconfont icon-img_delete_small"></i></td>
</tr>
</table>
</div>
......@@ -131,27 +100,11 @@ export default {
Name:'拒签'
},
],
LineID:0,
}
},
watch:{},
computed:{},
methods:{
UpdateGuestStatus(item,num){
let msg={
guestId:item.Id,
visaManageStatus:num
};
this.apipost('dmc_post_UpdateGuestVisaManageStatus',msg,res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message)
this.getData()
}
else{
this.$message.error(res.data.message)
}
})
},
UrgeGuestInfo(id,EmployeeId){ //催客人完善资料
let msg = {
GuestId:id,
......@@ -191,10 +144,7 @@ export default {
},err=>{})
},
bindVisa(command){ //绑定签证类型
if(command.id>0&&this.LineID!=14){
this.$message.error('请选择正确的签证类型！')
return;
}
console.log(command)
if(this.checkList.length==0){
this.$message.error('请选择需要绑定的人员')
return
......@@ -240,25 +190,15 @@ export default {
},
getData(){ //获取数据
this.loading = true
this.checkListAll=[];
this.checkListAll=[]
this.apipost('dmc_get_GetTCGuestList',{TCID:this.id},res=>{
if(res.data.resultCode==1){
this.dataList = res.data.data;
if(this.LineID==14){
this.dataList = res.data.data
this.dataList.forEach(x=>{
if(x.ApplyStatus==-1){
this.checkListAll.push(x.Id)
}
})
}else{
this.dataList.forEach(x=>{
if(x.VisaManageStatus==1 || x.VisaManageStatus==0){
this.checkListAll.push(x.Id)
}
})
}
}else{
this.$message.error(res.data.message)
}
......@@ -269,8 +209,7 @@ export default {
created(){},
mounted(){
this.id = this.$route.query.id
this.num = this.$route.query.num;
this.LineID=this.$route.query.LineID;
this.num = this.$route.query.num
this.getVisaManagementList()
this.getData()
}
......
src/components/VisaCenter/addVisa.vue
View file @ a67b4ece
This diff is collapsed.
src/components/VisaCenter/seeVisa.vue
View file @ a67b4ece
This diff is collapsed.
src/components/administrative/departmentManagement.vue
View file @ a67b4ece
......@@ -401,11 +401,11 @@
<td>{{item.PostName}}</td>
<td>{{item.Sort}}</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button type="primary" icon="el-icon-edit" circle
@click="outerVisible = true,dialogTitle='修改部门信息',updateData(item.DepartmentID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.delete')" placement="top">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" icon="el-icon-delete" @click='deleteDeparment(item.DepartmentID)'
circle></el-button>
</el-tooltip>
......@@ -473,20 +473,20 @@
</tr>
<tr>
<td>
<el-form-item :label="$t('admin.admin_departsort')" prop="Sort">
<el-form-item label="部门排序" prop="Sort">
<el-input class='w200' type="text" v-model="addMsg.Sort"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
<td>
<el-form-item class='w400' :label="$t('admin.admin_isleader')" prop="IsLeader">
<el-form-item class='w400' label='是否领队' prop="IsLeader">
<el-switch v-model="addMsg.IsLeader" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item :label="$t('admin.admin_Bindingposition')" prop="PostIdArr">
<el-form-item label="绑定岗位" prop="PostIdArr">
<el-select filterable class='w500 multiple_input' multiple v-model='addMsg.PostIdArr'
:placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId">
......@@ -657,7 +657,7 @@
}],
EmCard: [{
pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
message: this.$t('rule.qsrIdnum'),
message: '请输正确的身份证号459258'
}],
},
//请求数据
......@@ -1124,16 +1124,16 @@
},
deleteDeparment(id) {
this.$confirm(this.$t('tips.tips_deletealldepart'), this.$t('tips.tips'), {
confirmButtonText:this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
this.$confirm('删除该部门，会将其子部门全部删除！是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('admin_post_DepartmentRemove', {
DepartmentID: id
}, res => {
if (res.data.resultCode == 1) {
this.$message.success(this.$t('tips.shanchuchenggong'))
this.$message.success('删除成功！')
this.getList();
this.getAllDepartment()
}
......
src/components/administrative/userManagement.vue
View file @ a67b4ece
......@@ -15,8 +15,8 @@
<div class="flexOne">
<div class="query-box">
<ul class="user_time_picker">
<li><span><em>{{$t('system.table_company')}}</em><el-select filterable :disabled ="msg.IsParentCompany==2" v-model='msg.RB_Branch_id' @change='linkageDepartment()'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<li><span><em>公司</em><el-select filterable :disabled ="msg.IsParentCompany==2" v-model='msg.RB_Branch_id' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option>
<el-option v-for='item in companyList'
:label='item.BName'
:value='item.Id'
......@@ -24,8 +24,8 @@
</el-option>
</el-select>
</span></li>
<li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.RB_Department_Id' @change='linkagePost()'>
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<li><span><em>部门</em><el-select filterable v-model='msg.RB_Department_Id' @change='linkagePost()'>
<el-option label='不限' value='0'></el-option>
<el-option v-for='item in departMentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -34,8 +34,8 @@
</el-select>
</span>
</li>
<li><span><em>{{$t('admin.admin_Post')}}</em><el-select filterable v-model='msg.RB_Post_Id'>
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<li><span><em>岗位</em><el-select filterable v-model='msg.RB_Post_Id'>
<el-option label='不限' value='0'></el-option>
<el-option v-for='item in PostList'
:label='item.PostName'
:value='item.PostId'
......@@ -43,50 +43,50 @@
</el-option>
</el-select>
</span></li>
<li><span><em>{{$t('system.query_name')}}</em><el-input v-model='msg.EmName' @keyup.enter.native="getList" ></el-input></span></li>
<li><span><em>{{$t('admin.admin_logincount')}}</em><el-input v-model='msg.EmAccount' @keyup.enter.native="getList" ></el-input></span></li>
<li><span><em>{{$t('hotel.hotel_status')}}</em><el-select filterable v-model="msg.Status" >
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option :label="$t('pub.jobSel')" value="0"></el-option>
<el-option :label="$t('pub.noJobSel')" value="1"></el-option>
<li><span><em>姓名</em><el-input v-model='msg.EmName' @keyup.enter.native="getList" ></el-input></span></li>
<li><span><em>登陆账号</em><el-input v-model='msg.EmAccount' @keyup.enter.native="getList" ></el-input></span></li>
<li><span><em>状态</em><el-select filterable v-model="msg.Status" >
<el-option label="不限" value="-1"></el-option>
<el-option label="在职" value="0"></el-option>
<el-option label="离职" value="1"></el-option>
</el-select>
</span>
</li>
<li><span><em>{{$t('admin.admin_Entrytime')}}</em><el-date-picker v-model='msg.sEmEntry' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<li><span><em>入职时间</em><el-date-picker v-model='msg.sEmEntry' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-
<el-date-picker v-model='msg.eEmEntry' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li><span><em>{{$t('admin.admin_Departuretime')}}</em><el-date-picker v-model='msg.sEmLeave' value-format="yyyy-MM-dd" class='w105' type="date"></el-date-picker>
<li><span><em>离职时间</em><el-date-picker v-model='msg.sEmLeave' value-format="yyyy-MM-dd" class='w105' type="date"></el-date-picker>
-
<el-date-picker v-model='msg.eEmLeave' value-format="yyyy-MM-dd" class='w105' type="date"></el-date-picker>
</span>
</li>
<li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
<li><input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
<input type="button" @click="outerVisible = true,isleaveBtn=false,dialogTitle='添加员工',getCompany()" class="normalBtn" value="新增" /></li>
</ul>
</div>
<div class="clearfix"></div>
<div style="margin: 10px 0;" class="fz14 color333">{{$t('admin.admin_Validaccount')}}:<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></div>
<div style="margin: 10px 0;" class="fz14 color333">有效账号：<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>{{$t('system.table_company')}}</th>
<th>{{$t('admin.admin_Department')}}</th>
<th>{{$t('admin.admin_Post')}}</th>
<th>{{$t('system.query_name')}}</th>
<th>{{$t('system.table_sex')}}</th>
<th>{{$t('system.table_acc')}}</th>
<th>{{$t('admin.admin_logintel')}}</th>
<th>{{$t('admin.admin_Entrytime')}}</th>
<th>{{$t('admin.admin_Departuretime')}}</th>
<th>{{$t('admin.admin_operate')}}</th>
<th>公司</th>
<th>部门</th>
<th>岗位</th>
<th>姓名</th>
<th>性别</th>
<th>账号</th>
<th>登录手机号</th>
<th>入职时间</th>
<th>离职时间</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in DataList" v-loading='loading'>
<td>{{item.BranchName}}</td>
<td>{{item.DepartName}}</td>
<td>{{item.PostName}}</td>
<td>{{item.EmName}}</td>
<td>{{item.EmSex}}==0 ? {{$t('pub.man')}} :{{$t('pub.woman')}}</td>
<td>{{item.EmSex==0?'男':'女'}}</td>
<td>{{item.EmAccount}}</td>
<td>{{item.EmLoginMobile}}</td>
<td>{{item.EmEntry}}</td>
......
src/components/busManagement/BusInfo.vue
View file @ a67b4ece
This diff is collapsed.
src/components/busManagement/busStatistics.vue
View file @ a67b4ece
......@@ -153,7 +153,7 @@
</div></td>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div class="w100 link">
<span @click="goUrlX('BusInfo',outItem,'车配信息')">详情</span>
<span @click="goUrlX('BusInfo',item,outItem,'车配信息')">详情</span>
<span @click="DownLoadFile(item,outItem.NewCombinationNum)">下载</span>
</div>
</td>
......@@ -294,14 +294,28 @@ totalPrice+=busInfo.CostPrice*(Number(busInfo.TransferNum)+1)*PeopleNum;
}
);
},
goUrlX(path,obj,title){
console.log(obj);
//
let TotalSeat=0;
obj.StaticsReportList.forEach(outItem=>{
TotalSeat+=outItem.CommonReport.HouseStatistics.RealityNum;
});
this.$router.push({ name:path,query:{"TCID":obj.TCIDs,TotalNumber:TotalSeat,blank:'y',tab:title}})
goUrlX(path,obj,outItem,title){
this.$router.push({
name: path,
query: {
"TCID": obj.TCIDS,
StartDate: obj.StartDateStr,
DayNum: obj.DayNum,
TotalNumber: obj.TotalSeat, //机位总数
RealityYSeatNum:obj.CommonReport.HouseStatistics.RealityYSeatNum,
RealityESeatNum:obj.CommonReport.HouseStatistics.RealityESeatNum,
RealityFSeatNum:obj.CommonReport.HouseStatistics.RealityFSeatNum,
LeaderName:obj.LeaderName,
GuideName:obj.GuideName,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
title:obj.Titles,
TCNUMS:obj.TCNUMS,
InOut:obj.InOut,
RealityNum:obj.CommonReport.HouseStatistics.RealityNum,
tab: title
}
})
},
goUrlR(path,obj,title){
this.$router.push({ name:path,query:{"ID":obj,blank:'y',tab:title}})
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ a67b4ece
......@@ -220,7 +220,6 @@
this.apipost('dmcstatistics_get_SetTicketOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
}
......
src/components/systemManagement/destinationManagement.vue
View file @ a67b4ece
......@@ -41,7 +41,7 @@
<li>
<label>{{$t('system.query_lineName')}}</label>
<el-select v-model="msg.LineID" filterable :placeholder="$t('system.ph_choice')" class="w210">
<el-option label='不限' :value='defaultSelectValue'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelectValue'></el-option>
<el-option v-for='item in lineList' :key="item.LineID" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
......@@ -51,8 +51,8 @@
<el-input v-model="msg.PlaceName" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="添加" @click="outerVisible=true,dialogTitle='新增'" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible=true,dialogTitle='新增'" />
</li>
</ul>
</div>
......
src/components/systemManagement/lineManagement.vue
View file @ a67b4ece
......@@ -491,10 +491,10 @@ input[type="number"] {
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路方向" prop="LineDirection">
<el-form-item :label="$t('Operation.Op_LineDirection')" prop="LineDirection">
<el-select v-model="addMsg.LineDirection" :placeholder="$t('pub.pleaseSel')" class="w290">
<el-option label='入境' :value='1'></el-option>
<el-option label='出境' :value='2'></el-option>
<el-option :label="$t('Operation.Op_theEntry')" :value='1'></el-option>
<el-option :label="$t('Operation.Op_leaveCountry')" :value='2'></el-option>
</el-select>
</el-form-item>
</el-col>
......
src/components/systemManagement/seriesManagement.vue
View file @ a67b4ece
......@@ -77,7 +77,7 @@
<li>
<label class="">{{$t('system.table_ssLine')}}</label>
<el-select v-model="msg.LineID" filterable :placeholder="$t('system.ph_choice')" class="w210">
<el-option label='不限' :value='defaultSelectValue'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelectValue'></el-option>
<el-option v-for='item in lineList' :key="item.LineID" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
......@@ -90,12 +90,12 @@
</el-select>
</li>
<li>
<label class="">系列名</label>
<label class="">{{$t('active.ad_xlmc')}}</label>
<el-input type="text" v-model="msg.LtName" :placeholder="$t('system.ph_LtName')" @keyup.native.enter="getList" maxlength="20" class="w210"></el-input>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="添加" @click="outerVisible=true,dialogTitle='新增团名资料'" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible=true,dialogTitle='新增团名资料'" />
</li>
</ul>
</div>
......@@ -103,8 +103,8 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="">{{$t('system.table_ssLine')}}</th>
<th>目的地</th>
<th>系列名</th>
<th>{{$t('system.query_dest')}}</th>
<th>{{$t('active.ad_xlmc')}}</th>
<th>{{$t('system.table_isShow')}}</th>
<th width="200">{{$t('system.table_operation')}}</th>
</tr>
......@@ -140,14 +140,14 @@
<el-form-item :label="$t('system.table_ssLine')" prop="LineID">
<el-select v-model="addMsg.LineID" filterable :placeholder="$t('system.ph_choice')" @change="getDestinationList(1)"
class="w210">
<el-option label='不限' :value='defaultSelectValue'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelectValue'></el-option>
<el-option v-for='item in lineList' :key="item.LineID" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('system.query_dest')" prop="placeID">
<el-select v-model="addMsg.placeID" filterable :placeholder="$t('system.ph_choice')" class="w210">
<el-option label='不限' :value='defaultSelectValue'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelectValue'></el-option>
<el-option v-for='item in destinationList' :key="item.PlaceID" :label="item.PlaceName" :value="item.PlaceID">
</el-option>
</el-select>
......@@ -158,7 +158,7 @@
{{$t('system.table_codeTips')}}
</div>
</el-form-item>
<el-form-item label="系列名" prop="LtName">
<el-form-item :label="$t('active.ad_xlmc')" prop="LtName">
<el-input type="text" v-model="addMsg.LtName" :placeholder="$t('system.ph_LtName')" maxlength="20" class="w210"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_isSaleInNET')" class="seriesMg_tips_f">
......@@ -175,8 +175,8 @@
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取消</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
......
src/components/systemManagement/transportCostsManagement.vue
View file @ a67b4ece
......@@ -18,36 +18,36 @@
<li>
<span>
<em>{{$t('system.query_lineName')}}</em>
<el-select filterable v-model='msg.lineID' placeholder="不限">
<el-option label='不限' value='0'></el-option>
<el-select filterable v-model='msg.lineID'>
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in lineList' :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()" value="查询" />
<input type="button" class="normalBtn" @click="clearInfo(),outerVisible=true,dialogTitle='新增联运成本'" value="新增" />
<input type="button" class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()" :value="$t('pub.unlimitedSel')" />
<input type="button" class="normalBtn" @click="clearInfo(),outerVisible=true,dialogTitle='新增联运成本'" :value="$t('pub.addBtn')" />
</li>
</ul>
</div>
<div class="commonContent" v-loading="loading">
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th rowspan="2" class="TCMRightborder">线路</th>
<th colspan="4" class="TCMRightbottom">成都机位出发</th>
<th colspan="4" class="TCMRightbottom">当地机位出发</th>
<th rowspan="2" class="TCMRightleft">操作</th>
<th rowspan="2" class="TCMRightborder">{{$t('advmanager.v_line')}}</th>
<th colspan="4" class="TCMRightbottom">{{$t('Operation.Op_Cdreservation')}}</th>
<th colspan="4" class="TCMRightbottom">{{$t('Operation.Op_localrevervation')}}</th>
<th rowspan="2" class="TCMRightleft">{{$t('hotel.table_operat')}}</th>
</tr>
<tr>
<th>总公司价格</th>
<th>分公司价格</th>
<th>代销商价格</th>
<th class="TCMRightborder">当团利润归属</th>
<th>总公司价格</th>
<th>分公司价格</th>
<th>代销商价格</th>
<th>当团利润归属</th>
<th>{{$t('Operation.Op_headOfficePrice')}}</th>
<th>{{$t('Operation.Op_branchPrice')}}</th>
<th>{{$t('Operation.Op_affiliate')}}</th>
<th class="TCMRightborder">{{$t('Operation.Op_profitsBelong')}}</th>
<th>{{$t('Operation.Op_headOfficePrice')}}</th>
<th>{{$t('Operation.Op_branchPrice')}}</th>
<th>{{$t('Operation.Op_affiliate')}}</th>
<th>{{$t('Operation.Op_profitsBelong')}}</th>
</tr>
<tr v-for="item in tableInfo" :key="item.subCode">
<td>{{item.LineName}}</td>
......@@ -76,38 +76,38 @@
</div>
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
<el-form-item label="线路" prop="lineID">
<el-select filterable clearable v-model='addMsg.lineID' placeholder="不限" class="w210">
<el-form-item :label="$t('advmanager.v_line')" prop="lineID">
<el-select filterable clearable v-model='addMsg.lineID' class="w210">
<el-option v-for='item in lineList' :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="总公司价格" prop="HeadofficePrice">
<el-form-item :label="$t('Operation.Op_headOfficePrice')" prop="HeadofficePrice">
<el-input type="text" v-model="addMsg.HeadofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'HeadofficePrice')"></el-input>
</el-form-item>
<el-form-item label="分公司价格" prop="BranchofficePrice">
<el-form-item :label="$t('Operation.Op_branchPrice')" prop="BranchofficePrice">
<el-input type="text" v-model="addMsg.BranchofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'BranchofficePrice')"></el-input>
</el-form-item>
<el-form-item label="代销商价格" prop="AffiliatePrice">
<el-form-item :label="$t('Operation.Op_affiliate')" prop="AffiliatePrice">
<el-input type="text" v-model="addMsg.AffiliatePrice" class="w210" @keyup.native="checkPrice(addMsg,'AffiliatePrice')"></el-input>
</el-form-item>
<el-form-item label="当团利润归属" prop="ProfitAffiliation">
<el-select filterable clearable v-model='addMsg.ProfitAffiliation' placeholder="不限" class="w210">
<el-form-item :label="$t('Operation.Op_profitsBelong')" prop="ProfitAffiliation">
<el-select filterable clearable v-model='addMsg.ProfitAffiliation' class="w210">
<el-option v-for='item in profitBelong' :label='item.label' :value='item.value' :key='item.value'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="当地总公司价格" prop="LocalHeadofficePrice">
<el-form-item :label="$t('Operation.Op_localzongprice')" prop="LocalHeadofficePrice">
<el-input type="text" v-model="addMsg.LocalHeadofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'LocalHeadofficePrice')"></el-input>
</el-form-item>
<el-form-item label="当地分公司价格" prop="LocalBranchofficePrice">
<el-form-item :label="$t('Operation.Op_localBranchPrice')" prop="LocalBranchofficePrice">
<el-input type="text" v-model="addMsg.LocalBranchofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'LocalBranchofficePrice')"></el-input>
</el-form-item>
<el-form-item label="当地代销商价格" prop="LocalAffiliatePrice">
<el-form-item :label="$t('Operation.Op_localdaiPrice')" prop="LocalAffiliatePrice">
<el-input type="text" v-model="addMsg.LocalAffiliatePrice" class="w210" @keyup.native="checkPrice(addMsg,'LocalAffiliatePrice')"></el-input>
</el-form-item>
<el-form-item label="当地当团利润归属" prop="LocalProfitAffiliation">
<el-select filterable clearable v-model='addMsg.LocalProfitAffiliation' placeholder="不限" class="w210">
<el-form-item :label="$t('Operation.Op_localDangPrice')" prop="LocalProfitAffiliation">
<el-select filterable clearable v-model='addMsg.LocalProfitAffiliation' class="w210">
<el-option v-for='item in profitBelong' :label='item.label' :value='item.value' :key='item.value'>
</el-option>
</el-select>
......@@ -116,8 +116,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button> &nbsp;
<button class="hollowFixedBtn" @click="resetForm('addMsg'),outerVisible = false">取消</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
......
src/plug/index.js
View file @ a67b4ece
......@@ -119,8 +119,6 @@ export default {
let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.65:8025"; //214主域名
domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.0.119:8082";
// domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......
src/router/config.js
View file @ a67b4ece
......@@ -1718,14 +1718,6 @@ export default {
title: '团期查询'
},
},
{ // 签证中心 签证财务单据
path: '/VisaFinancialDocuments',
name: 'VisaFinancialDocuments',
component: resolve => require(['@/components/SalesModule/VisaFinancialDocuments'], resolve),
meta: {
title: '签证财务单据'
},
},
{ // 签证中心 签证工作表
path: '/visaWorksheet',
name: 'visaWorksheet',
......
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