Skip to content

S
SuperMan
Commit 1a4c59b4 authored by 123zhang's avatar 123zhang
Browse files
Options

解决冲突

parents 35fe0210 45c9ef83
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2583 additions and 2139 deletions
src/App.vue
View file @ 1a4c59b4
......@@ -108,7 +108,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_a59svrd6x1.css";
@import "//at.alicdn.com/t/font_635492_uyefzcxpu3.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/components/FinancialModule/CapitalAllocation.vue
View file @ 1a4c59b4
......@@ -15,7 +15,7 @@
.page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%;
}
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.edit{
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.editedit{
width: 30px;
height: 30px;
display: inline-block;
......@@ -51,8 +51,9 @@
<div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" value="新增" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
<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>
......@@ -66,7 +67,7 @@
<el-col :span="4">
<el-form-item label="公司">
<el-select v-model="msg.RB_Branch_Id" placeholder="请选择公司" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
<el-option :value="-1" label="不限"></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'
......@@ -78,7 +79,7 @@
<el-col :span="4">
<el-form-item label="部门">
<el-select v-model="msg.RB_Depart_Id" placeholder="请选择部门" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
<el-option :value="-2" label="不限"></el-option>
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -90,7 +91,7 @@
<el-col :span="4">
<el-form-item label="制单人">
<el-select filterable v-model='msg.UpdateBy'>
<el-option value="-1" label="不限"></el-option>
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
......@@ -113,9 +114,9 @@
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="状态">
<el-form-item :label="$t('admin.admin_status')">
<el-select v-model="msg.Status" filterable>
<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'
......@@ -142,21 +143,21 @@
<tr>
<th>单号</th>
<th>金额</th>
<th>实付</th>
<!-- <th>实付</th> -->
<!-- <th>原币金额</th> -->
<th>交易日期</th>
<!-- <th>交易日期</th> -->
<th>创建时间</th>
<th>创建人</th>
<!-- <th>备注</th> -->
<th>状态</th>
<th>操作</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item, index) in dataList">
<td>{{item.FrID}}</td>
<td style="cursor:pointer" @click="goDetail('CapitalAllocationDetail', item.FrID)">{{item.FrID}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayMoney}}</td>
<!-- <td>{{item.PayMoney}}</td> -->
<!-- <td>{{item.OriginalMoney}}</td> -->
<td>{{item.TradeDate}}</td>
<!-- <td>{{item.TradeDate}}</td> -->
<td>{{item.CreateDate}}</td>
<td>{{item.EmName}}</td>
<!-- <td>{{item.Description}}</td> -->
......@@ -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/CashierWork.vue
View file @ 1a4c59b4
......@@ -6,7 +6,7 @@
<div class="query-box">
<ul>
<li>
<button class="normalBtn" @click="addShow=true,text='新增'" >新增</button>
<button class="normalBtn" @click="addShow=true,text='新增'" >{{$t('pub.addBtn')}}</button>
<el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
......@@ -24,7 +24,7 @@
<th>授权账户</th>
<th>已处理单据</th>
<th>待处理单据</th>
<th>操作</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td>
......
src/components/FinancialModule/ChoiceAddFinancialDocuments.vue
View file @ 1a4c59b4
......@@ -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 @ 1a4c59b4
......@@ -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 @ 1a4c59b4
......@@ -161,6 +161,8 @@
<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-select>
</span>
......@@ -530,19 +532,19 @@
<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>所属公司</th>
<th width="90">所属公司</th>
<th>单号</th>
<th>单据类型</th>
<th width="90">单据类型</th>
<th>关联信息</th>
<th>费用类型</th>
<th>交易方式</th>
<th>金额</th>
<th>{{msg.Type==1?'收款':'付款'}}对象</th>
<th>制单人员</th>
<th width="90">制单人员</th>
<th>当前状态</th>
<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">
......@@ -589,6 +591,12 @@
<template v-else-if="item.OrderSource==10 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">签证编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==11 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">投诉编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==12 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">散卖机票编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==0">
<p class="_TCIDAndTCNUMList">{{ item.BranchName }}-{{item.DepartName}} </p>
</template>
......@@ -599,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">
......@@ -619,7 +627,15 @@
<p>{{item.Type==1?'实收':'实付'}}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p>
</td>
<td>
<span class="_color_gar">{{item.Type==2?item.ClientTypeName+'：':'汇款人：'}}</span><span>{{item.RemitterName}}</span>
<template v-if='item.Type===1'>
<span class="_color_gar">汇款人：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===2'>
<span class="_color_gar">付款对象：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===4'>
<span class="_color_gar">无</span>
</template>
</td>
<td valign="middle">
<img class="_head_img" :src="item.EmPhoto" alt="">
......@@ -658,7 +674,8 @@
<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">
<i class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
<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">
<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>
......@@ -1343,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 @ 1a4c59b4
......@@ -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 @ 1a4c59b4
......@@ -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 @ 1a4c59b4
......@@ -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/ReceivingOfficer.vue
View file @ 1a4c59b4
......@@ -7,7 +7,7 @@
<div class="query-box">
<ul>
<li>
<button class="normalBtn" @click="addShow=true,text='新增'">新增</button>
<button class="normalBtn" @click="addShow=true,text='新增'">{{$t('pub.addBtn')}}</button>
</li>
</ul>
</div>
......@@ -18,7 +18,7 @@
<th>所属公司</th>
<th>业务人员</th>
<th>负责方向</th>
<th>操作</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td>
......@@ -75,12 +75,12 @@
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item label="名称：" prop="Name">
<el-form-item :label="$t('system.query_airName')" prop="Name">
<el-input v-model="addMsg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属公司">
<el-form-item :label="$t('system.query_company')">
<el-select filterable v-model='addMsg.BranchId' >
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -91,14 +91,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务人员：" prop="listArr">
<el-form-item label="业务人员" prop="listArr">
<el-select
v-model="addMsg.listArr"
filterable
remote
multiple
reserve-keyword
placeholder="请输入"
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethod"
@change="$forceUpdate()"
@remove-tag="removeTag"
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 1a4c59b4
......@@ -903,6 +903,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YouHui",
formatter: this.moneyFormat,
title: "优惠",
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "DaiShou",
formatter: this.moneyFormat,
......@@ -1002,6 +1012,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "BaoXian",
title: "保险费",
formatter: this.moneyFormat,
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "QiTa",
formatter: this.moneyFormat,
......@@ -1494,6 +1514,7 @@ export default {
"实收金额",
"退款",
"平台税金",
"优惠金额",
"待收金额",
"溢收金额",
"人数",
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 1a4c59b4
......@@ -104,8 +104,8 @@
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
<input type="button" class="normalBtn" value="导出" @click=""/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.saveBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" />
</li>
</ul>
</div>
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 1a4c59b4
......@@ -63,7 +63,7 @@
<el-col :span="4" :gutter="35">
<el-form-item label="单据状态">
<el-select filterable v-model='msg.Status' >
<el-option label='不限' :value='-1'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :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>
......@@ -98,15 +98,15 @@
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
<input type="button" class="normalBtn" value="导出" @click=""/></li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.saveBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/></li>
</ul>
</div>
<div class="cm_content">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th></th>
<th>所属公司</th>
<th>{{$t('system.query_company')}}</th>
<th>单号</th>
<th>摘要</th>
<th>汇款人/付款对象</th>
......
src/components/FinancialModule/accountingWork.vue
View file @ 1a4c59b4
......@@ -7,7 +7,7 @@
<div class="query-box">
<ul>
<li>
<button class="normalBtn" @click="addShow=true,text='新增'" >新增</button>
<button class="normalBtn" @click="addShow=true,text='新增'" >{{$t('pub.addBtn')}}</button>
<el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
......@@ -24,7 +24,7 @@
<th>所属公司</th>
<th>业务人员</th>
<th>负责方向</th>
<th>操作</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td>
......
src/components/Hotel/roomReservations.vue
View file @ 1a4c59b4
......@@ -51,7 +51,7 @@
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>1' class="w100">合团号：{{outItem.NewCombinationNum}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
</td>
<td>
<div class="w80">
......@@ -157,7 +157,7 @@
</td>
<td>
<div class="w80 link">
<p @click="goUrl('roomReservationsDetails',item,'订房详情')">详情</p>
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div>
</td>
</tr>
......@@ -251,7 +251,7 @@
}
})
},
goUrl(path, obj, title) {
goUrl(path, obj,outItem, title) {
this.$router.push({
name: path,
query: {
......@@ -259,7 +259,7 @@
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': obj.NewCombinationNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
}
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 1a4c59b4
......@@ -286,17 +286,17 @@
}
})
} 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 +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 => {
......@@ -342,9 +342,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,12 +354,11 @@
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 => {})
}
},
mounted() {
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ 1a4c59b4
......@@ -68,7 +68,7 @@
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList();resetPageIndex()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
</li>
</ul>
</div>
......@@ -205,10 +205,10 @@
<tr>
<th width="120">单号&团号</th>
<th width="90">客户信息</th>
<th width="70">类型</th>
<th width="70">{{$t('admin.admin_type')}}</th>
<th width="180">系列&线路</th>
<!-- <th width="190" style="display:none;">日期</th> -->
<th width="50">人数</th>
<th width="70">{{$t('admin.admin_personNumber')}}</th>
<th width="80">单价</th>
<th width="80">成交单价</th>
<th width="80">应收总额</th>
......@@ -219,10 +219,10 @@
<th width="80">平台税金</th>
<th width="80">在途</th>
<th width="80">未收</th>
<th width="60">状态</th>
<th width="60">{{$t('admin.admin_status')}}</th>
</tr>
<tr>
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td>
<td v-show="list.length==0" colspan="15" align="center">{{$t('system.content_noData')}}</td>
</tr>
<tbody v-for="(item,index) in list" :key="index">
<tr>
......@@ -290,7 +290,7 @@
<td>{{item2.acessDate}}</td>
</tr>
<tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
<td colspan="6" align="center">{{$t('system.content_noData')}}</td>
</tr>
</table>
</div>
......@@ -321,7 +321,7 @@
<span>{{item2.remarks}}</span>
<span>{{item2.createByName}} <span style="color: #666666;">{{item2.createDate}}</span></span>
</p>
<span v-if="item.remarksList.length === 0">暂无数据</span>
<span v-if="item.remarksList.length === 0">{{$t('system.content_noData')}}</span>
</div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;"
class="groupTourOrder_remarks_btn"></el-button>
......@@ -339,7 +339,7 @@
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
<div>
......@@ -351,7 +351,7 @@
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
</td>
......
src/components/SalesModule/groupInquiry.vue
View file @ 1a4c59b4
......@@ -511,7 +511,7 @@
<el-input type="textarea" v-model="remarkMsg.OPInnerRemark"></el-input>
</el-form-item>
</el-col>
</el-form>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="queryCommonData.outerVisible = false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="setOPremark">{{$t('pub.sureBtn')}}</button>
......@@ -523,7 +523,7 @@
<span>修改送签日期</span>
<div>
<button class="hollowFixedBtn" type="button" @click="closeEdit">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="button" @click="editOk">{{$t('pub.saveBtn')}}</button>
<button class="normalBtn" type="button" @click="editOk">{{$t('pub.saveBtn')}}</button>
</div>
</div>
<div class="groupInquiry_edit_form">
......@@ -539,7 +539,7 @@
<span>修改出签日期</span>
<div>
<button class="hollowFixedBtn" type="button" @click="closeEdit2">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="button" @click="editOk2">{{$t('pub.saveBtn')}}</button>
<button class="normalBtn" type="button" @click="editOk2">{{$t('pub.saveBtn')}}</button>
</div>
</div>
<div class="groupInquiry_edit_form">
......@@ -555,7 +555,7 @@
<span>修改进馆日</span>
<div>
<button class="hollowFixedBtn" type="button" @click="closeAdmission">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="button" @click="admissionOk">{{$t('pub.saveBtn')}}</button>
<button class="normalBtn" type="button" @click="admissionOk">{{$t('pub.saveBtn')}}</button>
</div>
</div>
<el-form :model="msg_admission" :rules="rules" ref="admissionForm" :inline="true" class="groupInquiry_admission_form">
......@@ -580,7 +580,7 @@
</el-select>
</el-form-item>
<el-form-item prop="EuropeVisaName" class="groupInquiry_admission_formItem" v-show="msg_admission.EuropeVisaType==='2'&&msg_admission.EuropeSchengen==='5'">
<el-input class="groupInquiry_admission_input2" v-show="msg_admission.EuropeSchengen==='5'" v-model="msg_admission.EuropeVisaName" placeholder="输入国家名称"></el-input>
<el-input class="groupInquiry_admission_input2" v-show="msg_admission.EuropeSchengen==='5'" v-model="msg_admission.EuropeVisaName" placeholder="输入国家名称"></el-input>
</el-form-item>
</div>
</el-form>
......@@ -747,7 +747,8 @@ export default {
//航班配置
FlightState:0,
TCVisaStatus: '-1',
IsShowUnion:1
IsShowUnion:1,
QueryType:1,//查询类型 1:签证
},
remarkMsg: {
TCID: 0,
......@@ -828,8 +829,8 @@ export default {
})
},
downloadFile: function (item) {
let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(item.FullUrl.replace(reg,''),item.Name);
let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(item.FullUrl.replace(reg,''),item.Name);
},
// 送签日期不能大于送签结束日期
editInput: function (val) {
......@@ -865,7 +866,7 @@ export default {
} else {
this.$message.error("修改失败");
}
},
err => {}
)
......@@ -907,7 +908,7 @@ export default {
} else {
this.$message.error("修改失败");
}
},
err => {}
)
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 1a4c59b4
......@@ -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/activity/awardList.vue
View file @ 1a4c59b4
......@@ -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 @ 1a4c59b4
......@@ -82,7 +82,9 @@
text-decoration: underline;
cursor: pointer;
}
.BusTyleFirst .w150{
margin-right:22px;
}
</style>
<template>
<div class="flexOne busInfo">
......@@ -192,11 +194,14 @@
</div>
</td>
<td>
<div class="w180">
<el-select clearable class="w150" filterable placeholder="请选择" v-model="item.BusType" :disabled="forbidInput" @change='getBusPrice(item)'>
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
</el-option>
</el-select>
<div class="w180" :class="{'BusTyleFirst':index==0}">
<el-select clearable class="w150" filterable placeholder="请选择" v-model="item.BusType" :disabled="forbidInput" @change='getBusPrice(item)'>
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
</el-option>
</el-select>
<el-tooltip class="item" effect="dark" content="同上" placement="top">
<i class="iconfont icon-tongshang" style="cursor:pointer;" v-if="index!=0" @click="getBeforeInfo(index)"></i>
</el-tooltip>
</div>
</td>
<td>
......@@ -515,6 +520,7 @@ export default {
x.BookGroup = this.$route.query.NewCombinationNum;
}
})
console.log(this.PlanTableData,'plandata');
}
},
null
......@@ -695,6 +701,29 @@ export default {
2
);
this.PostData.CostPrice = CoastPrice;
},
//获取同上信息
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.BookGroup = oldPlanData.BookGroup;
newPlanData.DriverName = oldPlanData.DriverName;
newPlanData.DriverTel = oldPlanData.DriverTel;
newPlanData.AccommodationType = oldPlanData.AccommodationType;
newPlanData.AccommodationRemark = oldPlanData.AccommodationRemark;
newPlanData.BusType = oldPlanData.BusType;
// newPlanData.UseNum = oldPlanData.UseNum;
// newPlanData.BusNum = oldPlanData.BusNum;
// newPlanData.BusCompany = oldPlanData.BusCompany;
// newPlanData.ParkExplain = oldPlanData.ParkExplain;
// newPlanData.CostPrice = oldPlanData.CostPrice;
// newPlanData.TransferNum = oldPlanData.TransferNum;
}
},
mounted() {
......
src/components/busManagement/busStatistics.vue
View file @ 1a4c59b4
......@@ -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/platformModule/companyManagement.vue
View file @ 1a4c59b4
......@@ -23,22 +23,22 @@
</span>
</li>-->
<li>
<span><em>{{$t('admin.admin_company')}}</em><el-input @keyup.enter.native="getList" v-model="msg.BName" placeholder="请输入内容"></el-input></span>
<span><em>{{$t('admin.admin_company')}}</em><el-input @keyup.enter.native="getList" v-model="msg.BName" :placeholder="$t('pub.pleaseImport')"></el-input></span>
</li>
<li>
<span><em>{{$t('admin.admin_domain')}}</em><el-input @keyup.enter.native="getList" v-model="msg.Domain" placeholder="请输入内容"></el-input></span>
<span><em>{{$t('admin.admin_domain')}}</em><el-input @keyup.enter.native="getList" v-model="msg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input></span>
</li>
<li>
<span><em>{{$t('admin.admin_status')}}</em><el-select v-model="msg.Status" placeholder="不限">
<el-option label='不限' value=''></el-option>
<el-option label='开启' value='0'></el-option>
<el-option label='关闭' value='1'></el-option>
<span><em>{{$t('admin.admin_status')}}</em><el-select v-model="msg.Status" :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value=''></el-option>
<el-option :label="$t('pub.openSel')" value='0'></el-option>
<el-option :label="$t('pub.closeSel')" value='1'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
<input type="button" class="normalBtn" value="新增" @click="outerVisible = true,dialogTitle='新增公司'" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible = true,dialogTitle='新增公司'" />
</li>
</ul>
......@@ -49,8 +49,8 @@
<th width="300">{{$t('admin.admin_company')}}</th>
<!-- <th>{{$t('admin.admin_domain')}}</th> -->
<!-- <th>{{$t('admin.admin_leader')}}</th> -->
<th>联系人</th>
<th>联系电话</th>
<th>{{$t('hotel.suplier_contact')}}</th>
<th>{{$t('restaurant.res_ContactNumber')}}</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('admin.admin_isshow')}}</th>
<th>公司类型</th>
......@@ -63,7 +63,7 @@
<!-- <td>{{item.BranchManagerName}}</td> -->
<td>{{item.ContactPersion}}</td>
<td>{{item.MobilePhone}}</td>
<td>{{item.Status==0?'开启':'关闭'}}</td>
<td>{{item.Status==0? $t('pub.openSel'): $t('pub.closeSel')}}</td>
<td>{{item.is_show==0?'显示':'不显示'}}</td>
<td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td>
<td>
......@@ -92,7 +92,7 @@
<!-- <el-form-item class='w400' :label="$t('admin.admin_domain')" prop="Domain">
<el-input type="text" v-model="addMsg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> -->
<el-form-item label="省份" prop="Province">
<el-form-item :label="$t('system.table_pvrg')" prop="Province">
<el-select class='w280' :placeholder="$t('pub.pleaseSel')" filterable v-model="addMsg.Province" @change="getCityList(addMsg.Province,1)">
<el-option :label="$t('pub.unlimitedSel')" :value='commonDefaultSelect'></el-option>
<el-option v-for='item in ProvinceList'
......@@ -147,10 +147,10 @@
<el-input type="text" v-model="addMsg.GatheringAddress" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> -->
<el-form-item class='w400' label='状态' prop="Status" >
<el-form-item class='w400' :label='$t("admin.admin_status")' prop="Status" >
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='是否显示' prop="is_show">
<el-form-item class='w400' :label='$t("admin.admin_isshow")' prop="is_show">
<el-switch v-model="addMsg.is_show" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='是否为总公司' prop="IsParentCompany">
......@@ -159,9 +159,9 @@
<el-form-item class='w400' label='部门初始层级' prop="BeginTier">
<el-input type="text" v-model="addMsg.BeginTier" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' label='负责人' prop="BranchManager">
<el-select filterable clearable v-model='addMsg.BranchManager' placeholder="请选择">
<el-option label='不限' value='0'></el-option>
<el-form-item class='w400' :label='$t("admin.admin_leader")' prop="BranchManager">
<el-select filterable clearable v-model='addMsg.BranchManager' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('admin.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in employeeList' :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId">
</el-option>
</el-select>
......@@ -197,9 +197,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取 消</button>
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
......@@ -221,10 +221,10 @@
return {
options: [{
value: '0',
label: '开启'
label: this.$t('pub.openSel')
}, {
value: '1',
label: '关闭'
label: this.$t('pub.closeSel')
}],
ProvinceList:[],
CityList:[],
......
src/components/systemManagement/AccountType.vue
View file @ 1a4c59b4
......@@ -473,9 +473,9 @@
isdelete(ID){
this.deleteID = ID;
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips') ,{
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
......
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