Skip to content

S
SuperMan
Commit 60907082 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 12d4c782 8d506481
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2889 additions and 1827 deletions
src/App.vue
View file @ 60907082
......@@ -9,6 +9,18 @@
<img v-for="src in images" :src="src" :key="src">
</viewer>
<chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode>
<!-- -->
<div v-show="mazip==0" id="downzip">
<div>
<div>
<a href="https://reborndev.oss-cn-hangzhou.aliyuncs.com/IM/%E9%BA%A6%E5%AD%90%E5%8A%A9%E6%89%8B.exe">
<img src="./assets/img/mzzip.png" alt="">
</a>
<img @click="CloseZip" class="close" src="./assets/img/close.png" alt="">
</div>
</div>
</div>
</div>
</template>
......@@ -56,9 +68,15 @@ export default {
dataShow:false,
haveOpenMode:false,
settingSys: false,
mazip:sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : 0,
// sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
}
},
methods: {
CloseZip(){
this.mazip=1;
sessionStorage.setItem("mazip",1);
},
inited (viewer){
this.$viewer = viewer
},
......@@ -119,4 +137,34 @@ export default {
.BMap_cpyCtrl {display: none;}
.anchorBL {display: none;}
.viewer{display: none !important;}
#downzip{
width: 100%;
height: 100%;
position: fixed;
background: rgba(0,0,0,0.3);
top: 0;
left: 0;
z-index: 2000;
display: table;
}
#downzip>div{
display: table-cell;
vertical-align: middle;
margin-top:250px;
}
#downzip>div>div{
width:285px;
height: 260px;
position: relative;
margin: 0 auto;
cursor: pointer;
}
.close{
position: absolute;
top: 0;
right: 0px;
width: 25px;
height: 25px;
}
</style>
src/assets/common/lang/zh.js
View file @ 60907082
......@@ -1117,6 +1117,7 @@ export const fnc = {
ljhaoshi: '累计耗时',
xsfujian: '显示附件',
ycfujian: '隐藏附件',
ysjine: '应收金额',
}
export const tips = {
tips: '提示',
......@@ -1284,7 +1285,7 @@ export const rule = {
qxzkhmingcheng: '请选择客户名称!',
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门',
qxzzdbumen:' 请选择制单部门！',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
......@@ -1300,6 +1301,10 @@ export const rule = {
qtxshuoming: '请填写说明',
qxzygxytjddanju: '请选择一个需要提交的单据！',
qxzbmen: '请选择部门',
qtxhkuanren: '请填写汇款人！',
qtxhkshijian: '请选择汇款时间！',
qxzjylshuihao: '请选择交易流水号！',
qxzskzhanghao: '请选择收款账号！',
}
export const adm={
......@@ -1376,4 +1381,48 @@ export const visaT = {
xzsycl:'下载身元材料',
xzggbg:'下载归国报告',
dccg:'导出成功！',
result:'结果',
sale:'销售',
Accountingdetails:'核算详情',
See:'查看',
wscggbg:'暂未上传归国报告',
qzzlxz:'签证资料下载',
jbzlxz:'基本资料下载',
sqsxz:"申请书下载",
tqmdxz:'团签名单下载',
titleT:'结束日期不能大于开始日期',
titleTh:'请选择需要导出条目！',
titlef:'暂时只接入日本签证模板！请联系管理员添加',
complete:'完成',
qrcpomplete:'确认已完成',
titleF:'后无法修改审核状态！',
Download:'下载中...',
rbqzsqb:"日本签证申请表",
titlts:'还有未确认的信息，请先确认！',
notes:'（注：此处只提供签证的价格，说明状态维护，签证模板功能不直接提供给用户）',
finformation:'一、航班信息',
Scheduling:'二、行程安排',
go:'去',
jdname:'景点名称',
doorname:'门票名称',
Nothandled:'未办理',
Inhandling:'办理中',
Alreadyprocessed:'已办理',
Addingsuppliers:'添加供应商',
Vendortemplate:'供应商模板',
xiugaigysxx:'修改供应商信息',
Accountmanagement:'账户管理',
qsrgysname:'请输入供应商名称',
qsradder:'请输入地址',
qxzguojia:'请选择国家',
qxzshengfeng:'请选择省份',
qsrchuanzhen:'请输入传真',
qsrphone:'请输入电话',
qsryesphone:'请输入正确的电话',
qsrtopmanager:'请输入总经理',
qsrfuzheren:'请输入负责人',
qsrlingduiphone:'请输入领队电话',
qsrlingdui:'请输入领队',
qxzmoban:'请选择模板',
Regularflights:'常用航班',
}
\ No newline at end of file
src/assets/common/lang/zh.js.rej 0 → 100644
View file @ 60907082
This diff is collapsed.
src/components/FinancialModule/CapitalAllocation.vue
View file @ 60907082
......@@ -60,13 +60,13 @@
<el-form label-width="100px" class="form">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item :label="$t('fnc.djbianhao')">
<el-form-item label="单据编号">
<el-input v-model="msg.FrID"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('system.table_company')">
<el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
<el-form-item label="公司">
<el-select v-model="msg.RB_Branch_Id" placeholder="请选择公司" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -77,8 +77,8 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('admin.admin_Department')">
<el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
<el-form-item label="部门">
<el-select v-model="msg.RB_Depart_Id" placeholder="请选择部门" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
......@@ -89,7 +89,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.zhidanren')">
<el-form-item label="制单人">
<el-select filterable v-model='msg.UpdateBy'>
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
......@@ -101,13 +101,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('fnc.zdriqi')">
<el-form-item label="制单日期">
<el-date-picker
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
range-separator="至">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -126,13 +126,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('fnc.jiaoyiriqi')">
<el-form-item label="交易日期">
<el-date-picker
@change="timeAdd(2)"
v-model="productionDate2"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
range-separator="至">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -141,13 +141,13 @@
<div class="page_CapitalAllocation_list">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>{{$t('fnc.danhao')}}</th>
<th>{{$t('fnc.jine')}}</th>
<th>单号</th>
<th>金额</th>
<!-- <th>实付</th> -->
<!-- <th>原币金额</th> -->
<!-- <th>交易日期</th> -->
<th>{{$t('fnc.cjshijian')}}</th>
<th>{{$t('active.cl_addPp')}}</th>
<th>创建时间</th>
<th>创建人</th>
<!-- <th>备注</th> -->
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('system.table_operation')}}</th>
......@@ -173,7 +173,7 @@
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">{{$t('fnc.lcrizhi')}}</p>
<p class="_log_t">流程日志</p>
<ul class="changLogList" v-if="GetFinancLogList" v-loading='LogLoading'>
<li class="changLogList_l" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C" class="_radius_green"></span>
......@@ -182,7 +182,7 @@
</li>
</ul>
<ul v-else>
<li>{{$t('hotel.hotel_zanwu')}}</li>
<li>暂无修改日志</li>
</ul>
</div>
</div>
......@@ -190,16 +190,16 @@
</el-popover>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
<el-tooltip class="item" effect="dark" content="修改" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
<i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
<el-tooltip class="item" effect="dark" content="详情" placement="top">
<i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID)"></i>
</el-tooltip>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>{{$t('active.ld_noData')}}</p></div>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div>
<el-pagination
background
......@@ -259,9 +259,7 @@ export default {
GetFinancLogList: [],
loading: true,
LogLoading: true,
EmId:0,
total: 0,
currentPage: 0,
EmId:0
}
},
created(){
......@@ -306,7 +304,7 @@ export default {
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
this.msg.EmployeeId=this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,"资金调拨报表.xls");} ,
getCompanyList: function () { //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ 60907082
......@@ -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 @ 60907082
......@@ -911,6 +911,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,
......@@ -1010,6 +1020,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,
......@@ -1502,6 +1522,7 @@ export default {
"实收金额",
"退款",
"平台税金",
"优惠金额",
"待收金额",
"溢收金额",
"人数",
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 60907082
......@@ -179,7 +179,7 @@
<p class="rb_stit">
<span>{{BillSonName}}</span>
</p>
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?this.$t('fnc.no'):msg.OrderID}}</span></p>
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?$t('fnc.no'):msg.OrderID}}</span></p>
<div class="rb_top_row _r_mb5">
<el-radio-group v-model="msg.IsPublic" @change="IsPublicChange" class="_IsPublic">
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.gongzhang')}}</el-radio>
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 60907082
......@@ -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/HotelInfo.vue
View file @ 60907082
......@@ -267,6 +267,7 @@ export default {
navbar:false,
title:false
},
images: [],
//是否显示添加图片
addimg: false,
//地图选中地址
......@@ -312,7 +313,6 @@ export default {
HotelTypeList: [],
//酒店价格
HotelPirceTypeList:[],
images: [],
addMsg: {
ID: 0,
Name: "",
......@@ -424,23 +424,6 @@ 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) {
......@@ -469,6 +452,24 @@ export default {
this.HotelImageArray.splice(index, 1);
//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)
} else {
this.$viewer.view(this.images.indexOf(src))
}
this.$viewer.show()
},
addImgOpen() {
this.addimg = true;
this.initimgList();
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 60907082
......@@ -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 @ 60907082
......@@ -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/Restaurant/restaurantInfoManage.vue
View file @ 60907082
......@@ -858,7 +858,6 @@
<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">
......@@ -900,9 +899,6 @@
<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>
......@@ -912,11 +908,6 @@
export default {
data() {
return {
imageOptions:{
navbar:false,
title:false
},
images: [],
selectAddress: false,
addimg: false,
//图片选取数组
......@@ -1052,23 +1043,6 @@
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 0 → 100644
View file @ 60907082
This diff is collapsed.
src/components/SalesModule/groupInquiry.vue
View file @ 60907082
This diff is collapsed.
src/components/Ticketing/TicketManager.vue
View file @ 60907082
......@@ -2294,13 +2294,13 @@
beforeCheck: {
disabledDate: time => {
let endTime = new Date(this.msg.QFlightDateEnd);
return time.getTime() > endTime.getTime();
return endTime.getTime() < time.getTime();
}
},
afterCheck: {
disabledDate: time => {
let startTime = new Date(this.msg.QFlightDateStart);
return time.getTime() < (startTime.getTime() -1 * 24 * 60 * 60 * 1000);
return startTime.getTime() >= time.getTime();
}
},
rules: {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 60907082
......@@ -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 @ 60907082
......@@ -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>
......@@ -121,7 +132,6 @@
res => {
this.loading=false;
if (res.data.resultCode == 1) {
console.log(res,'data');
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
......
src/components/VisaCenter/VisaAccountingDetails.vue
View file @ 60907082
......@@ -92,8 +92,8 @@
<div class="tbDiv" v-loading='loading'>
<div class="AccountList clearfix" v-for="(item,index) in DataList" :key="index">
<div class="BusCode">
<span class="_radius" v-if="item.SignStatus==1">单</span>
<span class="_radius _tuan" v-if="item.SignStatus==2">团</span>
<span class="_radius" v-if="item.SignStatus==1">{{$t('visa.v_dan')}}</span>
<span class="_radius _tuan" v-if="item.SignStatus==2">{{$t('visa.v_tuan')}}</span>
{{item.CountryTypeName}}
</div>
<div class="suplier _post">
......@@ -102,9 +102,9 @@
<div class="mainPopDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="popTable">
<tr class="_color_666">
<th>姓名</th>
<th>性别</th>
<th>结果</th>
<th>{{$t('system.query_name')}}</th>
<th>{{$t('system.table_sex')}}</th>
<th>{{$t('visaT.result')}}</th>
</tr>
<tr v-for="subItem in item.PeopleList">
<td>{{subItem.Name}}</td>
......@@ -138,9 +138,9 @@
</table>
</div>
</div> -->
<span ><span class="teamName" >团</span><span ><span>{{item.OrderId}}</span></span></span>
<span ><span class="teamName" >{{$t('visa.v_tuan')}}</span><span ><span>{{item.OrderId}}</span></span></span>
<!-- <span><span class="teamName">订</span ><span>{{item.OrderId}}</span></span> -->
<span><span class="teamName">销售</span ><span>{{item.CreateBy}}</span></span>
<span><span class="teamName">{{$t('visaT.sale')}}</span ><span>{{item.CreateBy}}</span></span>
</div>
<div class="__priceList">
<span class="ExchangePrice PingFangSC">{{item.TotalPrice}}</span>
......
src/components/VisaCenter/VisaApplicationDetails.vue
View file @ 60907082
......@@ -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}'>其他</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}'>其他</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/VisaCenter/VisaManagement.vue
View file @ 60907082
......@@ -112,7 +112,7 @@
</ul>
</div>
<div class="_vMG_edit" :class="addShow==true?'edHeight':''">
<p class="_tit">{{$t('visa.v_qianzhenggl')}} <span>（注：此处只提供签证的价格，说明状态维护，签证模板功能不直接提供给用户）</span> </p>
<p class="_tit">{{$t('visa.v_qianzhenggl')}} <span>{{$t('visaT.notes')}}</span> </p>
<el-form class="_info_box clearfix" >
<div class="">
<p>{{$t('visa.v_geqianp')}}</p>
......@@ -213,7 +213,7 @@
</ul>
</div>
<div>
<ul class="clearfix" style="text-align: right;margin-top:108px"> <li class="_add_saveBtn"style="float: initial;" >
<ul class="clearfix" style="text-align: right;margin-top:108px"> <li class="_add_saveBtn" style="float: initial;" >
<button class="hollowFixedBtn" type="button" @click="cancelEdit()">{{$t('pub.cancelBtn')}}</button>
<button type="button" class="normalBtn" @click="saveVisa()">{{$t('pub.saveBtn')}}</button>
</li></ul>
......
src/components/VisaCenter/VisaSummary.vue
View file @ 60907082
......@@ -449,11 +449,11 @@
</el-pagination>
<el-dialog custom-class='scenicSpotTeamPlan_info_box w780' :title="tripTitle" :visible.sync="outerVisible" center >
<div class="scenicSpotTeamPlan_info">
<p class="hl_info">一、航班信息 &nbsp;&nbsp;&nbsp;&nbsp;<span></span></p>
<p class="hl_info">{{$t('visaT.finformation')}} &nbsp;&nbsp;&nbsp;&nbsp;<span></span></p>
<ul class="hl_flight">
<li v-for="(item,index) in TripList.FlightList">
<span class="_go">去</span>
<span class="_textB14">第{{item.JourneyDay}}天（{{item.startTime}}）</span>
<span class="_go">{{$t('visaT.go')}}</span>
<span class="_textB14">{{$t('tips.di')}}{{item.JourneyDay}}{{$t('hotel.hotel_day')}}（{{item.startTime}}）</span>
<div class="_timeCity">
<p class="_time">{{item.sStartDate}}</p>
<p class="_city">{{item.sStartAddress}}</p>
......@@ -471,7 +471,7 @@
<p class="_flight_name">{{item.FlightName}}</p>
</li>
</ul>
<p class="hl_info _margintop30">二、行程安排</p>
<p class="hl_info _margintop30">{{$t('visaT.Scheduling')}}</p>
<ul class="_details">
<li v-for="(item,index) in TripList.JourneyList">
<span class="_d_radius">{{index+1}}</span>
......@@ -487,13 +487,13 @@
<div class="_food_hotel clearfix">
<ul class="_food">
<li class="_fist">
<span class="iconfont icon-jingqu"></span><span class="_fh_tit"> 景点名称</span>
<span class="iconfont icon-jingqu"></span><span class="_fh_tit"> {{$t('visaT.jdname')}}</span>
</li>
<li>{{item.CouponsName}}</li>
</ul>
<ul class="_hotel">
<li class="_fist">
<span class="iconfont icon-ticket"></span><span class="_fh_tit"> 门票名称</span>
<span class="iconfont icon-ticket"></span><span class="_fh_tit"> {{$t('visaT.doorname')}}</span>
</li>
<li>{{item.TicketName}}</li>
</ul>
......@@ -532,19 +532,19 @@ export default {
StatusList: [
{
Id: "-1",
Name: "不限"
Name: this.$t('pub.unlimitedSel')
},
{
Id: "1",
Name: "未办理"
Name: this.$t('visaT.Nothandled')
},
{
Id: "2",
Name: "办理中"
Name: this.$t('visaT.Inhandling')
},
{
Id: "3",
Name: "已办理"
Name: this.$t('visaT.Alreadyprocessed')
}
],
total: 0,
......@@ -628,7 +628,7 @@ export default {
dataDui() {
// 日期
if (this.msg.StartDate > this.msg.EndDate && this.msg.EndDate!== '') {
this.$message.error("结束日期不能大于开始日期");
this.$message.error(this.$t('visaT.titleT'));
this.msg.EndDate = "";
}
},
......
src/components/VisaCenter/VisaSuplier.vue
View file @ 60907082
......@@ -50,7 +50,7 @@
</li>
<li>
<button class="hollowFixedBtn" type="button" @click="resetPageIndex(),initData()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="clearinputInfo(),outerVisible = true,dialogTitle='添加供应商'">{{$t('pub.addBtn')}}</button>
<button class="normalBtn" type="button" @click="clearinputInfo(),outerVisible = true, dialogTitle=$t('visaT.Addingsuppliers')">{{$t('pub.addBtn')}}</button>
</li>
</ul>
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
......@@ -109,7 +109,7 @@
<el-form-item :label="$t('visa.v_lingduitel')" prop="JapanLeaderTel">
<el-input type="text" class="w300" maxlength="20" v-model="addMsg.JapanLeaderTel"></el-input>
</el-form-item>
<el-form-item label="供应商模板" prop="TempleteType">
<el-form-item :label="$t('visaT.Vendortemplate')" prop="TempleteType">
<el-select v-model="addMsg.TempleteType" class="w300" filterable>
<el-option v-for='item in VisaTempleteTypeList'
:key="item.Id"
......@@ -161,9 +161,9 @@
</div>
</div>
<div class="updataBtn">
<button class="normalBtn UPBtn" @click="outerVisible = true,dialogTitle='修改供应商信息',updateInfo(item.Id)">{{$t('pub.updateMsg')}}</button>
<button class="normalBtn UPBtn" @click="outerVisible = true,dialogTitle=$t('visaT.xiugaigysxx'),updateInfo(item.Id)">{{$t('pub.updateMsg')}}</button>
<button class="hollowFixedBtn UPBtn" @click="isdelete(item.Id)">{{$t('system.table_delete')}}</button>
<button class="hollowFixedBtn HS_financial" @click="AccountManage(item)">账户管理</button>
<button class="hollowFixedBtn HS_financial" @click="AccountManage(item)">{{$t('visaT.Accountmanagement')}}</button>
</div>
</div>
</div>
......@@ -231,23 +231,23 @@ export default {
},
rules: {
Name: [
{ required: true, message: "请输入供应商名称", trigger: "blur" }
{ required: true, message: this.$t('visaT.qsrgysname'), trigger: "blur" }
],
Address: [
{ required: true, message: "请输入地址", trigger: "blur" }
{ required: true, message: this.$t('visaT.qsradder'), trigger: "blur" }
],
Country: [
{ required: true, message: "请选择国家", trigger: "change" }
{ required: true, message: this.$t('visaT.qxzguojia'), trigger: "change" }
],
Fax: [{ required: true, message: "请输入传真", trigger: "blur" }],
Tel: [{ required: true, message: "请输入电话", trigger: "blur" },
{ pattern: this.$commonUtils.Regex.el_IsFax, message: '请输入正确的电话'}],
Representative: [{ required: true, message: "请输入总经理", trigger: "blur" }],
PersonInCharge: [{ required: true, message: "请输入负责人", trigger: "blur" }],
JapanLeaderTel:[{required: true, message: "请输入领队电话", trigger: "blur" },
{ pattern: this.$commonUtils.Regex.el_IsFax, message: '请输入正确的电话'}],
JapanLeader:[{required: true, message: "请输入领队", trigger: "blur" }],
TempleteType:[{required: true, message: "请选择模板", trigger: "blur" }],
Fax: [{ required: true, message: this.$t('visaT.qsrchuanzhen'), trigger: "blur" }],
Tel: [{ required: true, message: this.$t('visaT.qsrphone'), trigger: "blur" },
{ pattern: this.$commonUtils.Regex.el_IsFax, message: this.$t('visaT.qsryesphone')}],
Representative: [{ required: true, message: this.$t('visaT.qsrtopmanager'), trigger: "blur" }],
PersonInCharge: [{ required: true, message: this.$t('visaT.qsrfuzheren'), trigger: "blur" }],
JapanLeaderTel:[{required: true, message: this.$t('visaT.qsrlingduiphone'), trigger: "blur" },
{ pattern: this.$commonUtils.Regex.el_IsFax, message: this.$t('visaT.qsryesphone')}],
JapanLeader:[{required: true, message: this.$t('visaT.qsrlingdui'), trigger: "blur" }],
TempleteType:[{required: true, message: this.$t('visaT.qxzmoban'), trigger: "blur" }],
},
VisaTempleteTypeList:[]
};
......@@ -315,9 +315,9 @@ export default {
},
isdelete(ID) {
this.deleteID = ID;
this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
})
.then(() => {
......@@ -329,7 +329,7 @@ export default {
msg,
response => {
if (response.data.resultCode == 1) {
this.$message.success("删除成功")
this.$message.success(this.$t('tips.shanchuchenggong'))
this.initData();
} else {
this.tips(response.data.message, "error");
......@@ -341,16 +341,16 @@ export default {
.catch(() => {
this.$message({
type: "info",
message: "已取消删除"
message: this.$t('tips.cancleDelete')
});
});
},
saveInfo() {
if(!this.addMsg.Country){
this.$message.error("请选择国家")
this.$message.error(this.$t('visaT.qxzguojia'))
return
}else if(!this.addMsg.Province){
this.$message.error("请选择省份")
this.$message.error(this.$t('visaT.qxzshengfeng'))
return
}else{
this.apipost(
......@@ -359,7 +359,7 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.initData();
this.tips("保存成功", "success");
this.tips(this.$t('tips.baocunchenggong'), "success");
this.outerVisible = false;
} else {
this.tips(res.data.message, "error");
......
src/components/VisaCenter/addVisa.vue
View file @ 60907082
This diff is collapsed.
src/components/VisaCenter/addVisaNew.vue
View file @ 60907082
......@@ -33,10 +33,10 @@
<template>
<div class="page_addVisa" v-loading="loading">
<el-form :model="addMsg" ref="addMsg" :rules="rules" label-width="150px" class="_form clearfix" >
<p class="btmTitle">出行计划</p>
<el-form-item label="团号" clearable prop="OrderId">
<p class="btmTitle">{{$t('visaT.cxjihua')}}</p>
<el-form-item :label="$t('visa.v_tuanhao')" clearable prop="OrderId">
<el-input v-model="addMsg.OrderId" type="text" size=mini class="w230" :disabled="isDisabled">
<el-button slot="append" @click="searchHistory" :disabled="isDisabled">查询</el-button>
<el-button slot="append" @click="searchHistory" :disabled="isDisabled">{{$t('pub.searchBtn')}}</el-button>
</el-input>
</el-form-item>
<!--<el-form-item label="申请类型" clearable prop="ApplyForType">
......@@ -49,29 +49,29 @@
</el-option>
</el-select>
</el-form-item>-->
<el-form-item label="申请类型" clearable prop="SignStatus">
<el-form-item :label="$t('visaT.sqneirong')" clearable prop="SignStatus">
<el-select v-model="addMsg.SignStatus" size=mini class="w230" :disabled="isDisabled">
<el-option label='个签' value='1'>
<el-option :label="$t('visa.v_gvisa')" value='1'>
</el-option>
<el-option label='团签' value='2'>
<el-option :label="$t('visa.v_tvisa')" value='2'>
</el-option>
</el-select>
</el-form-item>
<div class="_flex">
<el-form-item label="出入境时间" prop="value6">
<el-form-item :label="$t('visaT.crjtime')" prop="value6">
<el-date-picker class="h34"
@input="timeAdd()"
v-model="addMsg.value6"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="出境时间"
end-placeholder="入境时间">
:range-separator="$t('restaurant.res_To')"
:start-placeholder="$t('visaT.chujingtime')"
:end-placeholder="$t('visaT.rujingtime')">
</el-date-picker>
</el-form-item>
<el-form-item label="常用航班">
</el-form-item>
<el-form-item :label="$t('visaT.Regularflights')">
<el-select v-model="regularFlights" @change="regularChange" size=mini class="w230">
<el-option label='请选择' value='-1'></el-option>
<el-option :label="$t('pub.pleaseSel')" value='-1'></el-option>
<el-option v-for="(item, index) in regularFlightsList" :key="index" :label='item.Name' :value='index'></el-option>
</el-select>
</el-form-item>
......
src/components/VisaCenter/seeVisa.vue
View file @ 60907082
This diff is collapsed.
src/components/VisaCenter/visaComList.vue
View file @ 60907082
This diff is collapsed.
src/components/VisaCenter/visaList.vue
View file @ 60907082
This diff is collapsed.
src/components/VisaCenter/visaList2.vue
View file @ 60907082
This diff is collapsed.
src/components/administrative/departmentManagement.vue
View file @ 60907082
......@@ -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/busManagement/BusInfo.vue
View file @ 60907082
This diff is collapsed.
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 60907082
......@@ -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 @ 60907082
This diff is collapsed.
src/router/config.js
View file @ 60907082
This diff is collapsed.
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