Skip to content

S
SuperMan
Commit f6adb3dc authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

# Conflicts:
#	src/assets/common/lang/zh.js
#	src/components/SalesModule/VisaFinancialDocuments.vue
#	src/components/SalesModule/groupInquiry.vue
parents 24713947 b3f6e99e
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 119 deletions
src/assets/common/lang/zh.js
View file @ f6adb3dc
...@@ -29,7 +29,6 @@ export const pub={ ...@@ -29,7 +29,6 @@ export const pub={
room:'房数', room:'房数',
year:'年', year:'年',
month:'月', month:'月',
day:'日',
yearMonth:'年月', yearMonth:'年月',
addImg:'添加图片', addImg:'添加图片',
confirmCancel:'确认取消', confirmCancel:'确认取消',
...@@ -38,6 +37,9 @@ export const pub={ ...@@ -38,6 +37,9 @@ export const pub={
returnBack:'返回', returnBack:'返回',
allday:'全天', allday:'全天',
clickToView:'点击查看', clickToView:'点击查看',
man:'男',
woman:'女',
} }
export const login = { export const login = {
...@@ -930,6 +932,7 @@ export const fnc = { ...@@ -930,6 +932,7 @@ export const fnc = {
jigou: '机构', jigou: '机构',
qsrneirong: '请输入内容', qsrneirong: '请输入内容',
zhanghuleixing: '账户类型', zhanghuleixing: '账户类型',
zhfenlei: '账户分类',
yueacc: '余额', yueacc: '余额',
bwbyue: '本位币余额', bwbyue: '本位币余额',
caozuoriqi: '操作日期', caozuoriqi: '操作日期',
...@@ -976,7 +979,79 @@ export const fnc = { ...@@ -976,7 +979,79 @@ export const fnc = {
tjzhanghu: '添加账户', tjzhanghu: '添加账户',
sfduigong: '是否对公', sfduigong: '是否对公',
sybumen: '适用部门：', sybumen: '适用部门：',
shanghuhao: '商户号',
qqdizhi: '请求地址',
zfxinxi: '支付信息',
shsiyao: '商户私钥',
ptgongyao: '平台公钥',
banbenhao: '版本号',
shoukuandan: '收款单',
fukuandan: '付款单',
sfytxiangguan: '是否与团相关',
spliucheng: '审批流程',
liuchengtu: '流程图',
gongzhang: '公账',
sizhang: '私账',
rmbxianjin: '人民币现金',
wbxianjin: '外币现金',
ptxnzhanghu: '平台虚拟账户',
djxnzhanghu: '地接虚拟账户',
szxiangdi: '收支相抵',
khleixing: '客户类型',
fkduixiang: '付款对象',
khmingcheng: '客户名称',
zslingdui: '正式领队/导游',
lslingdui: '临时领队/导游',
daishengcheng: '待生成',
fkzhanghu: '付款账户',
qxzfkzh: '请选择付款账户',
ldmingcheng: '领队名称',
day: '日',
fyshuoming: '费用说明',
danjia: '单价',
jine: '金额',
yuanbi: '原币',
sfjine: '实付金额',
daxie: '（大写）',
xiaoxie: '（小写）',
yjfkuanriqi: '预计付款日期',
qxzrqshijian: '选择日期时间',
fjshuoming: '附加说明',
fygsbumen: '费用归属部门',
gnpiaowu: '国内票务',
jpshouzhi: '机票收支',
xiayibu: '下一步',
tijiao: '提交',
zancun: '暂存',
jxzhidan: '继续制单',
nothanks: '不了，谢谢',
kuaijilian: '（会计联）',
yewulian: '（业务联）',
dayinshijian: '打印时间',
hnrdanwei: '汇款人(单位)',
huikuanren: '汇款人',
fkzhlshuihao: '付款账户(流水号)',
jpbianhao: '机票编号',
skjine: '收款金额',
fkjine: '付款金额',
ling: '零',
qian: '前',
cnskuandan: '出纳收款单',
cnfkuandan: '出纳付款单',
cnfshulian: '附属出纳联',
fkfangshi: '付款方式',
danhao: '单号',
zhidanren: '制单人',
wbzjine: '外币总金额',
bwbzjine: '本位币总金额',
hkshijian: '汇款时间',
jiaoyiriqi: '交易日期',
fkuanzhanghu: '收款账户',
skuanzhanghao: '收款账号',
shouxufei: '手续费',
khyuanbi: '（原币）',
khbweibi: '（本位币）',
jylshuihao: '交易流水号',
} }
export const tips = { export const tips = {
tips: '提示', tips: '提示',
...@@ -1026,6 +1101,14 @@ export const tips = { ...@@ -1026,6 +1101,14 @@ export const tips = {
znengExcel: '只能上传Excel文件，重复的费用类型不会添加哦', znengExcel: '只能上传Excel文件，重复的费用类型不会添加哦',
shangchuanExcel: '上传文件只能是 excel 格式!', shangchuanExcel: '上传文件只能是 excel 格式!',
feiyongleixing: '费用类型？', feiyongleixing: '费用类型？',
qxzzhleixing: '请选择账户类型!',
dzfpzxxdelete: '的支付信息配置?删除后不可撤回！',
qscWEfile: '请上传图片、word、excel类型的文件！',
czcgsfjxzhidan: '操作成功，是否继续制单？',
jpswxzxianlu: '机票尚未选择线路',
qzcpbianhao: '签证产品编号',
qishu: '期数',
jiaoyifangshi: '交易方式',
} }
export const Operation = { export const Operation = {
Op_ShortName:'线路简称', Op_ShortName:'线路简称',
...@@ -1102,11 +1185,52 @@ export const rule = { ...@@ -1102,11 +1185,52 @@ export const rule = {
qxzlxcengji: '请选择类型层级', qxzlxcengji: '请选择类型层级',
qtxzhmingcheng: '请填写账户名称', qtxzhmingcheng: '请填写账户名称',
qxzsybumen: '请选择适用部门', qxzsybumen: '请选择适用部门',
} qsrshuhao: '请输入商户号',
qsrshsyao: '请输入商户私钥',
qsrptsiyao: '请输入平台公钥',
qsrqqdizhi: '请输入请求地址',
qsrbbenhao: '请输入版本号',
qxzssgongsi: '请选择所属公司',
qxzshleixing: '请选择账户类型',
qxzzhfenlei: '请选择账户分类',
qxzzhanghu: '请选择账户',
qsrdingdanhao: '请输入订单号',
qxzfyshuoming: '请选择费用说明',
qxzbzhong: '请选择币种',
qxzxybshren: '请选择下一步审批人',
qtxzsyxfyshuoming: '请填写至少一项费用说明！',
qxzyjfkshijian: '请选择预计付款时间!',
qxzfkduixiang: '请选择付款对象!',
qxzkhmingcheng: '请选择客户名称!',
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
qsrbdgangwei:"请选择绑定岗位",
qsrzqdbmdianhua:"请输入正确的部门电话",
qszhengshu:"请输整数",
qsrname:"请输入姓名",
qsrtelphone:"请输入正确的手机",
qsrIdnum:"请输正确的身份证号",
}
export const adm={
adm_xzbumen:"新增部门",
adm_sxjg:"树形结构",
adm_fhlb:"返回列表",
adm_jggl:"结构管理",
adm_addzibumen:"添加子部门",
adm_addbumen:"添加部门",
adm_addyuangong:"添加员工",
adm_edityuangong:"员工修改",
adm_xueli:"学历",
adm_rzshijain:"入职时间",
}
export const visaT = { export const visaT = {
cxjihua: '出行计划', cxjihua: '出行计划',
sqneirong:'申请类型', sqneirong:'申请类型',
...@@ -1168,17 +1292,5 @@ export const visaT = { ...@@ -1168,17 +1292,5 @@ export const visaT = {
sqbdh:'申请表编号', sqbdh:'申请表编号',
xzsycl:'下载身元材料', xzsycl:'下载身元材料',
xzggbg:'下载归国报告', xzggbg:'下载归国报告',
dccg:'导出成功！' dccg:'导出成功！',
}
export const adm={
adm_xzbumen:"新增部门",
adm_sxjg:"树形结构",
adm_fhlb:"返回列表",
adm_jggl:"结构管理",
adm_addbumen:"添加部门",
adm_addzibumen:"添加子部门",
adm_addyuangong:"添加部门",
adm_edityuangong:"添加员工",
adm_rzshijian:"入职时间",
} }
\ No newline at end of file
src/components/SalesModule/groupInquiry.vue
View file @ f6adb3dc
...@@ -130,47 +130,6 @@ ...@@ -130,47 +130,6 @@
border: 1px solid #d95454 !important; border: 1px solid #d95454 !important;
box-sizing: border-box; box-sizing: border-box;
} }
/* 名单 */
.RL-remarkTitle {
display: inline-block;
width: 36px;
white-space: nowrap;
font-size: 14px;
}
.RL-remarkCon span {
margin-right: 5px;
}
.person_fan{
width: 100%;
border-top: 1px solid #e5e5e5;
padding: 0 10px;
font-size: 12px;
padding: 15px 6px;
box-sizing: border-box;
}
/* 财务单据的颜色 */
.groupTourOrder_tickets_red {
color: #FF0000;
text-decoration: underline;
cursor: pointer;
}
.groupTourOrder_tickets_blue {
color: #0000FF;
text-decoration: underline;
cursor: pointer;
}
.groupTourOrder_tickets_green {
color: #008000;
cursor: pointer;
text-decoration: underline;
}
.groupTourOrder_tickets_black {
color: #000000;
text-decoration: underline;
}
</style> </style>
<template> <template>
<div> <div>
...@@ -182,7 +141,7 @@ ...@@ -182,7 +141,7 @@
</el-tabs> </el-tabs>
</ul> --> </ul> -->
<div class="GQ_companyList" v-if="queryCommonData.IsParentCompany==1"> <div class="GQ_companyList" v-if="queryCommonData.IsParentCompany==1">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span> <span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">全部</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span> <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span>
</div> </div>
<div class="TC_Content TC-MyList"> <div class="TC_Content TC-MyList">
...@@ -190,7 +149,7 @@ ...@@ -190,7 +149,7 @@
<ul> <ul>
<li> <li>
<span> <span>
<em>{{$t('system.table_ssLine')}}</em> <em>所属线路</em>
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()"> <el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="(item,index) in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='index+10000'> <el-option v-for="(item,index) in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='index+10000'>
...@@ -200,7 +159,7 @@ ...@@ -200,7 +159,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('active.ad_xlmc')}}</em> <em>系列名称</em>
<el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'> <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
...@@ -210,14 +169,14 @@ ...@@ -210,14 +169,14 @@
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('visa.v_tuanhao')}}</em> <em>团号</em>
<el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList" <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('scen.sc_ftTime')}}</em> <em>发团日期</em>
<el-date-picker class="w150" type="date" v-model='queryMsg.StartGroupDate' :picker-options="pickerBeginDateBefore" <el-date-picker class="w150" type="date" v-model='queryMsg.StartGroupDate' :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder=""> value-format="yyyy-MM-dd" placeholder="">
</el-date-picker> </el-date-picker>
...@@ -230,21 +189,21 @@ ...@@ -230,21 +189,21 @@
<span> <span>
<em>{{$t('visa.v_qianzhengst')}}</em> <em>{{$t('visa.v_qianzhengst')}}</em>
<el-select v-model="queryMsg.TCVisaStatus" clearable class="w150" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="queryMsg.TCVisaStatus" clearable class="w150" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option> <el-option label="不限" value="-1"></el-option>
<el-option :label="$t('visa.v_weibanli')" value="1"></el-option> <el-option label="未办理" value="1"></el-option>
<el-option :label="$t('visa.v_banlizhong')" value="2"></el-option> <el-option label="办理中" value="2"></el-option>
<el-option :label="$t('visa.v_yibanli')" value="3"></el-option> <el-option label="已办理" value="3"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li class="advancedLi"> <li class="advancedLi">
<el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click"> <el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click">
<div> <div>
<div class="TC_queryTitle">{{$t('visa.v_tkgjcx')}}</div> <div class="TC_queryTitle">团控高级查询</div>
<div class="clearfix"> <div class="clearfix">
<div class="TC_leftSearch"> <div class="TC_leftSearch">
<div> <div>
<span>{{$t('system.query_airCompanyName')}}</span> <span>航空公司</span>
<el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" class="w150"> <el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" class="w150">
<el-option :label='$t("system.ph_buxian")' :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label='$t("system.ph_buxian")' :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName" :value="item.AirLineId"> <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName" :value="item.AirLineId">
...@@ -252,7 +211,7 @@ ...@@ -252,7 +211,7 @@
</el-select> </el-select>
</div> </div>
<div> <div>
<span>{{$t('visa.v_czuser')}}</span> <span>操作人员</span>
<el-select class='w150' v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class='w150' v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label='item.EmName' :value='item.EmployeeId' :key='item.EmployeeId'> <el-option v-for="item in queryCommonData.EmployeeList" :label='item.EmName' :value='item.EmployeeId' :key='item.EmployeeId'>
...@@ -260,13 +219,13 @@ ...@@ -260,13 +219,13 @@
</el-select> </el-select>
</div> </div>
<div> <div>
<span>{{$t('visa.v_xcdays')}}</span> <span>行程天数</span>
<el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')" <el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')"
class="w150" :placeholder="$t('pub.pleaseImport')"></el-input> class="w150" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div> <div>
<span>{{$t('visa.v_lycity')}}</span> <span>联运城市</span>
<el-select class='w150' filterable v-model="queryMsg.UnionCityId" :placeholder="$t('pub.pleaseSel')"> <el-select class='w150' filterable v-model="queryMsg.UnionCityId" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.CityList" :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for="item in queryCommonData.CityList" :label='item.Name' :value='item.ID' :key='item.ID'>
...@@ -277,7 +236,7 @@ ...@@ -277,7 +236,7 @@
</div> </div>
<div class="TC_rightSearch"> <div class="TC_rightSearch">
<div> <div>
<span>{{$t('visa.v_teamnum')}}</span> <span>团队人数</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" @keyup.native="checkInteger(queryMsg,'TeamMinNum')" <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" @keyup.native="checkInteger(queryMsg,'TeamMinNum')"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
- -
...@@ -285,7 +244,7 @@ ...@@ -285,7 +244,7 @@
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input> @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div> <div>
<span>{{$t('leader.leader_registraNum')}}</span> <span>报名人数</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum" @keyup.native="checkInteger(queryMsg,'ApplyMinNum')" <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum" @keyup.native="checkInteger(queryMsg,'ApplyMinNum')"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
- -
...@@ -293,11 +252,11 @@ ...@@ -293,11 +252,11 @@
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input> @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div class="OnlyShowOverTeam"> <div class="OnlyShowOverTeam">
<span>{{$t('visa.v_zkbaochaotuan')}}</span> <span>只看报超团</span>
<el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false"></el-switch> <el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false"></el-switch>
</div> </div>
<div> <div>
<span>{{$t('visa.v_salecompany')}}</span> <span>销售公司</span>
<el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}" v-model="queryMsg.SaleBranchId" multiple> <el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}" v-model="queryMsg.SaleBranchId" multiple>
<el-option v-for='item in queryCommonData.companyList' :key="item.id" :label="item.bName" :value="item.id"> <el-option v-for='item in queryCommonData.companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option> </el-option>
...@@ -306,9 +265,9 @@ ...@@ -306,9 +265,9 @@
</div> </div>
</div> </div>
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>{{$t('scen.sc_temStatu')}}</span> <span>团队状态</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">{{$t('system.table_chekAll')}}</el-checkbox> <el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList"> <el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList">
<el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" :key="team.Name">{{team.Name}}</el-checkbox> <el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" :key="team.Name">{{team.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -316,7 +275,7 @@ ...@@ -316,7 +275,7 @@
</div> </div>
<!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> --> <!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> -->
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>{{$t('Airticket.Air_salesPlatform')}}</span> <span>销售平台</span>
<span> <span>
<!-- 全选 --> <!-- 全选 -->
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">{{$t('system.table_chekAll')}}</el-checkbox> <el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">{{$t('system.table_chekAll')}}</el-checkbox>
...@@ -326,7 +285,7 @@ ...@@ -326,7 +285,7 @@
</span> </span>
</div> </div>
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>{{$t('visa.v_tqstatus')}}</span> <span>团期状态</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">{{$t('system.table_chekAll')}}</el-checkbox> <el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup"> <el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
...@@ -335,7 +294,7 @@ ...@@ -335,7 +294,7 @@
</span> </span>
</div> </div>
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>{{$t('visa.v_hbstatus')}}</span> <span>航班状态</span>
<span> <span>
<el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;"> <el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;">
<el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked" @change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox> <el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked" @change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox>
...@@ -345,7 +304,7 @@ ...@@ -345,7 +304,7 @@
<!-- 查询 --> <!-- 查询 -->
<button class="normalBtn TC_SearchBtn" @click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}</button> <button class="normalBtn TC_SearchBtn" @click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}</button>
</div> </div>
<span class="advancedQuery" slot="reference">{{$t('visa.v_gjchaxun')}}<i class="iconfont icon-xiaotuziCduan_1"></i></span> <span class="advancedQuery" slot="reference">高级查询<i class="iconfont icon-xiaotuziCduan_1"></i></span>
</el-popover> </el-popover>
</li> </li>
<li> <li>
...@@ -373,23 +332,23 @@ ...@@ -373,23 +332,23 @@
v-for="plat in item.SalePlatList" :key="plat.subCode"> v-for="plat in item.SalePlatList" :key="plat.subCode">
{{$tripUtils.getPlatName(plat)}} {{$tripUtils.getPlatName(plat)}}
</span> </span>
<span class="TC_xiajia daiwanshan" v-if="item.TCState==1">{{$t('visa.v_dwanshan')}}</span> <span class="TC_xiajia daiwanshan" v-if="item.TCState==1">待完善</span>
<span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span> <span class="TC_xiajia" v-if="item.TCState==2">已下架</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span> <span class="TC_xiajia quxiao" v-if="item.TCState==4">已取消</span>
</div> </div>
</div> </div>
</div> </div>
<div class="el-col" style="width:200px;"> <div class="el-col" style="width:200px;">
<div class="d2"> <div class="d2">
<p class="TCLflight_GO"><i class="iconfont icon-hangban1"></i>{{$t('visa.v_hangban')}}</p> <p class="TCLflight_GO"><i class="iconfont icon-hangban1"></i>航班</p>
<el-popover width="900" trigger="click" popper-class="TC_tripDetails"> <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;"> <tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th> <th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th> <th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th> <th width="150">起飞时间</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th> <th width="80">到达时间</th>
<th width="100">{{$t('system.query_stopCity')}}</th> <th width="100">经停城市</th>
</tr> </tr>
<tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;"> <tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
...@@ -420,8 +379,8 @@ ...@@ -420,8 +379,8 @@
<span>{{subItem.StopoverName}}</span> <span>{{subItem.StopoverName}}</span>
<span v-if="subItem.ArrivalCityName">-</span> <span v-if="subItem.ArrivalCityName">-</span>
<span>{{subItem.ArrivalCityName}}</span> <span>{{subItem.ArrivalCityName}}</span>
<span v-if="subItem.FlightState==1" class="TCL-greenType">【{{$t('pub.sureBtn')}}】</span> <span v-if="subItem.FlightState==1" class="TCL-greenType">【确定】</span>
<span v-if="subItem.FlightState==2" class="TCL-redType">【{{$t('visa.v_zanding')}}】</span> <span v-if="subItem.FlightState==2" class="TCL-redType">【暂定】</span>
</div> </div>
</div> </div>
</el-popover> </el-popover>
...@@ -492,9 +451,8 @@ ...@@ -492,9 +451,8 @@
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button> <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button> <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button>
</div> </div>
<el-button v-if="item.LineID!=14" @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button> <el-button @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button>
<!-- <el-button @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button> --> <el-button @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button>
<el-button @click="goUrl('VisaFinancialDocuments',item.TCID,item.OutBranchId,item.TCNUM,'签证财务单据')" type="primary" style='background:#F16C3C; border-color:#F16C3C'>费用明细</el-button>
<el-button @click='openEdit(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>送签日期</el-button> <el-button @click='openEdit(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>送签日期</el-button>
<el-button @click="openAdmission(item)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>进馆日期</el-button> <el-button @click="openAdmission(item)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>进馆日期</el-button>
<el-button @click='openEdit2(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>出签日期</el-button> <el-button @click='openEdit2(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>出签日期</el-button>
...@@ -535,7 +493,7 @@ ...@@ -535,7 +493,7 @@
<div class="TCL_remarkTitle">地接备注：</div> <div class="TCL_remarkTitle">地接备注：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div> <div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div>
</div> </div>
</div> --> </div>
</li> </li>
</ul> </ul>
<div class="noData" v-show="queryMsg.noData"> <div class="noData" v-show="queryMsg.noData">
...@@ -582,7 +540,7 @@ ...@@ -582,7 +540,7 @@
<button class="normalBtn" type="primary" @click="setOPremark">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="setOPremark">{{$t('pub.sureBtn')}}</button>
</div> </div>
</div> </div>
<!-- 送签日期窗口 --> <! 送签日期窗口 -->
<div class="groupInquiry_edit" v-show="editShow"> <div class="groupInquiry_edit" v-show="editShow">
<div class="groupInquiry_edit_tit"> <div class="groupInquiry_edit_tit">
<span>修改送签日期</span> <span>修改送签日期</span>
...@@ -641,7 +599,7 @@ ...@@ -641,7 +599,7 @@
<div style="display: inline-block;vertical-align: top;white-space: nowrap;"> <div style="display: inline-block;vertical-align: top;white-space: nowrap;">
<el-form-item :label="$t('advmanager.v_country')" prop="EuropeSchengen" class="groupInquiry_admission_formItem" v-show="msg_admission.LineID===2&&msg_admission.EuropeVisaType==='2'"> <el-form-item :label="$t('advmanager.v_country')" prop="EuropeSchengen" class="groupInquiry_admission_formItem" v-show="msg_admission.LineID===2&&msg_admission.EuropeVisaType==='2'">
<el-select class="groupInquiry_admission_input2" v-model="msg_admission.EuropeSchengen" @change="SchengenChange" placeholder="选择国家"> <el-select class="groupInquiry_admission_input2" v-model="msg_admission.EuropeSchengen" @change="SchengenChange" placeholder="选择国家">
<el-option v-for="(item, index) in EuropeSchengenList" :key="index+2000" :label='item.Name' :value='item.Id'></el-option> <el-option v-for="(item, index) in EuropeSchengenList" :key="index" :label='item.Name' :value='item.Id'></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="EuropeVisaName" class="groupInquiry_admission_formItem" v-show="msg_admission.EuropeVisaType==='2'&&msg_admission.EuropeSchengen==='5'"> <el-form-item prop="EuropeVisaName" class="groupInquiry_admission_formItem" v-show="msg_admission.EuropeVisaType==='2'&&msg_admission.EuropeSchengen==='5'">
...@@ -822,7 +780,7 @@ export default { ...@@ -822,7 +780,7 @@ export default {
}, },
flightStatus: [{ flightStatus: [{
Id: 0, Id: 0,
Name: this.$t('pub.unlimitedSel'), Name: '不限',
Checked:true Checked:true
}, { }, {
Id: 1, Id: 1,
...@@ -848,18 +806,6 @@ export default { ...@@ -848,18 +806,6 @@ export default {
}; };
}, },
methods: { methods: {
goUrl(path, TCID,OutBranchId,TCNUM, name) {
this.$router.push({
name: path,
query: {
TCID:TCID,
OutBranchId:OutBranchId,
TCNUM:TCNUM,
blank: 'y',
tab: name
}
});
},
saveitem(tcid) { saveitem(tcid) {
this.uploadTCID = tcid this.uploadTCID = tcid
}, },
......
src/router/config.js
View file @ f6adb3dc
...@@ -1718,14 +1718,6 @@ export default { ...@@ -1718,14 +1718,6 @@ export default {
title: '团期查询' title: '团期查询'
}, },
}, },
{ // 签证中心 签证财务单据
path: '/VisaFinancialDocuments',
name: 'VisaFinancialDocuments',
component: resolve => require(['@/components/SalesModule/VisaFinancialDocuments'], resolve),
meta: {
title: '签证财务单据'
},
},
{ // 签证中心 签证工作表 { // 签证中心 签证工作表
path: '/visaWorksheet', path: '/visaWorksheet',
name: '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