Skip to content

S
SuperMan
Commit 06058588 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

冲突.

parent baf76341
Show whitespace changes
Inline Side-by-side
Showing with 254 additions and 246 deletions
src/components/FinancialModule/CapitalAllocation.vue
View file @ 06058588
......@@ -60,13 +60,13 @@
<el-form label-width="100px" class="form">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单据编号">
<el-form-item :label="$t('fnc.djbianhao')">
<el-input v-model="msg.FrID"></el-input>
</el-form-item>
</el-col>
<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-form-item :label="$t('system.table_company')">
<el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -77,8 +77,8 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="部门">
<el-select v-model="msg.RB_Depart_Id" placeholder="请选择部门" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
<el-form-item :label="$t('admin.admin_Department')">
<el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
......@@ -89,7 +89,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="制单人">
<el-form-item :label="$t('fnc.zhidanren')">
<el-select filterable v-model='msg.UpdateBy'>
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
......@@ -101,13 +101,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="制单日期">
<el-form-item :label="$t('fnc.zdriqi')">
<el-date-picker
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -126,13 +126,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="交易日期">
<el-form-item :label="$t('fnc.jiaoyiriqi')">
<el-date-picker
@change="timeAdd(2)"
v-model="productionDate2"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -141,13 +141,13 @@
<div class="page_CapitalAllocation_list">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>单号</th>
<th>金额</th>
<th>{{$t('fnc.danhao')}}</th>
<th>{{$t('fnc.jine')}}</th>
<!-- <th>实付</th> -->
<!-- <th>原币金额</th> -->
<!-- <th>交易日期</th> -->
<th>创建时间</th>
<th>创建人</th>
<th>{{$t('fnc.cjshijian')}}</th>
<th>{{$t('active.cl_addPp')}}</th>
<!-- <th>备注</th> -->
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('system.table_operation')}}</th>
......@@ -173,7 +173,7 @@
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">流程日志</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>
......@@ -182,7 +182,7 @@
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
<li>{{$t('hotel.hotel_zanwu')}}</li>
</ul>
</div>
</div>
......@@ -190,16 +190,16 @@
</el-popover>
</td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
<i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="详情" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
<i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID)"></i>
</el-tooltip>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>{{$t('active.ld_noData')}}</p></div>
<div>
<el-pagination
background
......@@ -259,7 +259,9 @@ export default {
GetFinancLogList: [],
loading: true,
LogLoading: true,
EmId:0
EmId:0,
total: 0,
currentPage: 0,
}
},
created(){
......@@ -304,7 +306,7 @@ export default {
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
this.msg.EmployeeId=this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,"资金调拨报表.xls");} ,
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
getCompanyList: function () { //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
......
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ 06058588
......@@ -276,7 +276,7 @@
</style>
<template>
<div class="CapitalDetail">
<span class="Ca_Span">资金调拨单</span>
<span class="Ca_Span">{{$t('fnc.zjdbodan')}}</span>
<div class="clearfix">
<div class="Co_oderleft">
<div class="Ca_leftOrder">
......@@ -285,26 +285,26 @@
<div class="Ca_line"></div>
<div class="clearfix collection_Order">
<div class="Co_oderleft">
<span>编号：</span><span class="Ca_comSize">{{dataList.FrID}}</span>
<span>{{$t('hotel.hotel_SerialNumber')}}：</span><span class="Ca_comSize">{{dataList.FrID}}</span>
</div>
<div class="Co_oderRight">
<span>制表：</span><span class="Ca_comSize">{{dataList.CreateDate}}</span>
<span>{{$t('fnc.zhibiao')}}：</span><span class="Ca_comSize">{{dataList.CreateDate}}</span>
</div>
</div>
<div v-for="item in dataList.SBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comColor">调拨日期：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
<span class="Ca_comColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
</div>
</div>
<table class="collection_Table" style="border-collapse: collapse;">
<tr>
<th width="100">收款方式</th>
<th width="300">账户</th>
<th width="110">金额</th>
<th width="90">币种</th>
<th width="85">汇率</th>
<th>本位币金额</th>
<th width="100">{{$t('fnc.skfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
......@@ -318,7 +318,7 @@
</tr>
</table>
<div class="clearfix Ca_comLinediv">
<span class="Ca_remarkSpan">备注：</span>
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<!-- <input type="button" class="hollowFixedBtn Co_oderRight" style="margin-top:25px;" value="上传凭证"/> -->
<input type="button" class="hollowFixedBtn Co_oderRight" style="margin-top:25px;" @click="showFileList(item)" :value="item.comText"/>
......@@ -350,17 +350,17 @@
<div v-for="item in dataList.FBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comBlueColor">调拨日期：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
<span class="Ca_comBlueColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
</div>
</div>
<table class="pay_Table" style="border-collapse: collapse;">
<tr>
<th width="100">付款方式</th>
<th width="300">账户</th>
<th width="110">金额</th>
<th width="90">币种</th>
<th width="85">汇率</th>
<th>本位币金额</th>
<th width="100">{{$t('fnc.fkfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
......@@ -374,7 +374,7 @@
</tr>
</table>
<div class="clearfix Ca_comLinediv" style="width:100%;padding:0 20px;">
<span class="Ca_remarkSpan">备注：</span>
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<!-- <input type="button" class="hollowFixedBtn Co_oderRight Ca_payBtn" style="margin-top:25px;" @click="upSbankfile(item)" value="上传凭证"/> -->
<input type="button" class="hollowFixedBtn Co_oderRight Ca_payBtn" style="margin-top:25px;" @click="showFuFileList(item)" :value="item.comText"/>
......@@ -430,9 +430,9 @@
</viewer>
<div class="_tit _tit2 w830px">
<p>
<span class="_text">审核流程</span>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
<span class="_text">{{$t('fnc.shliucheng')}}</span>
<span class="_btn" v-if="tableShow" @click="tableShow=false">{{$t('fnc.shouqi')}} <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShow">
<div class="w600px">
......@@ -458,29 +458,29 @@
<div class="_process_box">
<template v-for="(item,index) in GetDetail.AuditSteps">
<div class="_pb_son" :class="{_none_after:(item.NextStep==1||item.Status==4),_bohui_after:(GetDetail.Status==3 && !IsBoHui && index===GetDetail.AuditSteps.length-1)}" v-if="item.Sort==0 || (item.Status==1 && item.NextStep==1) || (item.Status==2 && item.Sort!=0) || (item.Status==4)">
<div class="_left_radius" v-if="item.Sort==0">发起</div>
<div class="_left_radius _left_radius_sus" v-if="item.NextStep==1">待审</div>
<div class="_left_radius" v-if="item.Sort!=0 && item.Status==2">通过</div>
<div class="_left_radius _left_radius_err" v-else-if="item.Status==4">驳回</div>
<div class="_left_radius" v-if="item.Sort==0">{{$t('fnc.faqi')}}</div>
<div class="_left_radius _left_radius_sus" v-if="item.NextStep==1">{{$t('fnc.daishen')}}</div>
<div class="_left_radius" v-if="item.Sort!=0 && item.Status==2">{{$t('visa.v_tongguo')}}</div>
<div class="_left_radius _left_radius_err" v-else-if="item.Status==4">{{$t('fnc.bohui')}}</div>
<div class="_right_content" v-if="item.AuditWay==2 || item.AuditWay==3">
<p class="_name">
<span class="_n">{{item.AuditDescription}}<span class="_sm">({{item.AuditWay==2?'会签':'或签'}})</span></span>
<span class="_n">{{item.AuditDescription}}<span class="_sm">({{item.AuditWay==2? $t('fnc.huiqian') : $t('fnc.huoqian')}})</span></span>
</p>
<div class="_more _mgt_15" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus==2">
<div class="_right_content">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">通过</span>
<span class="_sn" v-if="son.AuditStatus==2">{{$t('visa.v_tongguo')}}</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p class="_pp_info">{{$t('fnc.zjbeizhu')}}：{{z.Remarks?z.Remarks : $t('fnc.no')}}</p>
</div>
</template>
<div class="_pp_info" v-if="son.AuditStatus!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<p>{{son.Remark!=''?son.Remark : $t('fnc.no')}}</p>
<div class="_info_img" v-if="son.Image!=null&&son.AuditStatus==2" >
<ul class="clearfix" v-if="son.Image.length&&son.Image.length>=1">
<li v-for="(img,imgI) in son.Image">
......@@ -499,19 +499,19 @@
<div class="_right_content" v-if="item.AuditWay==2&&son.AuditStatus!=2">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">通过</span>
<span class="_m" v-else-if="son.AuditStatus==4">驳回</span>
<span class="_sm" v-else-if="son.AuditStatus==1">待审</span>
<span class="_sn" v-if="son.AuditStatus==2">{{$t('visa.v_tongguo')}}</span>
<span class="_m" v-else-if="son.AuditStatus==4">{{$t('fnc.bohui')}}</span>
<span class="_sm" v-else-if="son.AuditStatus==1">{{$t('fnc.daishen')}}</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p class="_pp_info">{{$t('fnc.zjbeizhu')}}：{{z.Remarks?z.Remarks:$t('fnc.no')}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<p>{{son.Remark!=''?son.Remark:$t('fnc.no')}}</p>
<div class="_info_img" v-if="son.Image!=null&&item.Status!=1" >
<ul class="clearfix" v-if="son.Image.length&&son.Image.length>=1">
<li v-for="(img,imgI) in son.Image">
......@@ -528,19 +528,19 @@
<div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==1">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span>
<span class="_m" v-else-if="item.Status==4">驳回</span>
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">{{$t('visa.v_tongguo')}}</span>
<span class="_m" v-else-if="item.Status==4">{{$t('fnc.bohui')}}</span>
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">{{$t('fnc.daishen')}}</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p class="_pp_info">{{$t('fnc.zjbeizhu')}}：{{z.Remarks?z.Remarks:$t('fnc.no')}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<p>{{son.Remark!=''?son.Remark:$t('fnc.no')}}</p>
<div class="_info_img" v-if="son.Image!=null&&item.Status!=1" >
<ul class="clearfix" v-if="son.Image.length&&son.Image.length>=1">
<li v-for="(img,imgI) in son.Image">
......@@ -557,19 +557,19 @@
<div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==4">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span>
<span class="_m" v-else-if="item.Status==4">驳回</span>
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">{{$t('visa.v_tongguo')}}</span>
<span class="_m" v-else-if="item.Status==4">{{$t('fnc.bohui')}}</span>
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">{{$t('fnc.daishen')}}</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
<p><span>{{$t('fnc.you')}}</span>{{z.BeFrom}}<span><i class="_color_green">{{$t('fnc.zhuanjiao')}}</i>{{$t('fnc.gei')}}</span>{{z.Target}}</p>
<p class="_pp_info">{{$t('fnc.zjbeizhu')}}：{{z.Remarks?z.Remarks:$t('fnc.no')}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<p>{{son.Remark!=''?son.Remark:$t('fnc.no')}}</p>
<div class="_info_img" v-if="son.Image!=null&&item.Status!=1" >
<ul class="clearfix" v-if="son.Image.length&&son.Image.length>=1">
<li v-for="(img,imgI) in son.Image">
......@@ -593,7 +593,7 @@
</p>
<div class="_right_content">
<div class="_pp_info" v-if="item.NextStep!=1">
<p>{{son.Remark==''?'无':son.Remark}}</p>
<p>{{son.Remark==''?$t('fnc.no'):son.Remark}}</p>
<div class="_info_img" v-if="son.Image!=null" >
<ul class="clearfix" v-if="son.Image.length&&son.Image.length>=1">
<li v-for="(img,imgI) in son.Image">
......@@ -612,17 +612,17 @@
</div>
</template>
<div class="_pb_son _none_after" v-if="GetDetail.Status==3 && !IsBoHui">
<div class="_left_radius _left_radius_err">驳回</div>
<div class="_left_radius _left_radius_err">{{$t('fnc.bohui')}}</div>
</div>
<div class="_pb_son" :class="GetDetail.Status==2?'_none_after':''" v-if="GetDetail.Status==2">
<div class="_left_radius" >结束</div>
<div class="_left_radius" >{{$t('fnc.jieshu')}}</div>
<div class="_right_content">
<p class="_time">累计耗时：{{endDate}}</p>
<p class="_time">{{$t('fnc.ljhaoshi')}}：{{endDate}}</p>
</div>
</div>
<div style="padding-left: 75px;">
<button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" @click="bohui()">驳回</button>
<button class="hollowFixedBtn" @click="AuditOrRefund()">返回</button>
<button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" @click="bohui()">{{$t('fnc.bohui')}}</button>
<button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button>
</div>
</div>
</div>
......@@ -670,7 +670,7 @@ export default {
this.dataList=res.data.data;
this.dataList.AuditSteps.forEach(y=>{
if(y.Sort>0){
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.push(y);
}
this.GetDetail.AuditSteps.push(y);
......@@ -682,11 +682,11 @@ export default {
this.dataList.AuditSteps=AuditSteps;
this.dataList.SBankList.forEach(x => {
x.comText = '显示附件';
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
this.dataList.FBankList.forEach(x => {
x.comText = '显示附件';
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
console.log(this.GetDetail)
......@@ -701,10 +701,10 @@ export default {
},
//点击显示附件
showFileList(item){
if(item.comText=='隐藏附件'){
item.comText='显示附件'
if(item.comText== this.$t('fnc.ycfujian')){
item.comText=this.$t('fnc.xsfujian');
}else{
item.comText='隐藏附件'
item.comText=this.$t('fnc.ycfujian')
}
if(item.isShow){
item.isShow=false;
......@@ -714,10 +714,10 @@ export default {
this.$forceUpdate();
},
showFuFileList(item){
if(item.comText=='隐藏附件'){
item.comText='显示附件'
if(item.comText==this.$t('fnc.ycfujian')){
item.comText=this.$t('fnc.xsfujian');
}else{
item.comText='隐藏附件'
item.comText=this.$t('fnc.ycfujian')
}
if(item.isShow){
item.isShow=false;
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 06058588
......@@ -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/addCapitalAllocation.vue
View file @ 06058588
......@@ -155,15 +155,15 @@
<template>
<div class="page_addCapitalAllocation" v-loading="loading">
<div class="_top">
<p>四川和平国际旅行社有限公司</p>
<p><span>{{msg.TemplateId==34?'总部':'分公司'}}资金调拨单</span></p>
<p>{{GroupName}}</p>
<p><span>{{msg.TemplateId==34? $t('fnc.zongbu'):$t('fnc.fgongsi')}}{{$t('fnc.zjdbodan')}}</span></p>
</div>
<div class="_conten">
<ul v-if="inList.length">
<li v-for="(item, index) in inList" class="_inList">
<p>收款对象</p>
<p>{{$t('fnc.skduixiang')}}</p>
<div>
<span class="_lable">收款方式：</span>
<span class="_lable">{{$t('fnc.skfangshi')}}：</span>
<el-select filterable v-model='item.Type' @change="FinancialInstitutions_post_GetAccountList(1, index, item.Type, item.mode),item.AccountId=''" class="w100 _border_b_1">
<el-option v-for='item in AccList'
:label='item.Name'
......@@ -171,7 +171,7 @@
:key='item.ID'>
</el-option>
</el-select>
<span class="_lable">账户类型：</span>
<span class="_lable">{{$t('fnc.zhanghuleixing')}}：</span>
<el-select filterable v-model='item.mode' @change="FinancialInstitutions_post_GetAccountList(1, index, item.Type, item.mode),item.AccountId=''" class="w100 _border_b_1">
<el-option v-for='item in shouAccList'
:label='item.Name'
......@@ -179,7 +179,7 @@
:key='item.ID'>
</el-option>
</el-select>
<span class="_lable">到款账户：</span>
<span class="_lable">{{$t('fnc.dkzhanghu')}}：</span>
<el-select filterable v-model='item.AccountId' @change="getAccInfo(1, index, item.AccountId)" class="w250 _border_b_1">
<el-option v-for='sItem in item.shouAccNumList'
:label='sItem.allName'
......@@ -189,17 +189,17 @@
</el-select>
</div>
<div>
<span class="_lable">收款金额：</span>
<span class="_lable">{{$t('fnc.skjine')}}：</span>
<el-input v-model='item.OriginalMoney' @input="Calculation(1, index)" class="w100 _border_b_1"></el-input>
<span class="_lable">币种：</span>
<span class="_lable">{{$t('hotel.hotel_Currency')}}：</span>
<el-input disabled="disabled" v-model='item.CurrencyName' class="w80 _border_b_1"></el-input>
<span class="_lable">汇率：</span>
<span class="_lable">{{$t('hotel.hotel_CurrentRate')}}：</span>
<el-input v-model='item.Rate' class="w60 _border_b_1"></el-input>
<span class="_lable">本位金额：</span>
<span class="_lable">{{$t('fnc.bwyue')}}：</span>
<el-input v-model='item.Money' class="w100 _border_b_1"></el-input>
</div>
<div>
<span class="_lable">调拨日期：</span>
<span class="_lable">{{$t('fnc.dbriqi')}}：</span>
<el-date-picker clearable class="w100 _border_b_1"
v-model="item.AllotDate"
prefix-icon='1'
......@@ -207,16 +207,16 @@
format="yyyy-MM-dd"
value-format="yyyy-MM-dd">
</el-date-picker>
<span class="_lable">备注：</span>
<span class="_lable">{{$t('hotel.hotel_remark')}}：</span>
<el-input v-model="item.Description" type="textarea" class="w300 _border_b_1"></el-input>
<div class="_add_btn">
<span @click="initMsg(1)">添加</span>
<span @click="deleteItem(1, index)">删除</span>
<span @click="clearItem(1, index)">清空</span>
<span @click="initMsg(1)">{{$t('fnc.tianjia')}}</span>
<span @click="deleteItem(1, index)">{{$t('system.table_delete')}}</span>
<span @click="clearItem(1, index)">{{$t('fnc.qingkong')}}</span>
</div>
</div>
<div class="_uoload">
<p>上传附件<span class="_addUpload_tips">（单个附件大小不得超过10M）</span></p>
<p>{{$t('fnc.scfujian')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span></p>
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in item.vorcherInos">
<div v-if="file.Type==3">
......@@ -244,7 +244,7 @@
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
</div>
......@@ -253,9 +253,9 @@
</ul>
<ul v-if="outList.length">
<li v-for="(item, index) in outList" class="_outList">
<p>付款方式</p>
<p>{{$t('fnc.fkfangshi')}}</p>
<div>
<span class="_lable">付款方式：</span>
<span class="_lable">{{$t('fnc.fkfangshi')}}：</span>
<el-select filterable v-model='item.Type' @change="FinancialInstitutions_post_GetAccountList(2, index, item.Type, item.mode),item.AccountId=''" class="w100 _border_b_1">
<el-option v-for='item in AccList'
:label='item.Name'
......@@ -263,7 +263,7 @@
:key='item.ID'>
</el-option>
</el-select>
<span class="_lable">账户类型：</span>
<span class="_lable">{{$t('fnc.zhleixing')}}：</span>
<el-select filterable v-model='item.mode' @change="FinancialInstitutions_post_GetAccountList(2, index, item.Type, item.mode),item.AccountId=''" class="w100 _border_b_1">
<el-option v-for='item in shouAccList'
:label='item.Name'
......@@ -271,7 +271,7 @@
:key='item.ID'>
</el-option>
</el-select>
<span class="_lable">付款账户：</span>
<span class="_lable">{{$t('fnc.fkzhanghu')}}：</span>
<el-select filterable v-model='item.AccountId' @change="getAccInfo(2, index, item.AccountId)" class="w250 _border_b_1">
<el-option v-for='sItem in item.shouAccNumList'
:label='sItem.allName'
......@@ -281,17 +281,17 @@
</el-select>
</div>
<div>
<span class="_lable">付款金额：</span>
<span class="_lable">{{$t('fnc.fkjine')}}：</span>
<el-input v-model='item.OriginalMoney' @input="Calculation(2, index)" class="w100 _border_b_1"></el-input>
<span class="_lable">币种：</span>
<span class="_lable">{{$t('hotel.hotel_Currency')}}：</span>
<el-input disabled="disabled" v-model='item.CurrencyName' class="w80 _border_b_1"></el-input>
<span class="_lable">汇率：</span>
<span class="_lable">>{{$t('hotel.hotel_CurrentRate')}}：</span>
<el-input v-model='item.Rate' class="w60 _border_b_1"></el-input>
<span class="_lable">本位金额：</span>
<span class="_lable">{{$t('fnc.bwyue')}}：</span>
<el-input v-model='item.Money' class="w100 _border_b_1"></el-input>
</div>
<div>
<span class="_lable">调拨日期：</span>
<span class="_lable">{{$t('fnc.dbriqi')}}：</span>
<el-date-picker clearable class="w100 _border_b_1"
v-model="item.AllotDate"
prefix-icon='1'
......@@ -299,16 +299,16 @@
format="yyyy-MM-dd"
value-format="yyyy-MM-dd">
</el-date-picker>
<span class="_lable">备注：</span>
<span class="_lable">{{$t('hotel.hotel_remark')}}：</span>
<el-input v-model="item.Description" type="textarea" class="w300 _border_b_1"></el-input>
<div class="_add_btn">
<span @click="initMsg(2)">添加</span>
<span @click="deleteItem(2, index)">删除</span>
<span @click="clearItem(2, index)">清空</span>
<span @click="initMsg(2)">{{$t('fnc.tianjia')}}</span>
<span @click="deleteItem(2, index)">{{$t('system.table_delete')}}</span>
<span @click="clearItem(2, index)">{{$t('fnc.qingkong')}}</span>
</div>
</div>
<div class="_uoload">
<p>上传附件<span class="_addUpload_tips">（单个附件大小不得超过10M）</span></p>
<p>{{$t('fnc.scfujian')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span></p>
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in item.vorcherInos">
<div v-if="file.Type==3">
......@@ -336,7 +336,7 @@
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
</div>
......@@ -345,7 +345,7 @@
</ul>
</div>
<div class="_submit">
<button class="normalBtn" @click="AddFinancial()">提交</button>
<button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
......@@ -393,15 +393,18 @@ export default {
title:false
},
images: [],
GroupName: '',
}
},
created(){
let userInfo = this.getLocalStorage();
this.GroupName = userInfo.GroupName
if (this.$route.query.edit) {
let id = this.$route.query.id
this.getData(id)
} else {
this.initMsg()
let userInfo = this.getLocalStorage();
this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
if(this.msg.RB_Branch_Id===0 || this.msg.RB_Branch_Id===45 || this.msg.RB_Branch_Id===49){
......@@ -513,13 +516,13 @@ export default {
deleteItem: function (type, index) {
if (type===1) {
if (this.inList.length===1) {
return this.$message.error('不能删除了！');
return this.$message.error(this.$t('fnc.bnshanchu'));
} else {
this.inList.splice(index, 1)
}
} else if (type===2){
if (this.outList.length===1) {
return this.$message.error('不能删除了！');
return this.$message.error(this.$t('fnc.bnshanchu'));
} else {
this.outList.splice(index, 1)
}
......@@ -637,7 +640,7 @@ export default {
},
uploadFileBtn: function (file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.$message.warning('文件大小不能超过10M！')
this.$message.warning(this.$t('tips.wjdxbncgsz'))
return
}
// 1 文档 2 数据 3 图片
......@@ -655,11 +658,11 @@ export default {
typeOk = true;
}
})
if (!typeOk) return this.$message.error('请上传图片、word、excel类型的文件！');
if (!typeOk) return this.$message.error(this.$t('tips.qscWEfile'));
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
if (this.inUploadTrue) {
......@@ -677,7 +680,7 @@ export default {
Url:this.domainManager().ViittoFileUrl + x.data.FilePath,
})
}
this.$message.success('上传成功');
this.$message.success(this.$t('tips.scchenggong'));
});
},
deleteUploadFile: function (type, i , ind) { // 删除上传文件
......
src/components/busManagement/busStatistics.vue
View file @ 06058588
......@@ -165,6 +165,9 @@
<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>
......
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