Skip to content

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

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

parents 97428af3 729420b7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1621 additions and 1337 deletions
src/assets/common/lang/zh.js
View file @ a793286d
......@@ -29,6 +29,7 @@ export const pub={
room:'房数',
year:'年',
month:'月',
day:'日',
yearMonth:'年月',
addImg:'添加图片',
confirmCancel:'确认取消',
......@@ -37,9 +38,6 @@ export const pub={
returnBack:'返回',
allday:'全天',
clickToView:'点击查看',
man:'男',
woman:'女',
}
export const login = {
......@@ -911,7 +909,6 @@ export const fnc = {
jigou: '机构',
qsrneirong: '请输入内容',
zhanghuleixing: '账户类型',
zhfenlei: '账户分类',
yueacc: '余额',
bwbyue: '本位币余额',
caozuoriqi: '操作日期',
......@@ -958,12 +955,7 @@ export const fnc = {
tjzhanghu: '添加账户',
sfduigong: '是否对公',
sybumen: '适用部门：',
shanghuhao: '商户号',
qqdizhi: '请求地址',
zfxinxi: '支付信息',
shsiyao: '商户私钥',
ptgongyao: '平台公钥',
banbenhao: '版本号',
}
export const tips = {
tips: '提示',
......@@ -1013,8 +1005,6 @@ export const tips = {
znengExcel: '只能上传Excel文件，重复的费用类型不会添加哦',
shangchuanExcel: '上传文件只能是 excel 格式!',
feiyongleixing: '费用类型？',
qxzzhleixing: '请选择账户类型!',
dzfpzxxdelete: '的支付信息配置?删除后不可撤回！',
}
export const Operation = {
Op_ShortName:'线路简称',
......@@ -1091,40 +1081,71 @@ export const rule = {
qxzlxcengji: '请选择类型层级',
qtxzhmingcheng: '请填写账户名称',
qxzsybumen: '请选择适用部门',
qsrshuhao: '请输入商户号',
qsrshsyao: '请输入商户私钥',
qsrptsiyao: '请输入平台公钥',
qsrqqdizhi: '请输入请求地址',
qsrbbenhao: '请输入版本号',
qxzssgongsi: '请选择所属公司',
qxzshleixing: '请选择账户类型',
qxzzhfenlei: '请选择账户分类',
qxzzhanghu: '请选择账户',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
qsrbdgangwei:"请选择绑定岗位",
qsrzqdbmdianhua:"请输入正确的部门电话",
qszhengshu:"请输整数",
qsrname:"请输入姓名",
qsrtelphone:"请输入正确的手机",
qsrIdnum:"请输正确的身份证号",
}
export const adm={
adm_xzbumen:"新增部门",
adm_sxjg:"树形结构",
adm_fhlb:"返回列表",
adm_jggl:"结构管理",
adm_addzibumen:"添加子部门",
adm_addbumen:"添加部门",
adm_addyuangong:"添加员工",
adm_edityuangong:"员工修改",
adm_xueli:"学历",
adm_rzshijain:"入职时间",
export const visaT = {
cxjihua: '出行计划',
sqneirong:'申请类型',
crjtime:'出入境时间',
cfAirport:'出发机场',
chujingtime:'出境时间',
rujingtime:'入境时间',
Portofentry:'入境口岸',
Inboundflights:'入境航班',
fhjichang:'返回机场',
Exitport:'出境口岸',
Outboundflight:'出境航班',
Orderremark:'订单备注',
Applicantxx:'申请人信息',
Applicant:'申请人',
Chinesesurname:'中文姓',
peChinese:'请输入中文',
boy:'男',
girl:'女',
Englishsurname:'英文姓',
peEnglish:'请输入英文',
ptxPassportNo:'请填写护照号',
PassportNoadder:'护照签发地',
Pleasefillin:'请填写',
PassportNogq:'护照过期日',
nationality:'国籍',
Marriage:'婚姻',
fillprovince:'请填写省',
jtxxdz:'家庭详细地址',
authentication:'身份确认',
Exitrecord:'出境记录',
post:'职务',
Recommend:'推荐',
student:'高校学生',
rbxcjh:'日本行程计划',
qsrddh:'请输入订单号',
qsrzqddh:'请输入正确的订单号',
qxzqqlx:'请选择申请类型',
qxzcrjsj:'请选择出入境时间',
qxzqfjc:'请选择起飞机场',
qxzrjka:'请选择入境口岸',
qxzrjhbh:'请选择入境航班号',
qxzfhjc:'请选择返回机场',
qxzcjka:'请选择出境口岸',
qxzcjhbh:'请选择出境航班号',
qtxywx:'请填写英文姓',
qsrywx:'请输入中文姓',
qtxywm:'请填写英文名',
qtxzcsrq:'请填选择出生日期',
qtxzxb:'请填选择性别',
zqdhzh:'正确的护照号',
qxzhzgqr:'请选择护照过期日',
qtxqfd:'请填写签发地',
qxzgj:'请选择国籍',
qxzcjjl:'请选择出境记录',
qxzzw:'请选择职务',
qtjsqr:'请添加申请人',
ts:'是否删除?删除后已填写资料无法恢复！',
sqbdh:'申请表编号',
xzsycl:'下载身元材料',
xzggbg:'下载归国报告',
dccg:'导出成功！'
}
\ No newline at end of file
src/components/FinancialModule/CapitalAllocation.vue
View file @ a793286d
......@@ -53,6 +53,7 @@
<li>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/>
</li>
</ul>
</div>
......@@ -199,6 +200,16 @@
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
</div>
</div>
</template>
......@@ -209,7 +220,7 @@ export default {
msg: {
pageIndex: 1,
pageSize: 15,
FrID: '',
FrID: '0',
UpdateBy: '-1',
RB_Branch_Id: -1,
RB_Depart_Id: -2,
......@@ -218,6 +229,7 @@ export default {
Status: '-1',
sTradeDate: '',
eTradeDate: '',
EmployeeId:0
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
......@@ -265,7 +277,8 @@ export default {
this.loading= true
this.apipost('Financial_get_GetFundTransferPageList', this.msg, res=>{
if (res.data.resultCode===1){
this.dataList = res.data.data.pageData
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.$message.error(res.data.message)
}
......@@ -275,6 +288,23 @@ export default {
this.loading= false
}, null)
},
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
this.currentPage = 1;
},
//导出
method5: function() {
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
this.msg.EmployeeId=this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,"资金调拨报表.xls");} ,
getCompanyList: function () { //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
......
src/components/FinancialModule/ChoiceAddFinancialDocuments.vue
View file @ a793286d
......@@ -42,28 +42,28 @@
<div>
<div class="w350 form_box" v-if="!R && !F">
<el-form label-width="110px" :model="ruleForm" :rules="rules" ref="ruleForm">
<el-form-item label="费用方向" prop="Type">
<el-form-item :label="$t('fnc.feiyongfangxiang')" prop="Type">
<el-radio-group v-model="ruleForm.Type" @change="Financial_post_GetCostTypeList(0)" :disabled="!!payType">
<el-radio :label="1">收入</el-radio>
<el-radio :label="2">支出</el-radio>
<el-radio :label="1">{{$t('restaurant.res_income')}}</el-radio>
<el-radio :label="2">{{$t('restaurant.res_outcome')}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否与团相关" prop="Is_TCID">
<el-form-item :label="$t('fnc.sfytxiangguan')" prop="Is_TCID">
<el-radio-group v-model="ruleForm.Is_TCID" :disabled="!!(this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length)">
<el-radio :label="1">是&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
<el-radio :label="0">否&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
<el-radio :label="1">{{$t('fnc.yes')}}&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
<el-radio :label="0">{{$t('fnc.fou')}}&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
</el-radio-group>
</el-form-item>
<template v-for="(item, index) in TCIDAndTCNUMList" >
<el-form-item label="团号" v-if="ruleForm.Is_TCID===1" class="TCIDAndTCNUMList_item" >
<el-form-item :label="$t('visa.v_tuanhao')" v-if="ruleForm.Is_TCID===1" class="TCIDAndTCNUMList_item" >
<el-input v-model="item.TCID" class="w240"></el-input>
<span class="_add_small_btn"><span class="_add_trip _add_small" @click="addTCID">+</span> <span class="_add_trip _add_small _delete_trip" :style="{opacity: index === 0 ? '0' : '1'}" @click="deleteTCID(index)">+</span></span>
</el-form-item>
</template>
<el-form-item label="订单号" v-if="ruleForm.Is_TCID===1" >
<el-form-item :label="$t('hotel.order_Number')" v-if="ruleForm.Is_TCID===1" >
<el-input v-model="ruleForm.OrderID" class="w240"></el-input>
</el-form-item>
<el-form-item label="所属公司" prop="RB_Branch_Id" >
<el-form-item: label="$t('fnc.ssuogongsi')" prop="RB_Branch_Id" >
<el-select filterable v-model='ruleForm.RB_Branch_Id' class="w240">
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -73,14 +73,14 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="费用类型" prop="CostTypeID" >
<el-select v-model="ruleForm.CostTypeID" placeholder="请选择费用类型" filterable class="w240">
<el-form-item :label="$t('fnc.feiyongleixing')" prop="CostTypeID" >
<el-select v-model="ruleForm.CostTypeID" :placeholder="$t('rule.qxzfyleixing')" filterable class="w240">
<el-option v-for="item in GetCostTypeList" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<div style="display: inline-block;line-height: 30px" class="normalBtn" @click="submitForm('ruleForm')">确定</div>
<div style="display: inline-block;line-height: 30px" class="hollowFixedBtn" @click="resetForm('ruleForm')">取消</div>
<div style="display: inline-block;line-height: 30px" class="normalBtn" @click="submitForm('ruleForm')">{{$t('pub.sureBtn')}}</div>
<div style="display: inline-block;line-height: 30px" class="hollowFixedBtn" @click="resetForm('ruleForm')">{{$t('pub.cancelBtn')}}</div>
</el-form-item>
</el-form>
</div>
......@@ -139,16 +139,16 @@ export default {
{ required: true }
],
TCID: [
{ required: true, message: '请输入团号', trigger: 'blur' }
{ required: true, message: this.$t('visa.v_shurutuanhao'), trigger: 'blur' }
],
OrderID: [
{ required: true, message: '请输入订单号', trigger: 'blur' }
{ required: true, message: this.$t('rule.qsrdingdanhao'), trigger: 'blur' }
],
CostTypeID: [
{ required: true, message: '请选择费用类型', trigger: 'change' }
{ required: true, message: this.$t('rule.qxzfyleixing'), trigger: 'change' }
],
RB_Branch_Id: [
{ required: true, message: '请选择所属公司', trigger: 'change' }
{ required: true, message: this.$t('rule.qszssgongsi'), trigger: 'change' }
],
},
payType: null,
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ a793286d
......@@ -22,12 +22,12 @@
<template>
<div>
<ul class="_nav clearfix" v-if="showTab==0">
<li :class="active==1?'_active':''" @click="active=1,tabData(1)">收款单</li>
<li :class="active==2?'_active':''" @click="active=2,tabData(2)">付款单</li>
<li :class="active==1?'_active':''" @click="active=1,tabData(1)">{{$t('fnc.shoukuandan')}}</li>
<li :class="active==2?'_active':''" @click="active=2,tabData(2)">{{$t('fnc.fukuandan')}}</li>
</ul>
<ul class="_nav clearfix" v-else>
<li :class="active==1?'_active':''" v-if="showTab==1">收款单</li>
<li :class="active==2?'_active':''" v-if="showTab==2">付款单</li>
<li :class="active==1?'_active':''" v-if="showTab==1">{{$t('fnc.shoukuandan')}}</li>
<li :class="active==2?'_active':''" v-if="showTab==2">{{$t('fnc.fukuandan')}}</li>
</ul>
<ul class="_conten">
<li v-for="(item,index) in GetList">
......@@ -39,22 +39,22 @@
</div>
</div>
<div class="_right">
<el-tooltip popper-class="item _process" effect="dark" content="流程" placement="top">
<el-tooltip popper-class="item _process" effect="dark" :content="$t('fnc.liucheng')" placement="top">
<el-popover
popper-class="detailsIT_Journal"
width="580"
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">收款流程</p>
<p class="_log_t">{{$t('fnc.skliucheng')}}</p>
<my-FlowChartModule :data="AuditListData"></my-FlowChartModule>
</div>
</div>
<i slot="reference" class="iconfont icon-liucheng" @click="getFlowChart(item.Id)"></i>
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="新增" placement="top">
<i class="edit el-icon-circle-plus-outline" @click="goUrl('addFinancialDocuments',item.Id,item.Name+'单',item.Type,item.IsUploadPic)"></i>
<el-tooltip class="item" effect="dark" :content="$t('pub.addBtn')" placement="top">
<i class="edit el-icon-circle-plus-outline" @click="goUrl('addFinancialDocuments',item.Id,item.Name+$t('visa.v_dan'),item.Type,item.IsUploadPic)"></i>
</el-tooltip>
</div>
</li>
......@@ -97,7 +97,7 @@
if(res.data.resultCode==1){
this.lastID = id
res.data.data.forEach(y=>{
y.contentTips = y.AuditDescription+(y.AuditWay=="2"?'（会签）':'（或签）')
y.contentTips = y.AuditDescription+(y.AuditWay=="2"? this.$t('fnc.huiqian') : this.$t('fnc.huoqian'))
});
this.AuditListData.AuditList = res.data.data
}else{}
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ a793286d
......@@ -544,7 +544,7 @@
<th>当前状态</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr class="_item_list" v-for="(item,index) in DataList">
<tr class="_item_list" v-for="(item,index) in DataList">
<td v-if="checkboxShow"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td>
<td>{{item.BranchName}}</td>
<td class="Bill_par">
......@@ -607,7 +607,7 @@
<td>
<template v-for="(s,si) in item.CostTypeList">
<span class="_tag_span">{{s}}</span><br/>
</template>
</template>
</td>
<td class="_number">
<template v-if="item.TradeWayList&&item.TradeWayList.length>0">
......@@ -1360,7 +1360,7 @@ export default {
pageSize:6,
FrID:this.msg.FrID==0?'':this.msg.FrID,
sDate:this.msg.sDate,
eDate:this.msg.sDate,
eDate:this.msg.eDate,
Status:this.msg.Status,
TemplateId:this.msg.TemplateId,
RB_Branch_Id:this.msg.RB_Branch_Id,
......
src/components/FinancialModule/FinancialSubmodule/CashierBillModule.vue
View file @ a793286d
......@@ -25,30 +25,30 @@
<div class="Receipt_box" :class="GetDetail.Type==1?'':'color_blur'" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
<p class="rb_tit">{{GetDetail.CompanyName}}（{{GetDetail.BranchName}}）</p>
<p class="rb_stit">
<span>{{GetDetail.Type==1?'出纳收款单':'出纳付款单'}}</span>
<span>{{GetDetail.Type==1?$t('fnc.cnskuandan'):$t('fnc.cnfkuandan')}}</span>
</p>
<div class="rb_top_row _r_mb5">
<p v-if="GetDetail.Type==1">汇款人(单位)：<span class="_r_name">{{GetDetail.RemitterName}}</span></p>
<p v-if="GetDetail.Type==2">付款对象：<span class="_r_name">{{GetDetail.AccountHolder}}</span></p>
<p style="display:none"><span class="_r_bold">No.</span>{{GetDetail.FrID}}-附属出纳联</p>
<p v-if="GetDetail.Type==1">{{$t('fnc.hnrdanwei')}}：<span class="_r_name">{{GetDetail.RemitterName}}</span></p>
<p v-if="GetDetail.Type==2">{{$t('fnc.fkduixiang')}}：<span class="_r_name">{{GetDetail.AccountHolder}}</span></p>
<p style="display:none"><span class="_r_bold">No.</span>{{GetDetail.FrID}}-{{$t('fnc.cnfshulian')}}</p>
</div>
<div class="rb_top_row _r_mb5">
<p v-if="GetDetail.Type==1">付款账户(流水号)：<span class="_r_name">{{GetDetail.AccountNumber}} （{{GetDetail.CreateDate}}）</span></p>
<p v-if="GetDetail.Type==2">付款账户：<span class="_r_name">{{GetDetail.AccountNumber}}（{{GetDetail.CreateDate}}）</span></p>
<p><span class="_r_bold">No.</span>{{GetDetail.FrID}}-附属出纳联</p>
<p v-if="GetDetail.Type==1">{{$t('fnc.fkzhlshuihao')}}：<span class="_r_name">{{GetDetail.AccountNumber}} （{{GetDetail.CreateDate}}）</span></p>
<p v-if="GetDetail.Type==2">{{$t('fnc.fkzhanghu')}}<span class="_r_name">{{GetDetail.AccountNumber}}（{{GetDetail.CreateDate}}）</span></p>
<p><span class="_r_bold">No.</span>{{GetDetail.FrID}}-{{$t('fnc.cnfshulian')}}</p>
</div>
<table class="Receipt_table" border="1" :bordercolor="GetDetail.Type==1?'#c94052':'#106BAF'" style="border-collapse:collapse;">
<tr>
<th rowspan="2">付款方式</th>
<th rowspan="2">币种</th>
<th rowspan="2">账户类型</th>
<th colspan="3">金额</th>
<th rowspan="2" width="180">备注</th>
<th rowspan="2">{{$t('fnc.fkfangshi')}}</th>
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th rowspan="2">{{$t('fnc.zhanghuleixing')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2" width="180">{{$t('hotel.hotel_remark')}}</th>
</tr>
<tr>
<th width="88">原币</th>
<th width="50">汇率</th>
<th width="88">本位币</th>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="88">{{$t('fnc.bweibi')}}</th>
</tr>
<tr v-for="(item,index) in GetDetail.CashierDetail">
<td height="26px">{{item.Alias+item.BankNo}}</td>
......@@ -92,9 +92,9 @@
<td height="26px"></td>
</tr>
<tr>
<td>{{GetDetail.Type==1?'收款金额':'付款金额'}}<br/><span class="_font_size12">（大写）</span></td>
<td colspan="2">{{cnAllMoney==''?'零':cnAllMoney}}</td>
<td colspan="1">{{GetDetail.Type==1?'收款金额':'付款金额'}}<br/><span class="_font_size12">（小写）</span></td>
<td>{{GetDetail.Type==1?$t('fnc.skjine'):$t('fnc.fkjine')}}<br/><span class="_font_size12">{{$t('fnc.daxie')}}</span></td>
<td colspan="2">{{cnAllMoney==''?$t('fnc.ling'):cnAllMoney}}</td>
<td colspan="1">{{GetDetail.Type==1?$t('fnc.skjine'):$t('fnc.fkjine')}}<br/><span class="_font_size12">{{$t('fnc.xiaoxie')}}</span></td>
<td colspan="3">{{allMoney}}</td>
</tr>
</table>
......
src/components/FinancialModule/FinancialSubmodule/FlowChartModule.vue
View file @ a793286d
......@@ -46,7 +46,7 @@
<div class="_liu_block clearfix" :class="[Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'fl text_l ':'fr text_r ']">
<span class="_array _array_h" :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0?'_array_h_left ':''" v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0&&li!=dataList.AuditList.length-1"><span class="iconfont icon-xiaotuziCduan_2"></span></span>
<el-tooltip class="dataList" effect="dark" :content="lc.contentTips" placement="top">
<span :class="lc.AuditType==3?'_bg_org':'_bg_blue'" class="_miaoshu ">{{lc.AuditDescription}} <span v-if="lc.AuditWay!=1">({{lc.AuditWay=="2"?'会签':'或签'}})</span></span>
<span :class="lc.AuditType==3?'_bg_org':'_bg_blue'" class="_miaoshu ">{{lc.AuditDescription}} <span v-if="lc.AuditWay!=1">({{lc.AuditWay=="2"?$t('fnc.huiqian'):$t('fnc.huoqian')}})</span></span>
</el-tooltip>
<span v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0&&li!=dataList.AuditList.length-1" :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'_array_h_right ':''" class="_array _array_h"><span class="iconfont icon-xiaotuziCduan_"></span></span>
<div class="_array_h_dbox" v-if="li!=dataList.AuditList.length-1" :class="Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'':'_array_h_dbox_l'">
......
src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue
View file @ a793286d
......@@ -131,21 +131,21 @@
<!--</div>-->
<table class="Receipt_table" border="1" :class="[GetDetail.Type==1?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1?'#c94052':'#106BAF'" style="border-collapse:collapse;">
<tr>
<th rowspan="2">所属公司</th>
<th rowspan="2">团号</th>
<th rowspan="2">单号</th>
<th rowspan="2">费 用 说 明</th>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('visa.v_tuanhao')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
<!--<th rowspan="2">数量</th>-->
<!--<th rowspan="2">单 价</th>-->
<th rowspan="2">币种</th>
<th colspan="3">金额</th>
<th rowspan="2">备注</th>
<th rowspan="2">制单人</th>
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th rowspan="2">{{$t('fnc.zhidanren')}}</th>
</tr>
<tr>
<th width="88">原币</th>
<th width="50">汇率</th>
<th width="88">本位币</th>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="88">{{$t('fnc.bweibi')}}</th>
</tr>
<template v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length">
<tr v-for="(item) in GetDetail.MergeDetailList" class="_color_b">
......@@ -211,31 +211,31 @@
</tr>
<!--v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0"-->
<tr v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0">
<td height="34px" class="">交易方式</td>
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="9" class="_color_b">
<template v-for="(item,index) in GetDetail.MergeBankList">
<p class="_fex_cen clearfix"><span class="_bold">{{item.Alias}}-</span><span class="_bank_name">{{item.TypeName}}-</span><span class="_bank_type" :class="item.AccountType=='对私'?'':'_bank_type2'">{{item.AccountType==""?'无':item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span></p>
<p class="_fex_cen clearfix"><span class="_bold">{{item.Alias}}-</span><span class="_bank_name">{{item.TypeName}}-</span><span class="_bank_type" :class="item.AccountType=='对私'?'':'_bank_type2'">{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span></p>
</template>
</td>
</tr>
<tr v-if="GetDetail.Merge">
<td height="34px" class="">外币总金额<span class="_font_size12"></span></td>
<td height="34px" colspan="3" class="_color_b">{{GetDetail.Merge.WBMoney==''?'零':GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
<td height="34px" class="">本位币总金额<span class="_font_size12"></span></td>
<td height="34px" colspan="5" class="_color_b">{{GetDetail.Merge.Money==''?'零':GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
<td height="34px" class="">{{$t('fnc.wbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="3" class="_color_b">{{GetDetail.Merge.WBMoney==''?$t('fnc.ling'):GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
<td height="34px" class="">{{$t('fnc.bwbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="5" class="_color_b">{{GetDetail.Merge.Money==''?$t('fnc.ling'):GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
</tr>
<tr class="_huik_info" v-if="GetDetail.Type==1&&GetDetail.Merge">
<td height="34px" class="">汇款人</td>
<td height="34px" class="">{{$t('fnc.huikuanren')}}</td>
<td height="34px" colspan="3">
<span class="_color_b _font_size12">{{GetDetail.Merge.RemitterNameV2}}</span>
</td>
<td height="34px" class="">汇款时间</td>
<td height="34px" class="">{{$t('fnc.hkshijian')}}</td>
<td height="34px" colspan="5">
<span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
</td>
</tr>
<tr class="_huik_info" v-else-if="GetDetail.Type!=1&&GetDetail.Merge">
<td height="34px" class="">交易日期</td>
<td height="34px" class="">{{$t('fnc.jiaoyiriqi')}}</td>
<td height="34px" colspan="9">
<span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
</td>
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ a793286d
......@@ -903,6 +903,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YouHui",
formatter: this.moneyFormat,
title: "优惠",
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "DaiShou",
formatter: this.moneyFormat,
......@@ -1002,6 +1012,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "BaoXian",
title: "保险费",
formatter: this.moneyFormat,
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "QiTa",
formatter: this.moneyFormat,
......@@ -1494,6 +1514,7 @@ export default {
"实收金额",
"退款",
"平台税金",
"优惠金额",
"待收金额",
"溢收金额",
"人数",
......
src/components/Hotel/roomReservationsDetails.vue
View file @ a793286d
......@@ -104,6 +104,12 @@
</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>
</td>
<td>
<div class="w80">
......@@ -213,6 +219,8 @@
CreateByAccount: '',
//创建人姓名
CreateByName: '',
//点击项
ClickItem: {},
}
},
methods: {
......@@ -265,11 +273,15 @@
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
this.list.forEach(item => {
this.calculationPrice(item)
this.calculationPrice(item);
item.hotelList.push({
Name: item.NewHotelName,
ID: item.NewHotelId
})
item.ContractUrlArray = [];
if (item.ContractUrl && item.ContractUrl != '') {
item.ContractUrlArray = item.ContractUrl.split(',');
}
item.PayStyle = item.PayStyle.toString()
item.OrderDetailsList.forEach((x, index1) => {
if (x.HouseTypeCount <= 0) {
......@@ -281,22 +293,23 @@
x.UnitPrice = x.UnitPrice.toString();
x.HotelDiscount = x.HotelDiscount.toString();
})
if(item.ReserveNo==''||item.ReserveNo==null){
item.ReserveNo = this.$route.query.NewCombinationNum;
}
if (item.ReserveNo == '' || item.ReserveNo == null) {
item.ReserveNo = this.$route.query.NewCombinationNum;
}
})
console.log("this.List", this.list);
} else {
this.$message.error(res.data.message)
this.$message.error(res.data.message);
}
}, err => {})
},
calculationPrice(obj) {
let totalPrice = 0
let totalPrice = 0;
obj.OrderDetailsList.forEach(item => {
totalPrice += item.UnitPrice * (item.HouseGuestNum - item.HotelDiscount) * (1 - item.RebateRatio / 100)
totalPrice += item.UnitPrice * (item.HouseGuestNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
})
obj.TotalPrice = totalPrice.toFixed(2)
this.$forceUpdate()
obj.TotalPrice = totalPrice.toFixed(2);
this.$forceUpdate();
},
getHotelList(obj) {
this.apipost('hotel_post_GetLineHotelList', {
......@@ -305,32 +318,32 @@
QCity: obj.QCity
}, res => {
if (res.data.resultCode == 1) {
obj.hotelList = res.data.data
obj.hotelList = res.data.data;
} else {
this.$message.error(res.data.message)
this.$message.error(res.data.message);
}
}, err => {})
},
sendValue(obj) {
if (obj.hotelList.length > 0) {
let ckedObj = obj.hotelList.find(item => item.ID == obj.NewHotelId)
obj.Address = ckedObj.Address
obj.Tel = ckedObj.Tel
obj.NewHotelName = ckedObj.Name
let ckedObj = obj.hotelList.find(item => item.ID == obj.NewHotelId);
obj.Address = ckedObj.Address;
obj.Tel = ckedObj.Tel;
obj.NewHotelName = ckedObj.Name;
} else {
obj.Address = ''
obj.Tel = ''
obj.Address = '';
obj.Tel = '';
}
},
saveList(type) {
if (type == 0) {
this.list.forEach(item => {
item.HotelOrderState = 0
item.HotelOrderState = 0;
})
}
if (type == 1) {
this.list.forEach(item => {
item.HotelOrderState = 1
item.HotelOrderState = 1;
})
}
this.list.forEach(x => {
......@@ -342,9 +355,10 @@
})
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList();
this.Success(res.data.message);
} else {
this.Error(res.data.message)
this.Error(res.data.message);
}
}, err => {})
},
......@@ -353,13 +367,34 @@
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) {
console.log("clickItem", this.ClickItem);
if (file.file.size > 1024 * 1024 * 100) {
this.$message.warning("文件大小不能超过100M！");
return;
}
let newArr = [];
newArr.push(file.file);
let path = "/Upload/DMC/";
this.$message.info("上传中...");
this.UploadSelfFileT(path, newArr, x => {
var fileUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.ClickItem.ContractUrlArray.push(fileUrl);
var str = "";
this.ClickItem.ContractUrlArray.forEach(subItem => {
str += subItem + ",";
})
this.ClickItem.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
});
}
},
},
mounted() {
this.TCNUM = this.$route.query.TCNUM;
......@@ -368,8 +403,14 @@
this.getList();
},
}
</script>
<style>
.roomReservationsDetailsTalbe .el-button--small {
padding: 5px;
margin-top: 10px;
}
.roomReservationsDetailsTalbe .roomBtn {
color: #fff;
padding: 0 10px !important;
......
src/components/SalesModule/groupInquiry.vue
View file @ a793286d
......@@ -810,7 +810,7 @@ export default {
//航班配置
FlightState:0,
TCVisaStatus: '-1',
IsShowUnion:1,
IsShowUnion:0,
QueryType:1,//查询类型 1:签证
},
remarkMsg: {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ a793286d
......@@ -854,6 +854,53 @@
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">保险费：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'保险费') || isExists(item.CostTypeList,'旅游责任险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr> </template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">其他：</div>
</div>
......@@ -869,7 +916,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
<tr v-if="NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1092,7 +1139,7 @@
gridData:[],
TCID: 0,
//数据列表
DataList: "",
DataList: [],
OutBranchId: 0,
ishowBtn: true,
CloseIncomeBtn: false,
......@@ -1194,7 +1241,7 @@
x.checked = false;
})
this.DataList = data;
// console.log("resa",this.DataList)
console.log("resa",this.DataList)
}
});
},
......
src/components/VisaCenter/addVisa.vue
View file @ a793286d
This diff is collapsed.
src/components/VisaCenter/seeVisa.vue
View file @ a793286d
This diff is collapsed.
src/components/activity/awardList.vue
View file @ a793286d
......@@ -63,7 +63,7 @@
</td>
<td>
<el-form-item :label="$t('active.ad_allNum')" prop="awardCount">
<el-input v-model="addMsg.awardCount" class="w217" @keyup.native="checkInteger(addMsg,'awardCount')" placeholder="奖项数量"/>
<el-input v-model="addMsg.awardCount" class="w217" @keyup.native="checkInteger(addMsg,'awardCount')" :placeholder="$t('active.ad_allNum')"/>
</el-form-item>
</td>
</tr>
......
src/components/busManagement/BusInfo.vue
View file @ a793286d
......@@ -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/busManagement/busStatistics.vue
View file @ a793286d
......@@ -163,6 +163,8 @@
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
<div v-show="item.DMCRemark!=''" class="colorE95252">地接备注:{{item.DMCRemark}}</div>
<div v-show="item.OPRemark!=''" class="colorE95252"> OP备注（对外）:{{item.OPRemark}}</div>
<div v-show="item.OPInnerRemark!=''" class="colorE95252">OP备注（对内）:{{item.OPInnerRemark}}</div>
</div>
</td>
</tr>
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ a793286d
......@@ -220,6 +220,7 @@
this.apipost('dmcstatistics_get_SetTicketOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
}
......
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