Skip to content

S
SuperMan
Commit 8d1adbdb authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 227153be 9d6500b2
Show whitespace changes
Inline Side-by-side
Showing with 438 additions and 1062 deletions
src/assets/common/lang/zh.js
View file @ 8d1adbdb
......@@ -254,8 +254,6 @@ export const admin={ //行政
admin_lnLoginPwd:'请输入登录密码',
admin_Department:'部门',
admin_Post:'岗位',
admin_xueli:'学历',
admin_Entrytime:'入职时间',
admin_Departuretime:'离职时间',
......@@ -266,9 +264,6 @@ export const admin={ //行政
admin_Bindingposition:'绑定岗位',
admin_sort:'排序',
admin_level:'级',
}
//zk
export const hotel = {
......@@ -1052,6 +1047,47 @@ 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:'说明',
}
export const tips = {
tips: '提示',
......@@ -1109,6 +1145,8 @@ export const tips = {
qzcpbianhao: '签证产品编号',
qishu: '期数',
jiaoyifangshi: '交易方式',
zwtqxinxi: '暂无团期信息',
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！'
}
export const Operation = {
Op_ShortName:'线路简称',
......@@ -1205,7 +1243,6 @@ export const rule = {
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
......@@ -1215,8 +1252,11 @@ export const rule = {
qsrname:"请输入姓名",
qsrtelphone:"请输入正确的手机",
qsrIdnum:"请输正确的身份证号",
qxzzjiaoren: '请选择转交人',
qtxzjbeizhu: '请填写转交备注',
qxztzhdjyriqi: '请选择调整后的交易日期',
qtxshuoming: '请填写说明',
qxzygxytjddanju: '请选择一个需要提交的单据！'
}
export const adm={
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 8d1adbdb
......@@ -114,15 +114,15 @@
<ul class="clearfix">
<li>
<span>
<em>单号</em>
<em>{{$t('fnc.danhao')}}</em>
<el-input placeholder="" class="w150" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')"></el-input>
</span>
</li>
<li>
<span>
<em>审核状态</em>
<em>{{$t('fnc.shzhuangtai')}}</em>
<el-select v-model="msg.Status" filterable class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in StatusList'
:label='item.Name'
:value='item.ID'
......@@ -133,19 +133,19 @@
</li>
<li v-if='msg.Conditon==3'>
<span>
<em>佣金单据</em>
<em>{{$t('fnc.yjdanju')}}</em>
<el-select v-model="msg.IsSpecial" filterable class="w150">
<el-option :value="0" label="不限"></el-option>
<el-option :value="1" label="否"></el-option>
<el-option :value="2" label="是"></el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option :value="1" :label="$t('fnc.yes')"></el-option>
<el-option :value="2" :label="$t('fnc.fou')"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>模板类型</em>
<em>{{$t('fnc.mbleixing')}}</em>
<el-select v-model="msg.TemplateId" filterable class="w150">
<el-option value="0" label="不限"></el-option>
<el-option value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in TemplateGetList'
:label='item.Name'
:value='item.Id'
......@@ -156,35 +156,35 @@
</li>
<li>
<span>
<em>单据类型</em>
<em>{{$t('fnc.djleixing')}}</em>
<el-select v-model="msg.Type" filterable class="w150">
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="收入"></el-option>
<el-option key="2" value="2" label="支出"></el-option>
<el-option key="2" value="5" label="应收"></el-option>
<el-option key="2" value="6" label="应付"></el-option>
<el-option key="2" value="4" label="资金调拨"></el-option>
<el-option key="0" value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option key="1" value="1" :label="$t('restaurant.res_income')"></el-option>
<el-option key="2" value="2" :label="$t('restaurant.res_outcome')"></el-option>
<el-option key="2" value="5" :label="$t('fnc.yingshou')"></el-option>
<el-option key="2" value="6" :label="$t('fnc.yingfu')"></el-option>
<el-option key="2" value="4" :label="$t('fnc.zjdiaobo')"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>排序</em>
<em>{{$t('system.table_rank')}}</em>
<el-select v-model="msg.Sort" filterable class="w150">
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
<el-option key="3" value="3" label="交易流水号"></el-option>
<el-option key="-1" value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option key="0" value="0" :label="$t('fnc.tuanqi')"></el-option>
<el-option key="1" value="1" :label="$t('fnc.hkriqi')"></el-option>
<el-option key="2" value="2" :label="$t('fnc.danhao')"></el-option>
<el-option key="3" value="3" :label="$t('fnc.jylshuihao')"></el-option>
</el-select>
</span>
</li>
<template v-if="heightQueryBox">
<li>
<span>
<em>所属公司</em>
<em>{{$t('system.query_company')}}</em>
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment()" class="w150">
<el-option :value="-1" label="不限"></el-option>
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
......@@ -195,9 +195,9 @@
</li>
<li>
<span>
<em>费用部门</em>
<em>{{$t('fnc.fybumen')}}</em>
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="w150">
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -208,9 +208,9 @@
</li>
<li>
<span>
<em>制单人员</em>
<em>{{$t('fnc.zdrenyuan')}}</em>
<el-select filterable v-model='msg.UpdateBy' class="w150">
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
......@@ -221,9 +221,9 @@
</li>
<li>
<span>
<em>账户类型</em>
<em>{{$t('fnc.zhleixing')}}</em>
<el-select filterable v-model='msg.AccountType' class="w150">
<el-option value="" label="不限"></el-option>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in AccList'
:label='item.Name'
:value='item.ID'
......@@ -234,9 +234,9 @@
</li>
<li>
<span>
<em>交易方式</em>
<em>{{$t('tips.jiaoyifangshi')}}</em>
<el-select filterable v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''" class="w150">
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in BranchAccountList'
:label='item.Name'
:value='item.ID'
......@@ -247,9 +247,9 @@
</li>
<li>
<span>
<em>收付款账户</em>
<em>{{$t('fnc.sfkzhanghu')}}</em>
<el-select filterable v-model='msg.BankID' class="w150">
<el-option value="" label="不限"></el-option>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in accountList'
:label='item.Name'
:value='item.ID'
......@@ -260,9 +260,9 @@
</li>
<li v-show="msg.Type==2">
<span>
<em>对象类型</em>
<em>{{$t('fnc.dxleixing')}}</em>
<el-select filterable v-model='msg.ClientType' @change="financeinfo_post_GetClientAccountList(msg.ClientType),msg.ClientID=''" class="w150">
<el-option value="" label="不限"></el-option>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientTypeList'
:label='item.Name'
:value='item.ID'
......@@ -273,9 +273,9 @@
</li>
<li v-show="msg.Type==2">
<span>
<em>付款对象</em>
<em>{{$t('fnc.fkduixiang')}}</em>
<el-select filterable v-model='msg.ClientID' class="w150">
<el-option value="" label="不限"></el-option>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList'
:label='item.Name'
:value='item.ID'
......@@ -286,19 +286,19 @@
</li>
<li>
<span>
<em>团队编号</em>
<em>{{$t('scen.sc_temID')}}</em>
<el-input v-model="msg.TCID" class="w150"></el-input>
</span>
</li>
<li>
<span>
<em>订单编号</em>
<em>{{$t('fnc.ddbianhao')}}</em>
<el-input v-model="msg.OrderID" class="w150"></el-input>
</span>
</li>
<li>
<span>
<em>币种类型</em>
<em>{{$t('fnc.bzleixing')}}</em>
<el-select filterable v-model='msg.CurrencyId' class="w150">
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
......@@ -306,7 +306,7 @@
</li>
<li>
<span>
<em>费用类型</em>
<em>{{$t('fnc.feiyongleixing')}}</em>
<el-select filterable v-model='msg.CostTypeID' class="w150">
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
......@@ -314,37 +314,37 @@
</li>
<li>
<span>
<em>单据金额</em>
<em>{{$t('fnc.djjine')}}</em>
<el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
</span>
</li>
<li v-if="msg.Conditon==1">
<span>
<em>制单日期</em>
<em>{{$t('fnc.zdriqi')}}</em>
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</span>
</li>
<li v-if="msg.Conditon==2">
<span>
<em>审批日期</em>
<em>{{$t('fnc.spriqi')}}</em>
<el-date-picker class="h34"
@change="timeAdd(2)"
v-model="approvalDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</span>
</li>
<li v-if="msg.Conditon==2 || msg.Conditon==3">
<span>
<em>交易日期</em>
<em>{{$t('fnc.jiaoyiriqi')}}</em>
<el-date-picker class="h34"
v-model="transactionDate"
@change="timeAdd(3)"
......@@ -355,7 +355,7 @@
</li>
<li>
<span>
<em>发团日期</em>
<em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker class="h34"
v-model="missionDate"
@change="timeAdd(4)"
......@@ -367,7 +367,7 @@
</template>
<li class="hight_query">
<span>
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
<em @click.stop="heightQueryBox=!heightQueryBox">{{$t('fnc.gjchaxun')}} <i class="iconfont icon-gengduo"></i></em>
</span>
<!-- <div class="hight_query_box" @click.stop>
<el-collapse-transition>
......@@ -378,7 +378,7 @@
<li>
<el-form-item label="所属公司：">
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment()" class="w135">
<el-option :value="-1" label="不限"></el-option>
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
......@@ -390,7 +390,7 @@
<li>
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="w135">
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -402,7 +402,7 @@
<li>
<el-form-item label="制单人员：">
<el-select filterable v-model='msg.UpdateBy' class="w135">
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
......@@ -414,7 +414,7 @@
<li>
<el-form-item label="账户类型：">
<el-select filterable v-model='msg.AccountType' class="w135">
<el-option value="" label="不限"></el-option>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in AccList'
:label='item.Name'
:value='item.ID'
......@@ -426,7 +426,7 @@
<li>
<el-form-item label="交易方式：">
<el-select filterable v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''" class="w135">
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in BranchAccountList'
:label='item.Name'
:value='item.ID'
......@@ -438,7 +438,7 @@
<li>
<el-form-item label="收付款账户：" >
<el-select filterable v-model='msg.BankID' class="w135">
<el-option value="" label="不限"></el-option>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in accountList'
:label='item.Name'
:value='item.ID'
......@@ -450,7 +450,7 @@
<li v-show="msg.Type==2">
<el-form-item label="对象类型：">
<el-select filterable v-model='msg.ClientType' @change="financeinfo_post_GetClientAccountList(msg.ClientType),msg.ClientID=''" class="w135">
<el-option value="" label="不限"></el-option>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientTypeList'
:label='item.Name'
:value='item.ID'
......@@ -462,7 +462,7 @@
<li v-show="msg.Type==2">
<el-form-item label="付款对象：" >
<el-select filterable v-model='msg.ClientID' class="w135">
<el-option value="" label="不限"></el-option>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList'
:label='item.Name'
:value='item.ID'
......@@ -519,10 +519,10 @@
</el-collapse-transition>
</div> -->
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="goUrlAdd('ChoiceAddFinancialDocuments')">新增</button>
<button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">批量提交</button>
<button class="normalBtn" @click="method5()">导出</button>
<button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">工作委托</button>
<button class="normalBtn" @click="goUrlAdd('ChoiceAddFinancialDocuments')">{{$t('pub.addBtn')}}</button>
<button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
<button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
</li>
</ul>
</div>
......@@ -532,16 +532,16 @@
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr class="_t_head">
<th v-if="checkboxShow"><input type="checkbox" v-model="isCkedAll" @click='checkedAll()'></th>
<th width="90">所属公司</th>
<th>单号</th>
<th width="90">单据类型</th>
<th>关联信息</th>
<th>费用类型</th>
<th>交易方式</th>
<th>金额</th>
<th>{{msg.Type==1?'收款':'付款'}}对象</th>
<th width="90">制单人员</th>
<th>当前状态</th>
<th width="90">{{$t('system.query_company')}}</th>
<th>{{$t('fnc.danhao')}}</th>
<th width="90">{{$t('fnc.djleixing')}}</th>
<th>{{$t('hotel.hotel_corrlelatition')}}</th>
<th>{{$t('fnc.feiyongleixing')}}</th>
<th>{{$t('tips.jiaoyifangshi')}}</th>
<th>{{$t('fnc.jine')}}</th>
<th>{{msg.Type==1? $t('fnc.shoukuan') : $t('fnc.fukuan')}}{{$t('fnc.duixiang')}}</th>
<th width="90">{{$t('fnc.zdrenyuan')}}</th>
<th>{{$t('fnc.dqzhuangtai')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr class="_item_list" v-for="(item,index) in DataList">
......@@ -568,40 +568,40 @@
<td class="_number">
<template v-if="item.TCIDAndTCNUMList.length>0">
<div class="_TCIDAndTCNUMList">
<span>团号：</span>
<span>{{$t('visa.v_tuanhao')}}：</span>
<template v-if="item.TCIDAndTCNUMList&&item.TCIDAndTCNUMList.length>0">
<p><span v-for="(i,ix) in item.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}） <span v-if="ix!=item.TCIDAndTCNUMList.length-1">,<br/></span></span></p>
</template>
<template v-else>
<span>无</span>
<span>{{$t('fnc.no')}}</span>
</template>
</div>
<p v-if="item.OrderID>0 && item.OrderSource==8">单号：<span class="">{{item.OrderID}}</span></p>
<p v-if="item.OrderID>0 && item.OrderSource==8">{{$t('fnc.danhao')}}：<span class="">{{item.OrderID}}</span></p>
</template>
<template v-else-if="item.OrderSource==8 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">暂无团期信息</p>
<p class="_TCIDAndTCNUMList">{{$t('tips.zwtqxinxi')}}</p>
</template>
<template v-else-if="item.OrderSource==4 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList text_d" @click="goTicketPage(item)">机票编号：{{item.SourceID}}</p>
<p style="margin-top: 5px;">线路：<span>{{item.LineName?item.LineName:'机票尚未选择线路'}}</span></p>
<p class="_TCIDAndTCNUMList text_d" @click="goTicketPage(item)">{{$t('fnc.jpbianhao')}}：{{item.SourceID}}</p>
<p style="margin-top: 5px;">{{$t('advmanager.v_line')}}：<span>{{item.LineName?item.LineName:$t('tips.jpswxzxianlu')}}</span></p>
</template>
<template v-else-if="item.OrderSource==9 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">国内票务期数：{{item.Term}}</p>
<p class="_TCIDAndTCNUMList">{{$t('fnc.gnjpqishu')}}：{{item.Term}}</p>
</template>
<template v-else-if="item.OrderSource==10 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">签证编号：{{item.SourceID}}</p>
<p class="_TCIDAndTCNUMList">{{$t('fnc.qzbianhao')}}：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==11 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">投诉编号：{{item.SourceID}}</p>
<p class="_TCIDAndTCNUMList">{{$t('fnc.tsbianhao')}}：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==12 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">散卖机票编号：{{item.SourceID}}</p>
<p class="_TCIDAndTCNUMList">{{$t('fnc.smjpbianhao')}}：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==0">
<p class="_TCIDAndTCNUMList">{{ item.BranchName }}-{{item.DepartName}} </p>
</template>
<template v-else>
<p class="_TCIDAndTCNUMList">暂无 </p>
<p class="_TCIDAndTCNUMList">{{$t('active.cl_zanwu')}} </p>
</template>
</td>
<td>
......@@ -612,29 +612,29 @@
<td class="_number">
<template v-if="item.TradeWayList&&item.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList">
<p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span class="_bank_name">{{item.TradeWayList[0].TypeName}}</span><span class="_bank_type" :class="tw.AccountType=='私'?'':'_bank_type2'">{{tw.AccountType==""?'无':tw.AccountType}}</span> </p>
<p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span class="_bank_name">{{item.TradeWayList[0].TypeName}}</span><span class="_bank_type" :class="tw.AccountType=='私'?'':'_bank_type2'">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span> </p>
<p>{{tw.BankNo}}</p>
</div>
</template>
<template v-else>
<div class="_pad5">
无
{{$t('fnc.no')}}
</div>
</template>
</td>
<td>
<p>{{item.Type==1?'应收':'应付'}}：<span class="">{{moneyFormat(item.Money)}}</span></p>
<p>{{item.Type==1?'实收':'实付'}}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p>
<p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.Money)}}</span></p>
<p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p>
</td>
<td>
<template v-if='item.Type===1'>
<span class="_color_gar">汇款人：</span><span>{{item.RemitterName}}</span>
<span class="_color_gar">{{$t('fnc.huikuanren')}}：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===2'>
<span class="_color_gar">付款对象：</span><span>{{item.RemitterName}}</span>
<span class="_color_gar">{{$t('fnc.fkduixiang')}}：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===4'>
<span class="_color_gar">无</span>
<span class="_color_gar">{{$t('fnc.no')}}</span>
</template>
</td>
<td valign="middle">
......@@ -653,7 +653,7 @@
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">流程日志</p>
<p class="_log_t">{{$t('fnc.lcrizhi')}}</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>
......@@ -662,7 +662,7 @@
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
<li>{{$t('hotel.hotel_zanwu')}}</li>
</ul>
</div>
</div>
......@@ -670,23 +670,23 @@
</el-popover>
</td>
<td class="_icon_btn">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
<i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
<i class="iconfont icon-sousuo" v-if='item.Type===4' @click="goUrl('CapitalAllocationDetail',item.FrID,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="审核" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top">
<i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-ico_commodity_defaul" @click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="转交" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('fnc.zhuanjiao')" placement="top">
<i v-if="msg.Conditon==3" class="iconfont icon-zhuanjiao1" @click="zhuanBox = true,zhuanMsg.WorkFlowId = item.FrID"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="作废" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('active.cl_zuofei')" placement="top">
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
</el-tooltip>
<el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1" class="item" content="调整交易日期" placement="top">
<el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1" class="item" :content="$t('fnc.tzjyriqi')" placement="top">
<i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng" @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate" ></i>
</el-tooltip>
</td>
......@@ -706,15 +706,15 @@
:total=total>
</el-pagination>
</div>
<el-dialog custom-class='addCompany' title="选择转交人" width="400px" :visible.sync="zhuanBox" center :before-close="closeChangeMachie">
<el-dialog custom-class='addCompany' :title="$t('fnc.xzzjiaoren')" width="400px" :visible.sync="zhuanBox" center :before-close="closeChangeMachie">
<el-form label-width="100px">
<el-form-item label="转交人">
<el-form-item :label="$t('fnc.zhuanjiaoren')">
<el-select
v-model="zhuanMsg.AuditEmId"
filterable
remote
reserve-keyword
placeholder="请输入"
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethod"
@change="$forceUpdate()"
:loading="loading2">
......@@ -728,7 +728,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-form-item :label="$t('hotel.hotel_remark')">
<el-input type="textarea" v-model="zhuanMsg.Description" class="w216"></el-input>
</el-form-item>
</el-form>
......@@ -737,30 +737,30 @@
<button class="hollowFixedBtn" @click="zhuanBox=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<el-dialog :title="'单号：' + updateMsg.FrID + ' 调整交易日期'" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" >
<el-dialog :title=" $t('fnc.danhao') + '：' + updateMsg.FrID + $t('fnc.tzjyriqi')" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" >
<el-form label-width="110px">
<el-form-item label="原交易日期">
<el-form-item :label="$t('fnc.yjyriqi')">
<el-date-picker
v-model="updateMsg.OTradeDate"
type="date"
:disabled='true'>
</el-date-picker>
</el-form-item>
<el-form-item label="交易日期">
<el-form-item :label="$t('fnc.jiaoyiriqi')">
<el-date-picker
v-model="updateMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</el-form-item>
<el-form-item label="说明">
<el-form-item :label="$t('fnc.shuoming')">
<el-input type="textarea" v-model="updateMsg.Description" class="w216"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="dialogFormVisible=false">取 消</el-button>
<el-button class="normalBtn" type="primary" @click="UpdateTradeDate()">确 定</el-button>
<el-button class="hollowFixedBtn" @click="dialogFormVisible=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="UpdateTradeDate()">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -932,8 +932,8 @@ export default {
this.$router.push({ name: 'TicketManager',query:{id:data.SourceID,blank:'y',tab:'票务管理'} })
},
zhuanBtn(){
if(!this.zhuanMsg.AuditEmId) return this.$message.error('请选择转交人');
if(!this.zhuanMsg.Description)return this.$message.error('请填写转交备注');
if(!this.zhuanMsg.AuditEmId) return this.$message.error(this.$t('rule.qxzzjiaoren'));
if(!this.zhuanMsg.Description)return this.$message.error(this.$t('rule.qtxzjbeizhu'));
let msg = [];
msg.push(this.zhuanMsg);
this.apipost("Financial_post_Transfer",msg,res => {
......@@ -951,8 +951,8 @@ export default {
this.dialogFormVisible = true;
},
UpdateTradeDate(){
if(!this.updateMsg.TradeDate) return this.$message.error('请选择调整后的交易日期');
if(!this.updateMsg.Description) return this.$message.error('请填写说明');
if(!this.updateMsg.TradeDate) return this.$message.error(this.$t('rule.qxztzhdjyriqi'));
if(!this.updateMsg.Description) return this.$message.error(this.$t('rule.qtxshuoming'));
this.apipost("Financial_get_SetTradeDate",this.updateMsg,res => {
if(res.data.resultCode == 1) {
this.$message.success(res.data.message);
......@@ -983,7 +983,7 @@ export default {
},
Financial_post_SetBatch(){ // 批量提交
let FrID = this.checkList;
if(!FrID.length)return this.$message.error('请选择一个需要提交的单据！');
if(!FrID.length)return this.$message.error(this.$t('rule.qxzygxytjddanju'));
let list = [];
this.checkList.forEach(x=>{
list.push({FrID:x});
......@@ -1071,16 +1071,16 @@ export default {
},err=>{})
},
financeRemove(id){//作废
this.$confirm('是否对申请单进行作废操作？作废后不可恢复！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.zuofeicaiwudan'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.deletFinance(id)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
message: '已' + this.$t('pub.cancelBtn')
});
});
},
......@@ -1259,7 +1259,7 @@ export default {
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
this.msg.EmployeeId=this.userId;
this.GetLocalFile("Financial_get_OutToFinanceList", this.msg,"财务报表.xls");
this.GetLocalFile("Financial_get_OutToFinanceList", this.msg, this.$t('fnc.cwbaobiao')+".xls");
} ,
getDepartment(){ //部门
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 8d1adbdb
......@@ -903,16 +903,6 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YouHui",
formatter: this.moneyFormat,
title: "优惠",
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "DaiShou",
formatter: this.moneyFormat,
......@@ -1012,16 +1002,6 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "BaoXian",
title: "保险费",
formatter: this.moneyFormat,
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "QiTa",
formatter: this.moneyFormat,
......@@ -1514,7 +1494,6 @@ export default {
"实收金额",
"退款",
"平台税金",
"优惠金额",
"待收金额",
"溢收金额",
"人数",
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 8d1adbdb
......@@ -286,7 +286,6 @@
</el-radio-group>
</div>
</div>
</div>
<div class="approval_page_layer_bottom">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="closeLayer" /> &nbsp;&nbsp;
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 8d1adbdb
......@@ -104,18 +104,6 @@
</el-option>
</el-select>
</div>
<el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="danger" icon="el-icon-upload2">
<!-- <i class="el-icon-plus avatar-uploader-icon" @click="ClickItem=item"></i> -->
<div class="el-upload__text" @click="ClickItem=item">点击上传</div>
</el-button>
</el-upload>
<div class="RoomfileList" v-for="(subItem,subIndex) in item.ContractUrlArray" v-if="item.ContractUrlArray!=null && item.ContractUrlArray.length>0">
<p title="点击下载" @click="downLoadPZ(subItem)" style="cursor: pointer;">{{ '附件' + (index + 1)}}</p>
<span>
<i class="iconfont icon-close" @click="deleteFile(item,subIndex)"></i>
</span>
</div>
</td>
<td>
<div class="w80">
......@@ -225,26 +213,10 @@
CreateByAccount: '',
//创建人姓名
CreateByName: '',
//点击项
ClickItem: {},
}
},
methods: {
//联系op
downLoadPZ: function (src) {
let dom = document.querySelector("#blankLink")
dom.href=src
dom.click()
},
//删除
deleteFile(item,index){
item.ContractUrlArray.splice(index,1);
var str = "";
item.ContractUrlArray.forEach(subItem => {
str += subItem + ",";
})
item.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
},
openChart() {
this.MsgBus.$emit('openChat', {
account: this.CreateByAccount,
......@@ -293,15 +265,11 @@
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
this.list.forEach(item => {
this.calculationPrice(item);
this.calculationPrice(item)
item.hotelList.push({
Name: item.NewHotelName,
ID: item.NewHotelId
})
item.ContractUrlArray = [];
if (item.ContractUrl && item.ContractUrl != '') {
item.ContractUrlArray = item.ContractUrl.split(',');
}
item.PayStyle = item.PayStyle.toString()
item.OrderDetailsList.forEach((x, index1) => {
if (x.HouseTypeCount <= 0) {
......@@ -313,22 +281,22 @@
x.UnitPrice = x.UnitPrice.toString();
x.HotelDiscount = x.HotelDiscount.toString();
})
if (item.ReserveNo == '' || item.ReserveNo == null) {
if(item.ReserveNo==''||item.ReserveNo==null){
item.ReserveNo = this.$route.query.NewCombinationNum;
}
})
} else {
this.$message.error(res.data.message);
this.$message.error(res.data.message)
}
}, err => {})
},
calculationPrice(obj) {
let totalPrice = 0;
let totalPrice = 0
obj.OrderDetailsList.forEach(item => {
totalPrice += item.UnitPrice * (item.HouseGuestNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
totalPrice += item.UnitPrice * (item.HouseGuestNum - item.HotelDiscount) * (1 - item.RebateRatio / 100)
})
obj.TotalPrice = totalPrice.toFixed(2);
this.$forceUpdate();
obj.TotalPrice = totalPrice.toFixed(2)
this.$forceUpdate()
},
getHotelList(obj) {
this.apipost('hotel_post_GetLineHotelList', {
......@@ -337,32 +305,32 @@
QCity: obj.QCity
}, res => {
if (res.data.resultCode == 1) {
obj.hotelList = res.data.data;
obj.hotelList = res.data.data
} else {
this.$message.error(res.data.message);
this.$message.error(res.data.message)
}
}, err => {})
},
sendValue(obj) {
if (obj.hotelList.length > 0) {
let ckedObj = obj.hotelList.find(item => item.ID == obj.NewHotelId);
obj.Address = ckedObj.Address;
obj.Tel = ckedObj.Tel;
obj.NewHotelName = ckedObj.Name;
let ckedObj = obj.hotelList.find(item => item.ID == obj.NewHotelId)
obj.Address = ckedObj.Address
obj.Tel = ckedObj.Tel
obj.NewHotelName = ckedObj.Name
} else {
obj.Address = '';
obj.Tel = '';
obj.Address = ''
obj.Tel = ''
}
},
saveList(type) {
if (type == 0) {
this.list.forEach(item => {
item.HotelOrderState = 0;
item.HotelOrderState = 0
})
}
if (type == 1) {
this.list.forEach(item => {
item.HotelOrderState = 1;
item.HotelOrderState = 1
})
}
this.list.forEach(x => {
......@@ -374,10 +342,9 @@
})
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.getList();
this.Success(res.data.message);
this.Success(res.data.message)
} else {
this.Error(res.data.message);
this.Error(res.data.message)
}
}, err => {})
},
......@@ -386,33 +353,13 @@
item.HotelOrderState = 1;
this.apipost('dmcstatistics_post_SetNewHotelOrder', item, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.Success(res.data.message)
} else {
this.Error(res.data.message);
this.Error(res.data.message)
}
}, err => {})
},
//合同上传
uploadFileBtn(file) {
if (file.file.size > 1024 * 1024 * 100) {
this.$message.warning("文件大小不能超过100M！");
return;
}
let newArr = [];
newArr.push(file.file);
let path = "/Upload/DMC/";
this.$message.info("上传中...");
this.UploadSelfFileT(path, newArr, x => {
var fileUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.ClickItem.ContractUrlArray.push(fileUrl);
var str = "";
this.ClickItem.ContractUrlArray.forEach(subItem => {
str += subItem + ",";
})
this.ClickItem.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
});
},
}
},
mounted() {
this.TCNUM = this.$route.query.TCNUM;
......@@ -421,32 +368,8 @@
this.getList();
},
}
</script>
<style>
.RoomfileList{
width:100%;
height:20px;
text-align: center;
position: relative;
cursor: pointer;
}
.RoomfileList p{
display: inline-block;
}
.RoomfileList i:hover{
color:#E95252;
}
.roomReservationsDetailsTalbe .el-button--small {
padding: 0 20px 0 10px;
margin-top: 10px;
height:28px;
line-height: 10px;
}
.roomReservationsDetailsTalbe .el-button--small i{
float: left;
margin-top:9px;
}
.roomReservationsDetailsTalbe .roomBtn {
color: #fff;
padding: 0 10px !important;
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 8d1adbdb
......@@ -315,7 +315,6 @@
this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
}
......
src/components/SalesModule/VisaFinancialDocuments.vue deleted 100644 → 0
View file @ 227153be
<style>
.page_SalesFinancialDetail{}
.page_SalesFinancialDetail p.sfd_tit {
border-left: 3px solid #E95252;
text-indent: 10px;
font-size: 16px;
line-height: 30px;
margin: 20px 0 10px 0;
}
.page_SalesFinancialDetail .sfd_nav{margin: 20px 0 0 0 ;}
.page_SalesFinancialDetail .sfd_nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
.page_SalesFinancialDetail .sfd_nav li._active{background-color:#FFFFFF;color: #333333 }
.page_SalesFinancialDetail .sfd_nav li._active::after{content: "";width: 20px;height: 3px;background-color: #E95252;display: inline-block;position: absolute;bottom: 0;left: 38%;}
.page_SalesFinancialDetail p.sfd_tit input{
float: right
}
.page_SalesFinancialDetail .sfd_header{
position: relative;
width: 100%;
margin-bottom: 15px;
}
.page_SalesFinancialDetail .sfd_header input{
position: absolute;
right: 0;
bottom: 0;
}
.page_SalesFinancialDetail .sfd_header>ul {
background-color: white;
padding: 15px;
border-radius: 4px;
width: 800px;
}
.page_SalesFinancialDetail .sfd_header>ul>li {
float: left;
width: 33%;
padding: 5px 0;
min-height: 31px;
}
.page_SalesFinancialDetail .sfd_header>ul>li>span {
font-size: 14px;
color: #666;
}
.page_SalesFinancialDetail table.teamRevenueExpenditureTable {
background: #eee;
width: 100%;
margin-bottom: 30px;
}
.page_SalesFinancialDetail table.teamRevenueExpenditureTable th {
background: #D1D1D1;
font-weight: normal !important;
font-size: 14px;
height: 30px;
color: #333;
}
.page_SalesFinancialDetail table.teamRevenueExpenditureTable td {
background: #fff;
height: 36px;
text-align: center;
font-size: 12px;
}
.page_SalesFinancialDetail table.teamRevenueExpenditureTable td:first-child span {
text-decoration: underline;
cursor: pointer;
}
.page_SalesFinancialDetail td.noDataNotice p.iconfont {
font-size: 120px;
color: #ccc;
}
.page_SalesFinancialDetail td.noDataNotice p.text{
color: #999;
margin-bottom: 20px;
}
.page_SalesFinancialDetail .color_red{
color: #e95252 !important;
}
.page_SalesFinancialDetail .sfd_header>ul:nth-child(1){
padding-bottom: 0;
}
.page_SalesFinancialDetail .sfd_header>ul:nth-child(2){
padding-top: 0;
}
</style>
<template>
<div class="page_SalesFinancialDetail">
<!-- <ul class="sfd_nav clearfix">
<li :class="activeTab===1?'_active':''" @click="activeTab=1,getList(1)">收款单</li>
<li :class="activeTab===2?'_active':''" @click="activeTab=2,getList(2)">付款单</li>
</ul> -->
<div v-loading="loading">
<div class="sfd_header">
<ul class="clearfix">
<li><span>{{$t('scen.sc_temID')}}:</span>{{TCNUM}}</li>
<!-- <li><span>订单号：</span>{{orderId}}</li> -->
<li> </li>
<li><span>已收总金额：</span>{{moneyFormat(allMoney)}}</li>
<li><span>已审金额：</span>{{moneyFormat(shiMoney)}}</li>
<li><span>待审金额：</span><span :class="{color_red:(allMoney-shiMoney)!==allMoney}">{{moneyFormat(allMoney-shiMoney)}}</span></li>
</ul>
<ul class="clearfix fukuan">
<li><span>应付总金额：</span>{{moneyFormat(allMoneyP)}}</li>
<li><span>已审金额：</span>{{moneyFormat(shiMoneyP)}}</li>
<li><span>待审金额：</span><span :class="{color_red:(allMoneyP-shiMoneyP)!==allMoneyP}">{{moneyFormat(allMoneyP-shiMoneyP)}}</span></li>
</ul>
</div>
<p class="sfd_tit clearfix">收款单 <input type="button" value="增加财务单据" class="normalBtn" @click="addFinancialOrder(1)"></p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">单号</th>
<th width="200">{{$t('fnc.fyleixing')}}</th>
<th width="350">交易方式</th>
<th width="100">同行转款</th>
<th width="100">应收</th>
<th width="100">实收</th>
<th width="100">平台税金</th>
<th width="150">交易日期</th>
<th width="100">制单人员</th>
<th width="120">当前状态</th>
</tr>
<tr v-for="(item, index) in dataList">
<td width="100" @click="goUrl('财务单据','FinancialDocumentsDetail',item.FrID)"><span>{{item.FrID}}</span></th>
<td width="">
<template v-for="(s,si) in item.CostTypeList">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span>
</template>
</td>
<td width="">
<template v-if="item.TradeWayList&&item.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList" style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 5px auto;width:230px">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{item.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span> </p>
<p style="color:#333333">{{tw.BankNo}}</p>
</div>
</template>
<template v-else>
<div class="_pad5">
无
</div>
</template>
</td>
<td width="">
<p style="line-height:20px"><span>{{moneyFormat(item.PreferPrice)}}</span></p>
</td>
<td>
<p style="line-height:20px"><span>{{moneyFormat(item.Money)}}</span></p>
</td>
<td>
<p style="line-height:20px"><span>{{moneyFormat(item.PayMoney)}}</span></p>
</td>
<td>
<p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p>
</td>
<td width="">{{item.TradeDate}}</td>
<td width="">{{item.EmName}}</td>
<td width="">
<i v-if="item.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
<i v-if="item.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
<i v-if="item.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
<i v-if="item.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
<i v-if="item.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
<el-popover
popper-class="detailsIT_Journal"
width="250"
trigger="click">
<div style="height: auto;max-height: 220px;background-color: #FFFFFF;">
<div class="changLog">
<p class="_log_t">流程日志</p>
<ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList" v-loading='LogLoading'>
<li style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span>
<p> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p>
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
</ul>
</div>
</div>
<span slot="reference" style="cursor: pointer;" @click="Financial_post_GetFinancLogList(item.FrID)">{{item.StatusStr}}</span>
</el-popover>
</td>
</tr>
<tr v-if="dataList.length===0">
<td colspan="10" class="noDataNotice">
<div>
<p class="iconfont icon-kong"></p>
<p class="text">{{`暂无数据`}}</p>
</div>
</td>
</tr>
</table>
<p class="sfd_tit clearfix">付款单 <input type="button" value="增加财务单据" class="normalBtn" @click="addFinancialOrder(2)"></p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">单号</th>
<th width="200">费用类型</th>
<th width="350">交易方式</th>
<th width="100">同行转款</th>
<th width="100">应付</th>
<th width="100">实付</th>
<th width="100">平台税金</th>
<th width="150">交易日期</th>
<th width="100">制单人员</th>
<th width="120">当前状态</th>
</tr>
<tr v-for="(item, index) in dataListP">
<td width="100" @click="goUrl('财务单据','FinancialDocumentsDetail',item.FrID)"><span>{{item.FrID}}</span></th>
<td width="">
<template v-for="(s,si) in item.CostTypeList">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span>
</template>
</td>
<td width="">
<template v-if="item.TradeWayList&&item.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList" style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 5px auto;width:230px">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{item.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span> </p>
<p style="color:#333333">{{tw.BankNo}}</p>
</div>
</template>
<template v-else>
<div class="_pad5">
无
</div>
</template>
</td>
<td width="">
<p style="line-height:20px"><span>{{moneyFormat(item.PreferPrice)}}</span></p>
</td>
<td>
<p style="line-height:20px"><span>{{moneyFormat(item.Money)}}</span></p>
</td>
<td>
<p style="line-height:20px"><span>{{moneyFormat(item.PayMoney)}}</span></p>
</td>
<td>
<p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p>
</td>
<td width="">{{item.TradeDate}}</td>
<td width="">{{item.EmName}}</td>
<td width="">
<i v-if="item.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
<i v-if="item.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
<i v-if="item.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
<i v-if="item.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
<i v-if="item.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
<el-popover
popper-class="detailsIT_Journal"
width="250"
trigger="click">
<div style="height: auto;max-height: 220px;background-color: #FFFFFF;">
<div class="changLog">
<p class="_log_t">流程日志</p>
<ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList" v-loading='LogLoading'>
<li style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span>
<p> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p>
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
</ul>
</div>
</div>
<span slot="reference" style="cursor: pointer;" @click="Financial_post_GetFinancLogList(item.FrID)">{{item.StatusStr}}</span>
</el-popover>
</td>
</tr>
<tr v-if="dataListP.length===0">
<td colspan="10" class="noDataNotice">
<div>
<p class="iconfont icon-kong"></p>
<p class="text">{{`暂无数据`}}</p>
</div>
</td>
</tr>
</table>
</div>
</div>
</template>
<script>
export default {
data() {
return {
orderId: 0,
dataList: [],
dataListP: [],
loading: true,
noData: true,
activeTab: 1,
tcnum: '',
msg:{
pageIndex: 1,
pageSize: 999,
FrID: '',
sDate: '',
eDate: '',
Status: '-1',
TemplateId: '0',
RB_Branch_Id: '',
RB_Depart_Id: '',
sTradeDate: '',
eTradeDate: '',
ClientType: '',
RemitterName: '',
ClientID: '',
sMoney: '',
eMoney: '',
CurrencyId: '0',
CostTypeID: '',
Conditon: '',
TCID: '',
TradeWay: '0',
Type: '-1',
AccountType: '',
QEndDate: '',
QStartDate: '',
UpdateBy: '',
Sort: '2',
EmployeeId: '',
IsNotCancelFinance: 1,
IsSellOrderForm:1
},
GetFinancLogList: [],
LogLoading: true,
allMoney: 0,
shiMoney: 0,
allMoneyP: 0,
shiMoneyP: 0,
userId: null,
item: {},
tcid:0,
OutBranchId:0,
TCNUM:0,
}
}, methods: {
Financial_post_GetFinancLogList: function(id){ // 获取单据日志
if (this.checkboxShow) return
this.LogLoading = true;
this.apipost('Financial_post_GetFinancLogList',{ID: id, Type: 2}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
})
this.LogLoading = false;
this.GetFinancLogList = data;
}
},null)
},
goUrl: function (name, path, id ) {
this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
},
getList: function () {
this.dataList=[];
this.dataListP=[];
this.loading = true;
this.apipost('Financial_post_GetPriceVisaFinanceList',{tcid:this.tcid}, res=>{
this.loading = false;
if (res.data.resultCode == 1) {
let data = res.data.data.list;
this.allMoney = 0;
this.shiMoney = 0;
// 收款单据，type==1
data.forEach(x=>{
if(x.Type==1){
this.dataList.push(x)
}else{
this.dataListP.push(x)
}
})
this.dataList.forEach(x=>{
this.allMoney += x.PreferPrice
if(x.PayMoney>0){
this.shiMoney += (x.PayMoney+x.Fee)
}
})
this.dataListP.forEach(x=>{
this.allMoneyP += x.PreferPrice
if(x.PayMoney>0){
this.shiMoneyP += (x.PayMoney+x.Fee)
}
})
} else {
this.$message.error(res.data.message);
}
}, null)
},
addFinancialOrder: function (type) { // 新增单据方法
let TCIDARR = [this.tcid];
let orderObj = {
OrderID: 0,
OrderSource: 10,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
}
if (type === 1) {
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type": 1,
"companyID": this.outBranchId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
} else if (type === 2) {
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type": 2,
"companyID": this.outBranchId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
}
},
}, mounted() {
this.userId = this.getLocalStorage().EmployeeId;
// let obj = this.$route.query.item ? JSON.parse(this.$route.query.item) : ''
// this.item = obj
// this.orderId = this.msg.OrderID = obj.orderId ? obj.orderId : obj.OrderId
// this.tcnum = obj.tcnum ? obj.tcnum : obj.TCNUM
// this.tcid = obj.tcid ? obj.tcid : obj.TCID
// this.outBranchId = obj.outBranchId ? obj.outBranchId : obj.OutBranchId;
this.tcid= this.$route.query.TCID;
this.OutBranchId=this.$route.query.OutBranchId;
this.TCNUM=this.$route.query.TCNUM;
this.getList()
}
}
</script>
src/components/SalesModule/groupInquiry.vue
View file @ 8d1adbdb
......@@ -130,47 +130,6 @@
border: 1px solid #d95454 !important;
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>
<template>
<div>
......@@ -182,7 +141,7 @@
</el-tabs>
</ul> -->
<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>
</div>
<div class="TC_Content TC-MyList">
......@@ -190,17 +149,17 @@
<ul>
<li>
<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-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 in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('active.ad_xlmc')}}</em>
<em>系列名称</em>
<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 v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
......@@ -210,14 +169,14 @@
</li>
<li>
<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"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('scen.sc_ftTime')}}</em>
<em>发团日期</em>
<el-date-picker class="w150" type="date" v-model='queryMsg.StartGroupDate' :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder="">
</el-date-picker>
......@@ -230,21 +189,21 @@
<span>
<em>{{$t('visa.v_qianzhengst')}}</em>
<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="$t('visa.v_weibanli')" value="1"></el-option>
<el-option :label="$t('visa.v_banlizhong')" value="2"></el-option>
<el-option :label="$t('visa.v_yibanli')" value="3"></el-option>
<el-option label="不限" value="-1"></el-option>
<el-option label="未办理" value="1"></el-option>
<el-option label="办理中" value="2"></el-option>
<el-option label="已办理" value="3"></el-option>
</el-select>
</span>
</li>
<li class="advancedLi">
<el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click">
<div>
<div class="TC_queryTitle">{{$t('visa.v_tkgjcx')}}</div>
<div class="TC_queryTitle">团控高级查询</div>
<div class="clearfix">
<div class="TC_leftSearch">
<div>
<span>{{$t('system.query_airCompanyName')}}</span>
<span>航空公司</span>
<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 v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName" :value="item.AirLineId">
......@@ -252,7 +211,7 @@
</el-select>
</div>
<div>
<span>{{$t('visa.v_czuser')}}</span>
<span>操作人员</span>
<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 v-for="item in queryCommonData.EmployeeList" :label='item.EmName' :value='item.EmployeeId' :key='item.EmployeeId'>
......@@ -260,13 +219,13 @@
</el-select>
</div>
<div>
<span>{{$t('visa.v_xcdays')}}</span>
<span>行程天数</span>
<el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')"
class="w150" :placeholder="$t('pub.pleaseImport')"></el-input>
</div>
<div>
<span>{{$t('visa.v_lycity')}}</span>
<span>联运城市</span>
<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 v-for="item in queryCommonData.CityList" :label='item.Name' :value='item.ID' :key='item.ID'>
......@@ -277,7 +236,7 @@
</div>
<div class="TC_rightSearch">
<div>
<span>{{$t('visa.v_teamnum')}}</span>
<span>团队人数</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" @keyup.native="checkInteger(queryMsg,'TeamMinNum')"
:placeholder="$t('pub.pleaseImport')"></el-input>
-
......@@ -285,7 +244,7 @@
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</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')"
:placeholder="$t('pub.pleaseImport')"></el-input>
-
......@@ -293,11 +252,11 @@
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div>
<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>
</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-option v-for='item in queryCommonData.companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option>
......@@ -306,9 +265,9 @@
</div>
</div>
<div class="comSearchDiv">
<span>{{$t('scen.sc_temStatu')}}</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 v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" :key="team.Name">{{team.Name}}</el-checkbox>
</el-checkbox-group>
......@@ -316,7 +275,7 @@
</div>
<!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> -->
<div class="comSearchDiv">
<span>{{$t('Airticket.Air_salesPlatform')}}</span>
<span>销售平台</span>
<span>
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
......@@ -325,7 +284,7 @@
</span>
</div>
<div class="comSearchDiv">
<span>{{$t('visa.v_tqstatus')}}</span>
<span>团期状态</span>
<span>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
......@@ -334,7 +293,7 @@
</span>
</div>
<div class="comSearchDiv">
<span>{{$t('visa.v_hbstatus')}}</span>
<span>航班状态</span>
<span>
<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>
......@@ -344,7 +303,7 @@
<button class="normalBtn TC_SearchBtn" @click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">查询</button>
</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>
</li>
<li>
......@@ -372,23 +331,23 @@
v-for="plat in item.SalePlatList" :key="plat.subCode">
{{$tripUtils.getPlatName(plat)}}
</span>
<span class="TC_xiajia daiwanshan" v-if="item.TCState==1">{{$t('visa.v_dwanshan')}}</span>
<span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
<span class="TC_xiajia daiwanshan" v-if="item.TCState==1">待完善</span>
<span class="TC_xiajia" v-if="item.TCState==2">已下架</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">已取消</span>
</div>
</div>
</div>
<div class="el-col" style="width:200px;">
<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">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th>
<th width="100">{{$t('system.query_stopCity')}}</th>
<th width="150">起飞时间</th>
<th width="80">到达时间</th>
<th width="100">经停城市</th>
</tr>
<tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;">
<td class="_d_name _color_666">
......@@ -419,8 +378,8 @@
<span>{{subItem.StopoverName}}</span>
<span v-if="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==2" class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
<span v-if="subItem.FlightState==1" class="TCL-greenType">【确定】</span>
<span v-if="subItem.FlightState==2" class="TCL-redType">【暂定】</span>
</div>
</div>
</el-popover>
......@@ -428,7 +387,7 @@
</div >
<div class="el-col" style="width:190px;">
<div class="d3">
<p><i class="iconfont icon-tuandui"></i>团队信息<em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}晚</em></p>
<p><i class="iconfont icon-tuandui"></i>团队信息<em>{{item.DayNum}}天{{item.NightNum}}晚</em></p>
<p><span>出发时间</span>{{item.StartDate}}</p>
<p><span>出团公司</span>{{item.OutBranchName}}</p>
</div>
......@@ -490,37 +449,15 @@
<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>
</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="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="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='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='openEdit2(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>出签日期</el-button>
</div>
</div>
</div>
<div class="person_fan">
<div style="padding:10px 0">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.VisaGuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.VisaGuestList">{{childItem.GuestName}}</span>
</span>
<span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
</span>
</div>
<div>
<span>财务单据：</span>
<span @click="goUrl('VisaFinancialDocuments',item.TCID,item.OutBranchId,item.TCNUM,'签证财务单据')" style="margin-right:5px;cursor:pointer" v-for="item2 in item.VisaFinanceList" :key="item2.FrID">
<span v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue" >{{item2.FrID}}</span>
<span v-else-if="item2.ColorState===2" class="groupTourOrder_tickets_green" >{{item2.FrID}}</span>
<span v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red" >{{item2.FrID}}</span>
<span v-else-if="item2.ColorState===4" class="groupTourOrder_tickets_black" >{{item2.FrID}}</span>
</span>
<span v-if="item.VisaFinanceList.length===0">暂无数据</span>
</div>
</div>
<!-- <div class="TC_remarkContent">
<div class="TC_remarkContent">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle">OP对外备注：</div>
<div class="TCL_Content">{{item.OPRemark}}</div>
......@@ -533,7 +470,7 @@
<div class="TCL_remarkTitle">地接备注：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div>
</div>
</div> -->
</div>
</li>
</ul>
<div class="noData" v-show="queryMsg.noData">
......@@ -639,7 +576,7 @@
<div style="display: inline-block;vertical-align: top;white-space: nowrap;">
<el-form-item label="国家" 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-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-form-item>
<el-form-item prop="EuropeVisaName" class="groupInquiry_admission_formItem" v-show="msg_admission.EuropeVisaType==='2'&&msg_admission.EuropeSchengen==='5'">
......@@ -820,7 +757,7 @@ export default {
},
flightStatus: [{
Id: 0,
Name: this.$t('pub.unlimitedSel'),
Name: '不限',
Checked:true
}, {
Id: 1,
......@@ -846,18 +783,6 @@ export default {
};
},
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) {
this.uploadTCID = tcid
},
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 8d1adbdb
......@@ -854,53 +854,6 @@
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">保险费：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'保险费') || isExists(item.CostTypeList,'旅游责任险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr> </template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">其他：</div>
</div>
......@@ -916,7 +869,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
<tr v-if="NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1139,7 +1092,7 @@
gridData:[],
TCID: 0,
//数据列表
DataList: [],
DataList: "",
OutBranchId: 0,
ishowBtn: true,
CloseIncomeBtn: false,
......@@ -1241,7 +1194,7 @@
x.checked = false;
})
this.DataList = data;
console.log("resa",this.DataList)
// console.log("resa",this.DataList)
}
});
},
......
src/components/VisaCenter/addVisa.vue
View file @ 8d1adbdb
......@@ -33,11 +33,11 @@
<template>
<div class="page_addVisa">
<el-form :model="addMsg" ref="addMsg" :rules="rules" label-width="150px" class="_form clearfix" >
<p class="btmTitle">{{$t('visaT.cxjihua')}}</p>
<el-form-item :label="$t('visa.v_tuanhao')" clearable prop="OrderId">
<p class="btmTitle">出行计划</p>
<el-form-item label="团号" clearable prop="OrderId">
<el-input v-model="addMsg.OrderId" disabled type="text" size=mini class="w230"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.sqneirong')" clearable prop="ApplyForType">
<el-form-item label="申请类型" clearable prop="ApplyForType">
<el-select v-model="addMsg.ApplyForType" size=mini class="w230">
<el-option
......@@ -48,20 +48,20 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.crjtime')" prop="value6">
<el-form-item label="出入境时间" prop="value6">
<el-date-picker class="h34"
disabled
@change="timeAdd(),dateTimeReg()"
v-model="addMsg.value6"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')"
:start-placeholder="$t('visaT.chujingtime')"
:end-placeholder="$t('visaT.rujingtime')">
range-separator="至"
start-placeholder="出境时间"
end-placeholder="入境时间">
</el-date-picker>
</el-form-item>
<div class="_flex">
<el-form-item :label="$t('visaT.cfAirport')" prop="DepartAirport">
<el-form-item label="出发机场" prop="DepartAirport">
<el-select disabled v-model="addMsg.DepartAirport" filterable size=mini class="w230" @change="getFilghtForAir(1)">
<el-option
v-for="item in ChinaAirportList"
......@@ -71,7 +71,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Portofentry')" prop="EnterCountryPort">
<el-form-item label="入境口岸" prop="EnterCountryPort">
<el-select disabled v-model="addMsg.EnterCountryPort" filterable size=mini class="w230" @change="getFilghtForAir(1)">
<el-option
v-for="item in JapanAirportList"
......@@ -81,7 +81,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Inboundflights')" prop="EnterCountryFlight">
<el-form-item label="入境航班" prop="EnterCountryFlight">
<el-select disabled v-model="addMsg.EnterCountryFlight" filterable size=mini class="w230">
<el-option
v-for="item in FilghtForAirIn"
......@@ -93,7 +93,7 @@
</el-form-item>
</div>
<div class="_flex">
<el-form-item :label="$t('visaT.fhjichang')" prop="GetBackAirport">
<el-form-item label="返回机场" prop="GetBackAirport">
<el-select disabled v-model="addMsg.GetBackAirport" filterable size=mini class="w230" @change="getFilghtForAir(2)">
<el-option
v-for="item in ChinaAirportList"
......@@ -103,7 +103,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Exitport')" prop="LeaveCountryPort">
<el-form-item label="出境口岸" prop="LeaveCountryPort">
<el-select disabled v-model="addMsg.LeaveCountryPort" filterable size=mini class="w230" @change="getFilghtForAir(2)">
<el-option
v-for="item in JapanAirportList"
......@@ -113,7 +113,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Outboundflight')" prop="LeaveCountryFlight">
<el-form-item label="出境航班" prop="LeaveCountryFlight">
<el-select disabled v-model="addMsg.LeaveCountryFlight" filterable size=mini class="w230">
<el-option
v-for="item in FilghtForAirOut"
......@@ -124,54 +124,54 @@
</el-select>
</el-form-item>
</div>
<el-form-item :label="$t('visaT.Orderremark')">
<el-form-item label="订单备注">
<el-input v-model="addMsg.OrderRemarks" type="textarea" maxlength="500" size=mini class="w400"></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_remark')">
<el-form-item label="备注">
<el-input v-model="addMsg.Remarks" type="textarea" maxlength="500" size=mini class="w400"></el-input>
</el-form-item>
</el-form>
<p class="btmTitle">{{$t('visaT.Applicantxx')}}({{$t('hotel.hotel_totalRoom')}}{{addMsg.PeopleList.length}}{{$t('hotel.hotel_people')}})</p>
<p class="btmTitle">申请人信息(共{{addMsg.PeopleList.length}}人)</p>
<div class="_scrollbar">
<div v-for="(item,index) in addMsg.PeopleList">
<el-form :model="item" ref="item" :rules="rules" label-width="160px" class="_Apply_item_form clearfix">
<div class="_Apply_item clearfix">
<p>{{$t('visaT.Applicantxx')}}{{index+1}} <i v-show="showIS" class="iconfont icon-guanbi" @click="deleteThis(index)"></i> </p>
<el-form-item :label="$t('visaT.Chinesesurname')" prop="SurName">
<el-input disabled v-model="item.SurName" @change="Transformation(item.SurName,'SurName',index)" type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peChinese')"></el-input>
<p>申请人{{index+1}} <i v-show="showIS" class="iconfont icon-guanbi" @click="deleteThis(index)"></i> </p>
<el-form-item label="中文姓" prop="SurName">
<el-input disabled v-model="item.SurName" @change="Transformation(item.SurName,'SurName',index)" type="text" size=mini class="w230" maxlength="20" placeholder="请输入中文"></el-input>
</el-form-item>
<el-form-item :label="$t('admin.admin_cnName')" prop="Name" >
<el-input disabled v-model="item.Name" type="text" @change="Transformation(item.Name,'Name',index)" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peChinese')"></el-input>
<el-form-item label="中文名" prop="Name" >
<el-input disabled v-model="item.Name" type="text" @change="Transformation(item.Name,'Name',index)" size=mini class="w230" maxlength="20" placeholder="请输入中文"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_sex')" prop="Sex">
<el-form-item label="性别" prop="Sex">
<el-select v-model="item.Sex" disabled filterable size=mini class="w230">
<el-option key="1" :label="$t('visaT.boy')" value="1"> </el-option>
<el-option key="2" :label="$t('visaT.girl')" value="2"> </el-option>
<el-option key="1" label="男" value="1"> </el-option>
<el-option key="2" label="女" value="2"> </el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Englishsurname')" prop="ESurName">
<el-input disabled v-model="item.ESurName" type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peEnglish')"></el-input>
<el-form-item label="英文姓" prop="ESurName">
<el-input disabled v-model="item.ESurName" type="text" size=mini class="w230" maxlength="20" placeholder="请输入英文"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_ENname')" prop="EName">
<el-input disabled v-model="item.EName" type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peEnglish')"></el-input>
<el-form-item label="英文名" prop="EName">
<el-input disabled v-model="item.EName" type="text" size=mini class="w230" maxlength="20" placeholder="请输入英文"></el-input>
</el-form-item>
<el-form-item :label="$t('admin.admin_BirthDate')" prop="Birthday">
<el-form-item label="出生日期" prop="Birthday">
<el-date-picker
disabled
class="w230"
v-model="item.Birthday"
value-format="yyyy-MM-dd"
type="date"
:placeholder="$t('admin.admin_choDate')">
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('system.table_Passport')" prop="PassportNo">
<el-input disabled v-model="item.PassportNo" type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.ptxPassportNo')"></el-input>
<el-form-item label="护照号" prop="PassportNo">
<el-input disabled v-model="item.PassportNo" type="text" size=mini class="w230" maxlength="20" placeholder="请填写护照号"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.PassportNoadder')" prop="PassportAddress">
<el-input disabled v-model="item.PassportAddress" type="text" size=mini class="w230" maxlength="100" :placeholder="$t('visaT.Pleasefillin')"></el-input>
<el-form-item label="护照签发地" prop="PassportAddress">
<el-input disabled v-model="item.PassportAddress" type="text" size=mini class="w230" maxlength="100" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.PassportNogq')" prop="PassportExpiry">
<el-form-item label="护照过期日" prop="PassportExpiry">
<el-date-picker
disabled
@change="dateTimeReg(item.PassportExpiry,index)"
......@@ -180,10 +180,10 @@
v-model="item.PassportExpiry"
value-format="yyyy-MM-dd"
type="date"
:placeholder="$t('admin.admin_choDate')">
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('visaT.nationality')" prop="Nationality">
<el-form-item label="国籍" prop="Nationality">
<el-select disabled v-model="item.Nationality" filterable size=mini class="w230">
<el-option
v-for="item in countryList"
......@@ -193,7 +193,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Marriage')" prop="Marriage">
<el-form-item label="婚姻" prop="Marriage">
<el-select disabled v-model="item.Marriage" filterable size=mini class="w230">
<el-option
v-for="item in MarriageType"
......@@ -203,13 +203,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visa.v_jtjzd')" prop="Address">
<el-input disabled v-model="item.Address" type="text" size=mini class="w230" maxlength="6" :placeholder="$t('visaT.fillprovince')"></el-input>
<el-form-item label="家庭居住地" prop="Address">
<el-input disabled v-model="item.Address" type="text" size=mini class="w230" maxlength="6" placeholder="请填写省"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.jtxxdz')" prop="AddressDetail" class="_AddressDetail">
<el-input disabled v-model="item.AddressDetail" type="text" size=mini maxlength="200" :placeholder="$t('visaT.Pleasefillin')"></el-input>
<el-form-item label="家庭详细地址" prop="AddressDetail" class="_AddressDetail">
<el-input disabled v-model="item.AddressDetail" type="text" size=mini maxlength="200" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.authentication')" prop="IdentityType">
<el-form-item label="身份确认" prop="IdentityType">
<el-select disabled v-model="item.IdentityType" filterable size=mini class="w230" v-if="item.IdentityType==''">
<el-option
v-for="item in VisaIdentityTypeEnum"
......@@ -220,7 +220,7 @@
</el-select>
<el-input disabled v-else v-model="item.IdentityType" type="text" size=mini class="w230" maxlength="50"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.Exitrecord')" prop="HistoryRecord">
<el-form-item label="出境记录" prop="HistoryRecord">
<el-select disabled v-model="item.HistoryRecord" filterable size=mini class="w230" v-if="item.HistoryRecord==''">
<el-option
v-for="item in VisaDeparturesType"
......@@ -230,9 +230,9 @@
</el-option>
</el-select>
<el-input disabled v-else v-model="item.HistoryRecord" type="text" size=mini class="w230" maxlength="50" ></el-input>
<el-checkbox disabled v-model="item.IsRecommend" :true-label='1' :false-label='2'>{{$t('visaT.Recommend')}}</el-checkbox>
<el-checkbox disabled v-model="item.IsRecommend" :true-label='1' :false-label='2'>推荐</el-checkbox>
</el-form-item>
<el-form-item :label="$t('visaT.post')" prop="Duty">
<el-form-item label="职务" prop="Duty">
<el-select disabled v-model="item.Duty" filterable size=mini class="w230" v-if="item.Duty==''">
<el-option
v-for="item in VisaDutyTypeEnum"
......@@ -243,10 +243,10 @@
</el-select>
<el-input disabled v-else v-model="item.Duty" type="text" size=mini class="w230" maxlength="50" ></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_remark')">
<el-form-item label="备注">
<el-input disabled v-model="item.Remarks" type="textarea" size=mini class="w230" maxlength="1000"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.student')">
<el-form-item label="高校学生">
<el-checkbox disabled v-model="item.IsHightSchool" :true-label='1' :false-label='2'></el-checkbox>
</el-form-item>
</div>
......@@ -269,14 +269,14 @@
</div> -->
</div>
<div class="_trip_details" v-if="addMsg.TravelPlanList.length>0">
<P class="_tr_tit">{{$t('visaT.rbxcjh')}}（{{addMsg.TravelPlanList.length}}{{$t('hotel.hotel_day')}}）</P>
<P class="_tr_tit">日本行程计划（{{addMsg.TravelPlanList.length}}天）</P>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width=250>{{$t('pub.date')}}</th>
<th width=250>日期</th>
<!-- <th width=100>城市</th> -->
<th width=400>{{$t('Airticket.Air_Trip')}}</th>
<th width=400>{{$t('hotel.hotel')}}</th>
<th width=100>{{$t('hotel.table_operat')}}</th>
<th width=400>行程</th>
<th width=400>酒店</th>
<th width=100>操作</th>
</tr>
<template v-for="(trip,ti) in addMsg.TravelPlanList">
<tr v-if="showIindex!=ti">
......@@ -300,15 +300,15 @@
<el-input v-model="trip.HotelInfo" type="textarea" size=mini class="w230" ></el-input>
</td>
<td>
<input type="button" class="normalBtn" @click="showIindex=-1" :value="$t('pub.sureBtn')" />
<input type="button" class="normalBtn" @click="showIindex=-1"value="确定" />
</td>
</tr>
</template>
</table>
</div>
<div class="upBtnList">
<input type="button" class="normalBtn" @click="submitForm('addMsg')" :value="$t('pub.saveBtn')" />
<button class="hollowFixedBtn" @click="goUrl('visaList')">{{$t('pub.cancelBtn')}}</button>
<input type="button" class="normalBtn" @click="submitForm('addMsg')"value="保存" />
<button class="hollowFixedBtn" @click="goUrl('visaList')">取消</button>
</div>
</div>
</template>
......@@ -366,71 +366,71 @@ export default {
},
rules:{
OrderId:[
{ required: true, message: this.$t('visaT.qsrddh'), trigger: 'blur' },
{ pattern: /^[0-9]+$/, message: this.$t('visaT.qsrzqddh') }
{ required: true, message: '请输入订单号', trigger: 'blur' },
{ pattern: /^[0-9]+$/, message: "请输入正确的订单号" }
],
ApplyForType:[
{ required: true, message: this.$t('visaT.qxzqqlx'), trigger: 'change' }
{ required: true, message: '请选择申请类型', trigger: 'change' }
],
value6:[
{ required: true, message: this.$t('visaT.qxzcrjsj'), trigger: 'blur' }
{ required: true, message: '请选择出入境时间', trigger: 'blur' }
],
DepartAirport:[
{ required: true, message: this.$t('visaT.qxzqfjc'), trigger: 'change' }
{ required: true, message: '请选择起飞机场', trigger: 'change' }
],
EnterCountryPort:[
{ required: true, message: this.$t('visaT.qxzrjka'), trigger: 'change' }
{ required: true, message: '请选择入境口岸', trigger: 'change' }
],
EnterCountryFlight:[
{ required: true, message: this.$t('visaT.qxzrjhbh'), trigger: 'change' }
{ required: true, message: '请选择入境航班号', trigger: 'change' }
],
GetBackAirport:[
{ required: true, message: this.$t('visaT.qxzfhjc'), trigger: 'change' }
{ required: true, message: '请选择返回机场', trigger: 'change' }
],
LeaveCountryPort:[
{ required: true, message: this.$t('visaT.qxzcjka'), trigger: 'change' }
{ required: true, message: '请选择出境口岸', trigger: 'change' }
],
LeaveCountryFlight:[
{ required: true, message: this.$t('visaT.qxzcjhbh'), trigger: 'change' }
{ required: true, message: '请选择出境航班号', trigger: 'change' }
],
SurName:[
{ required: true, message: this.$t('visaT.qtxzwx'), trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5]{1,5}$/, message:this.$t('visaT.qsrzwx') }
{ required: true, message: '请填写中文姓', trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5]{1,5}$/, message: "请输入中文姓" }
],
Name:[
{ required: true, message: this.$t('visaT.qtxzwm'), trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5]{1,5}$/, message: this.$t('visaT.qsrzwx') }
{ required: true, message: '请填写中文名', trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5]{1,5}$/, message: "请输入中文姓" }
],
ESurName:[
{ required: true, message: this.$t('visaT.qtxywx'), trigger: 'blur' },
{ pattern: /^[a-zA-Z]/, message: this.$t('visaT.qsrywx') }
{ required: true, message: '请填写英文姓', trigger: 'blur' },
{ pattern: /^[a-zA-Z]/, message: "请输入英文姓" }
],
EName:[
{ required: true, message: this.$t('visaT.qtxywm'), trigger: 'blur' },
{ pattern: /^[a-zA-Z]/, message: this.$t('visaT.qsrywx') }
{ required: true, message: '请填写英文名', trigger: 'blur' },
{ pattern: /^[a-zA-Z]/, message: "请输入英文姓" }
],
Birthday:[
{ required: true, message: this.$t('visaT.qtxzcsrq'), trigger: 'blur' }
{ required: true, message: '请填选择出生日期', trigger: 'blur' }
],
Sex:[
{ required: true, message: this.$t('visaT.qtxzxb'), trigger: 'change' }
{ required: true, message: '请填选择性别', trigger: 'change' }
],
PassportNo:[
{ required: true, message: this.$t('visaT.ptxPassportNo'), trigger: 'blur' },
{pattern:/^[0-9a-zA-Z]+$/, message: this.$t('visaT.zqdhzh')}
{ required: true, message: '请填写护照号', trigger: 'blur' },
{pattern:/^[0-9a-zA-Z]+$/, message: "正确的护照号" }
],
PassportExpiry:[
{ required: true, message: this.$t('visaT.qxzhzgqr'), trigger: 'blur' }
{ required: true, message: '请选择护照过期日', trigger: 'blur' }
],
PassportAddress:[
{ required: true, message: this.$t('visaT.qtxqfd'), trigger: 'blur' }
{ required: true, message: '请填写签发地', trigger: 'blur' }
]
,
PassportAddress:[
{ required: true, message:this.$t('visaT.qtxqfd'), trigger: 'blur' }
{ required: true, message: '请填写签发地', trigger: 'blur' }
],
Nationality:[
{ required: true, message: this.$t('visaT.qxzgj'), trigger: 'change' }
{ required: true, message: '请选择国籍', trigger: 'change' }
],
// Address:[
// { required: true, message: '请填写家庭居住地', trigger: 'blur' }
......@@ -442,10 +442,10 @@ export default {
// { required: true, message: '请选择婚姻状态', trigger: 'change' }
// ],
HistoryRecord:[
{ required: true, message: this.$t('visaT.qxzcjjl'), trigger: 'change' }
{ required: true, message: '请选择出境记录', trigger: 'change' }
],
Duty:[
{ required: true, message: this.$t('visaT.qxzzw'), trigger: 'change' }
{ required: true, message: '请选择职务', trigger: 'change' }
],
},
VisaApplyForTypeEnum:[],
......@@ -680,9 +680,9 @@ export default {
}
};
result.forEach(x=>{
let str = x.replace(/-/, this.$t('pub.year'))
let strS = str.replace(/-/, this.$t('pub.month'))
let strSi = strS+this.$t('pub.day')
let str = x.replace(/-/, "年")
let strS = str.replace(/-/, "月")
let strSi = strS+'日'
// console.log(strSi)
let msg = {
VisaPlanId:_this.addMsg.Id,
......@@ -727,7 +727,7 @@ export default {
},
submitForm(addMsg) {
if(this.addMsg.PeopleList.length<1){
this.$message.error(this.$t('visaT.qtjsqr'))
this.$message.error('请添加申请人')
return
}
//提交创建、修改表单
......@@ -815,17 +815,17 @@ export default {
},
deleteThis(i){
this.$confirm(this.$t('visaT.ts'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('tips.cancelBtn'),
this.$confirm('是否删除?删除后已填写资料无法恢复！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.addMsg.PeopleList.splice(i,1)
this.$message.success(this.$t('tips.shanchuchenggong'));
this.$message.success('删除成功');
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('tips.cancleDelete')
message: '已取消删除'
});
});
},
......
src/components/VisaCenter/seeVisa.vue
View file @ 8d1adbdb
......@@ -37,16 +37,16 @@
<template>
<div class="page_seeVisa" v-loading="loading2" element-loading-text="下载中..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.1)">
<div class="_seeVisa_top">
<span class="_no">{{$t('visaT.sqbdh')}}:{{ID}}</span>
<span class="_download" @click="downLoad()" v-if="type==1">{{$t('visaT.xzsycl')}}</span>
<span class="_download" @click="ReturnCountry()" v-if="type==1">{{$t('visaT.xzggbg')}}</span>
<span class="_no">申请表编号:{{ID}}</span>
<span class="_download" @click="downLoad()" v-if="type==1">下载身元材料</span>
<span class="_download" @click="ReturnCountry()" v-if="type==1">下载归国报告</span>
</div>
<el-form :model="addMsg" ref="addMsg" :rules="rules" label-width="150px" class="_form clearfix">
<p class="btmTitle">{{$t('visaT.cxjihua')}}</p>
<p class="btmTitle">出行计划</p>
<!-- <el-form-item label="订单号" clearable prop="OrderId">
<el-input disabled v-model="addMsg.OrderId" type="text" size=mini class="w230"></el-input>
</el-form-item> -->
<el-form-item :label="$t('visaT.sqneirong')" clearable prop="ApplyForType">
<el-form-item label="申请类型" clearable prop="ApplyForType">
<el-select disabled v-model="addMsg.ApplyForType" size=mini class="w230">
<el-option
v-for="item in VisaApplyForTypeEnum"
......@@ -56,20 +56,20 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.crjtime')" prop="value6">
<el-form-item label="出入境时间" prop="value6">
<el-date-picker class="h34"
disabled
@change="timeAdd()"
v-model="addMsg.value6"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')"
:start-placeholder="$t('visaT.chujingtime')"
:end-placeholder="$t('visaT.rujingtime')">
range-separator="至"
start-placeholder="出境时间"
end-placeholder="入境时间">
</el-date-picker>
</el-form-item>
<div class="_flex">
<el-form-item :label="$t('visaT.cfAirport')" prop="DepartAirport">
<el-form-item label="出发机场" prop="DepartAirport">
<el-select disabled v-model="addMsg.DepartAirport" filterable size=mini class="w230" @change="getFilghtForAir(1)">
<el-option
v-for="item in ChinaAirportList"
......@@ -79,7 +79,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Portofentry')" prop="EnterCountryPort">
<el-form-item label="入境口岸" prop="EnterCountryPort">
<el-select disabled v-model="addMsg.EnterCountryPort" filterable size=mini class="w230" @change="getFilghtForAir(1)">
<el-option
v-for="item in JapanAirportList"
......@@ -89,7 +89,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Inboundflights')" prop="EnterCountryFlight">
<el-form-item label="入境航班" prop="EnterCountryFlight">
<el-select disabled v-model="addMsg.EnterCountryFlight" filterable size=mini class="w230">
<el-option
v-for="item in FilghtForAirIn"
......@@ -101,7 +101,7 @@
</el-form-item>
</div>
<div class="_flex">
<el-form-item :label="$t('visaT.fhjichang')" prop="GetBackAirport">
<el-form-item label="返回机场" prop="GetBackAirport">
<el-select disabled v-model="addMsg.GetBackAirport" filterable size=mini class="w230" @change="getFilghtForAir(2)">
<el-option
v-for="item in JapanAirportList"
......@@ -111,7 +111,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Exitport')" prop="LeaveCountryPort">
<el-form-item label="出境口岸" prop="LeaveCountryPort">
<el-select disabled v-model="addMsg.LeaveCountryPort" filterable size=mini class="w230" @change="getFilghtForAir(2)">
<el-option
v-for="item in ChinaAirportList"
......@@ -121,7 +121,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Outboundflight')" prop="LeaveCountryFlight">
<el-form-item label="出境航班" prop="LeaveCountryFlight">
<el-select disabled v-model="addMsg.LeaveCountryFlight" filterable size=mini class="w230">
<el-option
v-for="item in FilghtForAirOut"
......@@ -132,64 +132,64 @@
</el-select>
</el-form-item>
</div>
<el-form-item :label="$t('visaT.Orderremark')">
<el-form-item label="订单备注">
<el-input disabled v-model="addMsg.OrderRemarks" type="textarea" size=mini class="w400"></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_remark')">
<el-form-item label="备注">
<el-input disabled v-model="addMsg.Remarks" type="textarea" size=mini class="w400"></el-input>
</el-form-item>
</el-form>
<p class="btmTitle">{{$t('visaT.Applicantxx')}}({{$t('hotel.hotel_totalRoom')}}{{addMsg.PeopleList.length}}{{$t('hotel.hotel_people')}})</p>
<p class="btmTitle">申请人信息(共{{addMsg.PeopleList.length}}人)</p>
<div class="_scrollbar">
<div v-for="(item,index) in addMsg.PeopleList">
<el-form :model="item" ref="item" :rules="rules" label-width="160px" class="_Apply_item_form clearfix">
<div class="_Apply_item clearfix">
<p>{{$t('visaT.Applicantxx')}}{{index+1}} </p>
<el-form-item :label="$t('visaT.Chinesesurname')" prop="SurName">
<el-input disabled v-model="item.SurName" type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peChinese')"></el-input>
<p>申请人{{index+1}} </p>
<el-form-item label="中文姓" prop="SurName">
<el-input disabled v-model="item.SurName" type="text" size=mini class="w230" maxlength="20" placeholder="请输入中文"></el-input>
</el-form-item>
<el-form-item :label="$t('admin.admin_cnName')" prop="Name">
<el-input disabled v-model="item.Name" type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peChinese')"></el-input>
<el-form-item label="中文名" prop="Name">
<el-input disabled v-model="item.Name" type="text" size=mini class="w230" maxlength="20" placeholder="请输入中文"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_sex')" prop="Sex">
<el-form-item label="性别" prop="Sex">
<el-select disabled v-model="item.Sex" filterable size=mini class="w230">
<el-option key="1" :label="$t('visaT.boy')" value="1"> </el-option>
<el-option key="2" :label="$t('visaT.girl')" value="2"> </el-option>
<el-option key="1" label="男" value="1"> </el-option>
<el-option key="2" label="女" value="2"> </el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Englishsurname')" prop="ESurName">
<el-input disabled v-model="item.ESurName" type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peEnglish')"></el-input>
<el-form-item label="英文姓" prop="ESurName">
<el-input disabled v-model="item.ESurName" type="text" size=mini class="w230" maxlength="20" placeholder="请输入英文"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_ENname')" prop="EName">
<el-input disabled v-model="item.EName" type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peEnglish')"></el-input>
<el-form-item label="英文名" prop="EName">
<el-input disabled v-model="item.EName" type="text" size=mini class="w230" maxlength="20" placeholder="请输入英文"></el-input>
</el-form-item>
<el-form-item :label="$t('admin.admin_BirthDate')" prop="Birthday">
<el-form-item label="出生日期" prop="Birthday">
<el-date-picker
disabled
class="w230"
v-model="item.Birthday"
value-format="yyyy-MM-dd"
type="date"
:placeholder="$t('admin.admin_choDate')">
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('system.table_Passport')" prop="PassportNo">
<el-input disabled v-model="item.PassportNo" type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.ptxPassportNo')"></el-input>
<el-form-item label="护照号" prop="PassportNo">
<el-input disabled v-model="item.PassportNo" type="text" size=mini class="w230" maxlength="20" placeholder="请填写护照号"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.PassportNoadder')" prop="PassportAddress">
<el-input disabled v-model="item.PassportAddress" type="text" size=mini class="w230" maxlength="100" :placeholder="$t('visaT.Pleasefillin')"></el-input>
<el-form-item label="护照签发地" prop="PassportAddress">
<el-input disabled v-model="item.PassportAddress" type="text" size=mini class="w230" maxlength="100" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.PassportNogq')" prop="PassportExpiry">
<el-form-item label="护照过期日" prop="PassportExpiry">
<el-date-picker
disabled
class="w230"
v-model="item.PassportExpiry"
value-format="yyyy-MM-dd"
type="date"
:placeholder="$t('admin.admin_choDate')">
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('visaT.nationality')" prop="Nationality">
<el-form-item label="国籍" prop="Nationality">
<el-select disabled v-model="item.Nationality" filterable size=mini class="w230">
<el-option
v-for="item in countryList"
......@@ -199,7 +199,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visaT.Marriage')" prop="Marriage">
<el-form-item label="婚姻" prop="Marriage">
<el-select disabled v-model="item.Marriage" filterable size=mini class="w230">
<el-option
v-for="item in MarriageType"
......@@ -209,13 +209,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('visa.v_jtjzd')" prop="Address">
<el-input disabled v-model="item.Address" type="text" size=mini class="w230" maxlength="50" :placeholder="$t('visaT.fillprovince')"></el-input>
<el-form-item label="家庭居住地" prop="Address">
<el-input disabled v-model="item.Address" type="text" size=mini class="w230" maxlength="50" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.jtxxdz')" prop="AddressDetail" class="_AddressDetail">
<el-input disabled v-model="item.AddressDetail" type="text" size=mini maxlength="50" :placeholder="$t('visaT.Pleasefillin')"></el-input>
<el-form-item label="家庭详细地址" prop="AddressDetail" class="_AddressDetail">
<el-input disabled v-model="item.AddressDetail" type="text" size=mini maxlength="50" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.authentication')" prop="IdentityType">
<el-form-item label="身份确认" prop="IdentityType">
<el-select disabled v-model="item.IdentityType" filterable size=mini class="w230" v-if="item.IdentityType==''">
<el-option
v-for="item in VisaIdentityTypeEnum"
......@@ -226,7 +226,7 @@
</el-select>
<el-input disabled v-else v-model="item.IdentityType" type="text" size=mini class="w230" maxlength="50"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.Exitrecord')" prop="HistoryRecord">
<el-form-item label="出境记录" prop="HistoryRecord">
<el-select disabled v-model="item.HistoryRecord" filterable size=mini class="w230">
<el-option
v-for="item in VisaDeparturesType"
......@@ -237,7 +237,7 @@
</el-select>
<el-checkbox disabled="" v-model="item.IsRecommend" :true-label='1' :false-label='2'>推荐</el-checkbox>
</el-form-item>
<el-form-item :label="$t('visaT.post')" prop="Duty">
<el-form-item label="职务" prop="Duty">
<el-select disabled v-model="item.Duty" filterable size=mini class="w230" v-if="item.Duty==''">
<el-option
v-for="item in VisaDutyTypeEnum"
......@@ -248,10 +248,10 @@
</el-select>
<el-input disabled v-else v-model="item.Duty" type="text" size=mini class="w230" maxlength="50" ></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_remark')">
<el-form-item label="备注">
<el-input disabled v-model="item.Remarks" type="textarea" size=mini class="w230" maxlength="1000"></el-input>
</el-form-item>
<el-form-item :label="$t('visaT.student')">
<el-form-item label="高校学生">
<el-checkbox disabled="" v-model="item.IsHightSchool" :true-label='1' :false-label='2'></el-checkbox>
</el-form-item>
</div>
......@@ -273,13 +273,13 @@
</div> -->
</div>
<div class="_trip_details" v-if="addMsg.TravelPlanList.length>0">
<P class="_tr_tit">{{$t('visaT.rbxcjh')}}（{{addMsg.TravelPlanList.length}}{{$t('hotel.hotel_day')}}）</P>
<P class="_tr_tit">日本行程计划（{{addMsg.TravelPlanList.length}}天）</P>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width=250>{{$t('pub.date')}}</th>
<th width=250>日期</th>
<!-- <th width=100>城市</th> -->
<th width=400>{{$t('Airticket.Air_Trip')}}</th>
<th width=400>{{$t('hotel.hotel')}}</th>
<th width=400>行程</th>
<th width=400>酒店</th>
<!-- <th width=100>操作</th> -->
</tr>
<template v-for="(trip,ti) in addMsg.TravelPlanList">
......@@ -312,7 +312,7 @@
</div>
<div class="upBtnList">
<!-- <input type="button" class="normalBtn" @click="submitForm('addMsg')"value="保存" /> -->
<button class="hollowFixedBtn" @click="goUrl('visaComList')">{{$t('pub.cancelBtn')}}</button>
<button class="hollowFixedBtn" @click="goUrl('visaComList')">取消</button>
</div>
</div>
</template>
......@@ -368,71 +368,71 @@ export default {
},
rules:{
OrderId:[
{ required: true, message: this.$t('visaT.qsrddh'), trigger: 'blur' },
{ pattern: /^[0-9]+$/, message: this.$t('visaT.qsrzqddh') }
{ required: true, message: '请输入订单号', trigger: 'blur' },
{ pattern: /^[0-9]+$/, message: "请输入正确的订单号" }
],
ApplyForType:[
{ required: true, message: this.$t('visaT.qxzqqlx'), trigger: 'change' }
{ required: true, message: '请选择申请类型', trigger: 'change' }
],
value6:[
{ required: true, message: this.$t('visaT.qxzcrjsj'), trigger: 'blur' }
{ required: true, message: '请选择出入境时间', trigger: 'blur' }
],
DepartAirport:[
{ required: true, message: this.$t('visaT.qxzqfjc'), trigger: 'change' }
{ required: true, message: '请选择起飞机场', trigger: 'change' }
],
EnterCountryPort:[
{ required: true, message: this.$t('visaT.qxzrjka'), trigger: 'change' }
{ required: true, message: '请选择入境口岸', trigger: 'change' }
],
EnterCountryFlight:[
{ required: true, message: this.$t('visaT.qxzrjhbh'), trigger: 'change' }
{ required: true, message: '请选择入境航班号', trigger: 'change' }
],
GetBackAirport:[
{ required: true, message: this.$t('visaT.qxzfhjc'), trigger: 'change' }
{ required: true, message: '请选择返回机场', trigger: 'change' }
],
LeaveCountryPort:[
{ required: true, message: this.$t('visaT.qxzcjka'), trigger: 'change' }
{ required: true, message: '请选择出境口岸', trigger: 'change' }
],
LeaveCountryFlight:[
{ required: true, message: this.$t('visaT.qxzcjhbh'), trigger: 'change' }
{ required: true, message: '请选择出境航班号', trigger: 'change' }
],
SurName:[
{ required: true, message: this.$t('visaT.qtxzwx'), trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5]{1,5}$/, message:this.$t('visaT.qsrzwx') }
{ required: true, message: '请填写中文姓', trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5]{1,5}$/, message: "请输入中文姓" }
],
Name:[
{ required: true, message: this.$t('visaT.qtxzwm'), trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5]{1,5}$/, message: this.$t('visaT.qsrzwx') }
{ required: true, message: '请填写中文名', trigger: 'blur' },
{ pattern: /^[\u4E00-\u9FA5]{1,5}$/, message: "请输入中文姓" }
],
ESurName:[
{ required: true, message: this.$t('visaT.qtxywx'), trigger: 'blur' },
{ pattern: /^[a-zA-Z]/, message: this.$t('visaT.qsrywx') }
{ required: true, message: '请填写英文姓', trigger: 'blur' },
{ pattern: /^[a-zA-Z]/, message: "请输入英文姓" }
],
EName:[
{ required: true, message: this.$t('visaT.qtxywm'), trigger: 'blur' },
{ pattern: /^[a-zA-Z]/, message: this.$t('visaT.qsrywx') }
{ required: true, message: '请填写英文名', trigger: 'blur' },
{ pattern: /^[a-zA-Z]/, message: "请输入英文姓" }
],
Birthday:[
{ required: true, message: this.$t('visaT.qtxzcsrq'), trigger: 'blur' }
{ required: true, message: '请填选择出生日期', trigger: 'blur' }
],
Sex:[
{ required: true, message: this.$t('visaT.qtxzxb'), trigger: 'change' }
{ required: true, message: '请填选择性别', trigger: 'change' }
],
PassportNo:[
{ required: true, message: this.$t('visaT.ptxPassportNo'), trigger: 'blur' },
{pattern:/^[0-9a-zA-Z]+$/, message: this.$t('visaT.zqdhzh')}
{ required: true, message: '请填写护照号', trigger: 'blur' },
{pattern:/^[0-9a-zA-Z]+$/, message: "正确的护照号" }
],
PassportExpiry:[
{ required: true, message: this.$t('visaT.qxzhzgqr'), trigger: 'blur' }
{ required: true, message: '请选择护照过期日', trigger: 'blur' }
],
PassportAddress:[
{ required: true, message: this.$t('visaT.qtxqfd'), trigger: 'blur' }
{ required: true, message: '请填写签发地', trigger: 'blur' }
]
,
PassportAddress:[
{ required: true, message:this.$t('visaT.qtxqfd'), trigger: 'blur' }
{ required: true, message: '请填写签发地', trigger: 'blur' }
],
Nationality:[
{ required: true, message: this.$t('visaT.qxzgj'), trigger: 'change' }
{ required: true, message: '请选择国籍', trigger: 'change' }
],
// Address:[
// { required: true, message: '请填写家庭居住地', trigger: 'blur' }
......@@ -444,10 +444,10 @@ export default {
// { required: true, message: '请选择婚姻状态', trigger: 'change' }
// ],
HistoryRecord:[
{ required: true, message: this.$t('visaT.qxzcjjl'), trigger: 'change' }
{ required: true, message: '请选择出境记录', trigger: 'change' }
],
Duty:[
{ required: true, message: this.$t('visaT.qxzzw'), trigger: 'change' }
{ required: true, message: '请选择职务', trigger: 'change' }
],
},
VisaApplyForTypeEnum:[],
......@@ -507,7 +507,7 @@ export default {
link.href = _loadUrl+res.data.data
document.body.appendChild(link);
link.click();
this.$message.success(this.$t('visaT.dccg'))
this.$message.success('导出成功！')
this.loading2 = false
}else{
this.loading2 = false
......@@ -525,7 +525,7 @@ export default {
link.href = _loadUrl+res.data.data
document.body.appendChild(link);
link.click();
this.$message.success(this.$t('visaT.dccg'))
this.$message.success('导出成功！')
this.loading2 = false
}else{
this.loading2 = false
......@@ -743,17 +743,17 @@ export default {
}
},
deleteThis(i){
this.$confirm(this.$t('visaT.ts'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('tips.cancelBtn'),
this.$confirm('是否删除?删除后已填写资料无法恢复！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.addMsg.PeopleList.splice(i,1)
this.$message.success(this.$t('tips.shanchuchenggong'));
this.$message.success('删除成功');
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('tips.cancleDelete')
message: '已取消删除'
});
});
},
......
src/components/administrative/departmentManagement.vue
View file @ 8d1adbdb
......@@ -226,20 +226,20 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_xueli')" prop="EmEducation">
<el-form-item :label="$t('adm.adm_xueli')" prop="EmEducation">
<el-input maxlength='20' type="text" v-model="addMsg1.EmEducation"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_Entrytime')" prop="EmEntry">
<el-form-item label="入职时间" prop="EmEntry">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmEntry' type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="6">
<el-form-item :label="$t('admin.admin_Departuretime')" prop="EmLeave">
<el-form-item label="离职时间" prop="EmLeave">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmLeave' type="date"
disabled></el-date-picker>
</el-form-item>
......@@ -269,7 +269,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_Birthday')" prop="EmBirthday">
<el-form-item label="生日" prop="EmBirthday">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmBirthday' type="date"></el-date-picker>
</el-form-item>
</el-col>
......@@ -279,7 +279,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_password')" prop="EmPassword">
<el-form-item label="密码" prop="EmPassword">
<el-input type="password" v-model="addMsg1.EmPassword" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
......@@ -287,8 +287,8 @@
<el-row :gutter="10">
<el-col :span="24">
<input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn"
@click="resetForm('addMsg1'),treeLayerShowUser=false" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')" />
@click="resetForm('addMsg1'),treeLayerShowUser=false"></input>
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')"></input>
<button v-if='isleaveBtn' class="normalBtn" @click="setIsLeave(leaveId)">{{leaveBtn}}</button>
</el-col>
</el-row>
......@@ -346,19 +346,19 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_departsort')" prop="Sort">
<el-form-item label="部门排序" prop="Sort">
<el-input type="text" v-model="addMsg.Sort" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_isleader')" prop="IsLeader">
<el-form-item label='是否领队' prop="IsLeader">
<el-switch v-model="addMsg.IsLeader" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<el-form-item :label="$t('admin.admin_Bindingposition')" prop="PostIdArr">
<el-form-item label="绑定岗位" prop="PostIdArr">
<el-select filterable class='w400 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">
......@@ -388,14 +388,14 @@
<th>{{$t('admin.admin_departmentLevel')}}</th>
<th>{{$t('admin.admin_leader')}}</th>
<th>{{$t('admin.admin_dphone')}}</th>
<th width="300">{{$t('admin.admin_Bindingposition')}}</th>
<th>{{$t('admin.admin_sort')}}</th>
<th width="300">绑定岗位</th>
<th>排序</th>
<th>{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item,index) in DataList">
<td>{{item.RB_Branch_Name}}</td>
<td>{{item.DepartmentName}}</td>
<td>{{item.Tier}}{{$t('admin.admin_level')}}</td>
<td>{{item.Tier}}级</td>
<td>{{item.DepartmentManagerName}}</td>
<td>{{item.DepartmentTel}}</td>
<td>{{item.PostName}}</td>
......
src/components/busManagement/BusInfo.vue
View file @ 8d1adbdb
......@@ -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 @ 8d1adbdb
......@@ -220,7 +220,6 @@
this.apipost('dmcstatistics_get_SetTicketOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
}
......
src/plug/index.js
View file @ 8d1adbdb
......@@ -119,8 +119,6 @@ export default {
let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.65:8025"; //214主域名
domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.0.119:8082";
// domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......
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