Skip to content

S
SuperMan
Commit 6bb0e749 authored by 123zhang's avatar 123zhang
Browse files
Options

冲突解决

parents 14ddf788 1ad2ac39
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1308 additions and 430 deletions
src/assets/common/lang/zh.js
View file @ 6bb0e749
......@@ -253,7 +253,17 @@ export const admin={ //行政
admin_LoginPwd:'登录密码',
admin_lnLoginPwd:'请输入登录密码',
admin_Department:'部门',
admin_Post:'岗位',
admin_Post:'岗位',
admin_xueli:'学历',
admin_Entrytime:'入职时间',
admin_Departuretime:'离职时间',
admin_Birthday:'生日',
admin_password:'密码',
admin_departsort:'部门排序',
admin_isleader:'是否领队',
admin_Bindingposition:'绑定岗位',
admin_sort:'排序',
admin_level:'级',
}
//zk
export const hotel = {
......@@ -620,6 +630,37 @@ export const visa = {
v_chulizhong:'处理中',
v_lvkebianma:'旅客编码',
v_chaifenzhuangtai:'拆分状态',
v_weibanli:'未办理',
v_banlizhong:'办理中',
v_yibanli:'以办理',
v_tkgjcx:'团控高级查询',
v_czuser:'操作人员',
v_xcdays:'行程天数',
v_lycity:'联运城市',
v_teamnum:'团队人数',
v_zkbaochaotuan:'只看报超团',
v_salecompany:'销售公司',
v_tqstatus:'团期状态',
v_hbstatus:'航班状态',
v_gjchaxun:'高级查询',
v_dwanshan:'待完善',
v_yxiajia:'已下架',
v_hangban:'航班',
v_zanding:'暂定',
v_teaminfo:'团队信息',
v_tuanweiinfo:'团位信息',
v_currentseat:'当前余位',
v_yibaoru:'已报入',
v_houbu:'候补',
v_yxhoubu:'允许候补',
}
export const advmanager = {
v_all:'全部',
......@@ -1006,6 +1047,76 @@ export const fnc = {
khyuanbi: '（原币）',
khbweibi: '（本位币）',
jylshuihao: '交易流水号',
shzhuangtai: '审核状态',
yjdanju: '佣金单据',
mbleixing: '模板类型',
djleixing: '单据类型',
yingshou: '应收',
yingfu: '应付',
shishou: '实收',
shifu: '实付',
zjdiaobo: '资金调拨',
tuanqi: '团期',
hkriqi: '汇款日期',
fybumen: '费用部门',
zdrenyuan: '制单人员',
zhleixing: '账户类型',
sfkzhanghu: '收付款账户',
dxleixing: '对象类型',
ddbianhao: '订单编号',
bzleixing: '币种类型',
djjine: '单据金额',
zdriqi: '制单日期',
spriqi: '审批日期',
gjchaxun: '高级查询',
piltijiao: '批量提交',
gzweituo: '工作委托',
shoukuan: '收款',
fukuan: '付款',
duixiang: '对象',
dqzhuangtai: '当前状态',
gnjpqishu: '国内票务期数',
qzbianhao: '签证编号',
tsbianhao: '投诉编号',
smjpbianhao: '散卖机票编号',
chakan: '查看',
shenhe: '审核',
zhuanjiao: '转交',
tzjyriqi: '调整交易日期',
xzzjiaoren: '选择转交人',
zhuanjiaoren: '转交人',
yjyriqi: '原交易日期',
cwbaobiao: '财务报表',
shuoming:'说明',
djbianhao: '单据编号',
cjshijian: '创建时间',
xiangqing: '详情',
zjdbbiao: '资金调拨报表',
zongbu: '总部',
fgongsi: '分公司',
zjdbodan: '资金调拨单',
skduixiang: '收款对象',
skfangshi: '收款方式',
dkzhanghu: '到款账户',
bwyue: '本位金额',
dbriqi: '调拨日期',
qingkong: '清空',
bnshanchu: '不能删除了！',
zhibiao: '制表',
bwbjine: '本位币金额',
shliucheng: '审核流程',
shouqi: '收起',
zhankai: '展开',
faqi: '发起',
daishen: '待审',
bohui: '驳回',
you: '由',
gei: '给',
zjbeizhu: '转交备注',
jieshu: '结束',
ljhaoshi: '累计耗时',
xsfujian: '显示附件',
ycfujian: '隐藏附件',
}
export const tips = {
tips: '提示',
......@@ -1063,6 +1174,8 @@ export const tips = {
qzcpbianhao: '签证产品编号',
qishu: '期数',
jiaoyifangshi: '交易方式',
zwtqxinxi: '暂无团期信息',
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！'
}
export const Operation = {
Op_ShortName:'线路简称',
......@@ -1081,6 +1194,19 @@ export const Operation = {
Op_Project:'项目',
Op_notInvoled:'未参与',
Op_ManageDepartment:'管理部门',
Op_LineDirection:'线路方向',
Op_leaveCountry:'出境',
Op_theEntry:'入境',
Op_Cdreservation:'成都机位出发',
Op_localrevervation:'当地机位出发',
Op_headOfficePrice:'总公司价格',
Op_branchPrice:'分公司价格',
Op_affiliate:'代销商价格',
Op_profitsBelong:'当团利润归属',
Op_localzongprice:'当地总公司价格',
Op_localBranchPrice:'当地分公司价格',
Op_localdaiPrice:'当地代销商价格',
Op_localDangPrice:'当地当团利润归属',
}
export const rule = {
company: '请选择公司',
......@@ -1159,7 +1285,6 @@ export const rule = {
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
......@@ -1169,8 +1294,12 @@ export const rule = {
qsrname:"请输入姓名",
qsrtelphone:"请输入正确的手机",
qsrIdnum:"请输正确的身份证号",
qxzzjiaoren: '请选择转交人',
qtxzjbeizhu: '请填写转交备注',
qxztzhdjyriqi: '请选择调整后的交易日期',
qtxshuoming: '请填写说明',
qxzygxytjddanju: '请选择一个需要提交的单据！',
qxzbmen: '请选择部门',
}
export const adm={
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ 6bb0e749
......@@ -90,14 +90,14 @@
</div>
<div class="rb_top_row _r_mb5" v-if="isPrintPage">
<p>
<span class="">{{$t('fnc.v_tuanhao')}}：
<span class="">{{$t('visa.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('fnc.qzcpbianhao')}}：
<span class="">{{$t('tips.qzcpbianhao')}}：
<span>{{GetDetail.SourceID}}</span>
</span>
</p>
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 6bb0e749
......@@ -903,6 +903,16 @@ 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,
......@@ -1002,6 +1012,16 @@ 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,
......@@ -1494,6 +1514,7 @@ export default {
"实收金额",
"退款",
"平台税金",
"优惠金额",
"待收金额",
"溢收金额",
"人数",
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 6bb0e749
......@@ -286,6 +286,7 @@
</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/roomReservationsDetails.vue
View file @ 6bb0e749
......@@ -104,6 +104,18 @@
</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">
......@@ -213,10 +225,26 @@
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,
......@@ -265,11 +293,15 @@
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) {
......@@ -281,22 +313,22 @@
x.UnitPrice = x.UnitPrice.toString();
x.HotelDiscount = x.HotelDiscount.toString();
})
if(item.ReserveNo==''||item.ReserveNo==null){
item.ReserveNo = this.$route.query.NewCombinationNum;
}
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', {
......@@ -305,32 +337,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 => {
......@@ -342,9 +374,10 @@
})
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList();
this.Success(res.data.message);
} else {
this.Error(res.data.message)
this.Error(res.data.message);
}
}, err => {})
},
......@@ -353,13 +386,33 @@
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;
......@@ -368,8 +421,32 @@
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 @ 6bb0e749
......@@ -315,6 +315,7 @@
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/SalesModule/VisaFinancialDocuments.vue 0 → 100644
View file @ 6bb0e749
This diff is collapsed.
src/components/SalesModule/groupInquiry.vue
View file @ 6bb0e749
This diff is collapsed.
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 6bb0e749
......@@ -854,6 +854,53 @@
</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>
......@@ -869,7 +916,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,'赔偿')">
<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,'旅游责任险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1092,7 +1139,7 @@
gridData:[],
TCID: 0,
//数据列表
DataList: "",
DataList: [],
OutBranchId: 0,
ishowBtn: true,
CloseIncomeBtn: false,
......@@ -1194,7 +1241,7 @@
x.checked = false;
})
this.DataList = data;
// console.log("resa",this.DataList)
console.log("resa",this.DataList)
}
});
},
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue
View file @ 6bb0e749
......@@ -49,6 +49,14 @@
height:34px;
padding:10px;
}
.priceContent .pri_EmpName{
float:left;
margin-left:20px;
}
.priceContent .pri_DateTime{
float:right;
margin-right: 20px;
}
</style>
<template>
......@@ -59,9 +67,7 @@
<th>部门</th>
<th>{{dataList.DepartmentName}}</th>
<th>单号</th>
<th width="200" style="text-align:left;">
<span class="princeOrderSpan" v-for="item in dataList.OrderIds">{{item}}</span>
</th>
<th width="200">{{dataList.Id}}</th>
</tr>
<tr>
<th>团号</th>
......@@ -93,8 +99,13 @@
<td colspan="2">{{dataList.PlatformIncome}}</td>
</tr>
<tr>
<td colspan="4" style="text-align:left;">
备注：{{dataList.Remark}}
<td colspan="4">
<span class="pri_EmpName">
操作人：{{dataList.EmpName}}
</span>
<span class="pri_DateTime">
操作时间：{{dataList.DateTimeStr}}
</span>
</td>
</tr>
</table>
......
src/components/VisaCenter/VisaApplicationDetails.vue
View file @ 6bb0e749
......@@ -12,6 +12,10 @@
.wrapper ._radius {display: inline-block;width: 24px;height: 24px;background-color: #FF793E;color: #fff;border-radius: 50%;text-align: center;line-height: 22px;font-size: 12px;margin-right: 10px;}
.wrapper ._radius._tuan{background-color: #3EABFF}
.wrapper .icon-img_delete_small{cursor: pointer;}
.updatestatus{
position: absolute;
right:10px;
}
</style>
<template>
<div class="wrapper">
......@@ -21,14 +25,17 @@
<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,index) 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-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-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,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-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-menu>
</el-dropdown>
</div>
</div>
......@@ -44,7 +51,10 @@
<th>{{$t('hotel.table_operat')}}</th>
</tr>
<tr v-for="(item,index) in dataList">
<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 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>{{item.GuestName}}</td>
<td><img class="_head_img" :src="item.SalesManPhoto" alt=""> {{item.SalesMan}}</td>
<td>
......@@ -54,17 +64,42 @@
<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>
{{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 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="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 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></td>
<td style="position:relative;width:200px"> <i @click="deletelist(item.Id)" class="iconfont icon-img_delete_small"></i>
<span class="updatestatus" 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>
</tr>
</table>
</div>
......@@ -100,11 +135,27 @@ 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,
......@@ -144,7 +195,10 @@ export default {
},err=>{})
},
bindVisa(command){ //绑定签证类型
console.log(command)
if(command.id>0&&this.LineID!=14){
this.$message.error('请选择正确的签证类型！')
return;
}
if(this.checkList.length==0){
this.$message.error('请选择需要绑定的人员')
return
......@@ -190,15 +244,25 @@ 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
this.dataList.forEach(x=>{
this.dataList = res.data.data;
if(this.LineID==14){
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)
}
......@@ -209,7 +273,8 @@ export default {
created(){},
mounted(){
this.id = this.$route.query.id
this.num = this.$route.query.num
this.num = this.$route.query.num;
this.LineID=this.$route.query.LineID;
this.getVisaManagementList()
this.getData()
}
......
src/components/administrative/departmentManagement.vue
View file @ 6bb0e749
......@@ -401,11 +401,11 @@
<td>{{item.PostName}}</td>
<td>{{item.Sort}}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" 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="删除" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.delete')" 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="部门排序" prop="Sort">
<el-form-item :label="$t('admin.admin_departsort')" 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='是否领队' prop="IsLeader">
<el-form-item class='w400' :label="$t('admin.admin_isleader')" 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="绑定岗位" prop="PostIdArr">
<el-form-item :label="$t('admin.admin_Bindingposition')" 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: '请输正确的身份证号459258'
message: this.$t('rule.qsrIdnum'),
}],
},
//请求数据
......@@ -1124,16 +1124,16 @@
},
deleteDeparment(id) {
this.$confirm('删除该部门，会将其子部门全部删除！是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.tips_deletealldepart'), this.$t('tips.tips'), {
confirmButtonText:this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('admin_post_DepartmentRemove', {
DepartmentID: id
}, res => {
if (res.data.resultCode == 1) {
this.$message.success('删除成功！')
this.$message.success(this.$t('tips.shanchuchenggong'))
this.getList();
this.getAllDepartment()
}
......
src/components/administrative/userManagement.vue
View file @ 6bb0e749
......@@ -15,8 +15,8 @@
<div class="flexOne">
<div class="query-box">
<ul class="user_time_picker">
<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>
<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>
<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>部门</em><el-select filterable v-model='msg.RB_Department_Id' @change='linkagePost()'>
<el-option label='不限' value='0'></el-option>
<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>
<el-option v-for='item in departMentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -34,8 +34,8 @@
</el-select>
</span>
</li>
<li><span><em>岗位</em><el-select filterable v-model='msg.RB_Post_Id'>
<el-option label='不限' value='0'></el-option>
<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>
<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>姓名</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>
<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>
</el-select>
</span>
</li>
<li><span><em>入职时间</em><el-date-picker v-model='msg.sEmEntry' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<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>
-
<el-date-picker v-model='msg.eEmEntry' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li><span><em>离职时间</em><el-date-picker v-model='msg.sEmLeave' value-format="yyyy-MM-dd" class='w105' type="date"></el-date-picker>
<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>
-
<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="查询" @click="resetPageIndex(),getList()" /> &nbsp;
<li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @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">有效账号：<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></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>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>公司</th>
<th>部门</th>
<th>岗位</th>
<th>姓名</th>
<th>性别</th>
<th>账号</th>
<th>登录手机号</th>
<th>入职时间</th>
<th>离职时间</th>
<th>操作</th>
<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>
</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?'男':'女'}}</td>
<td>{{item.EmSex}}==0 ? {{$t('pub.man')}} :{{$t('pub.woman')}}</td>
<td>{{item.EmAccount}}</td>
<td>{{item.EmLoginMobile}}</td>
<td>{{item.EmEntry}}</td>
......
src/components/busManagement/BusInfo.vue
View file @ 6bb0e749
......@@ -706,12 +706,12 @@ export default {
getBeforeInfo(index){
let oldPlanData = this.PlanTableData[index-1];
let newPlanData = this.PlanTableData[index];
newPlanData.PlanDateStr = oldPlanData.PlanDateStr;
newPlanData.HotelName = oldPlanData.HotelName;
newPlanData.IsHavearking = oldPlanData.IsHavearking;
newPlanData.AirportPickUp = oldPlanData.AirportPickUp;
newPlanData.UseType = oldPlanData.UseType;
newPlanData.UseTime = oldPlanData.UseTime;
// newPlanData.PlanDateStr = oldPlanData.PlanDateStr;
// newPlanData.HotelName = oldPlanData.HotelName;
// newPlanData.IsHavearking = oldPlanData.IsHavearking;
// newPlanData.AirportPickUp = oldPlanData.AirportPickUp;
// newPlanData.UseType = oldPlanData.UseType;
// newPlanData.UseTime = oldPlanData.UseTime;
newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.DriverName = oldPlanData.DriverName;
newPlanData.DriverTel = oldPlanData.DriverTel;
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 6bb0e749
......@@ -220,6 +220,7 @@
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/plug/index.js
View file @ 6bb0e749
......@@ -119,6 +119,8 @@ 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 @ 6bb0e749
......@@ -1717,7 +1717,15 @@ export default {
meta: {
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