Skip to content

S
SuperMan
Commit e16e9ffd authored by youjie's avatar youjie
Browse files
Options

修复bug

parent 2f106459
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 459 additions and 94 deletions
src/assets/common/lang/EN/fill.js
View file @ e16e9ffd
......@@ -144,16 +144,16 @@ export const obj = {
expensenote: 'Expense Notes',
lookonlyatuploads: 'Only look at uploading invoices',
urgesbtoexamine: 'Urge sb. to examine',
commissionsetting: 'Commissionsetting',
commissionsetting: 'commissionsetting',
payersetup: 'payer setup',
modifytheexchangerate: 'modifytheexchangerate',
modifytradingmethod: 'Modifytradingmethod',
modifytradingmethod: 'modifytradingmethod',
modifyexchangeratetips: 'Note: If you change the account to a different currency, you need to change the exchangerate of the document',
tothedocumenter: 'Document maker to hand over',
handpartscharge: 'hand charge',
modifythepayer: 'Modifythepayer',
modifythepayer: 'modifythepayer',
balanceouttisp: 'Note: Please check the documents and click below to confirm the offset',
prepaymentrefund: 'Prepaymentrefund',
prepaymentrefund: 'prepaymentrefund',
zhutuanhao: 'Group number',
yinliuren: 'Drainage man',
guanlian: 'connected',
......
src/assets/common/lang/zhCN/fill.js
View file @ e16e9ffd
This diff is collapsed.
src/assets/common/lang/zhTW/fill.js
View file @ e16e9ffd
......@@ -135,25 +135,25 @@ export const obj = {
invoicevoucherreview: '伝票審査です',
mergerapproval: '合並審批',
closemergerapproval: '關閉合並審批',
Handdistributionfeeincome: '手配費收入',
Disableapproval: '關閉壹鍵審批入',
Oneclickapproval: '壹鍵審批',
handdistributionfeeincome: '手配費收入',
disableapproval: '關閉壹鍵審批入',
oneclickapproval: '壹鍵審批',
noOneclicktransfer: '關閉壹鍵轉交',
oneclicktransfer: '壹鍵轉交',
payroll: '工資單',
expensenote: '費用備注',
lookonlyatuploads: '只看待上傳發票的',
Urgesbtoexamine: '催審',
Commissionsetting: '手續費設置',
Payersetup: '付款對象設置',
urgesbtoexamine: '催審',
commissionsetting: '手續費設置',
payersetup: '付款對象設置',
modifytheexchangerate: '修改彙率',
Modifytradingmethod: '修改交易方式',
Modifyexchangeratetips: '注意：如果修改爲不同幣種的賬戶，需修改單據的彙率',
Tothedocumenter: '制單人轉交',
Handpartscharge: '手配費',
Modifythepayer: '修改付款對象',
Balanceouttisp: '注：沖抵請勾選單據後點擊下方確認沖抵',
Prepaymentrefund: '預付款退款',
modifytradingmethod: '修改交易方式',
modifyexchangeratetips: '注意：如果修改爲不同幣種的賬戶，需修改單據的彙率',
tothedocumenter: '制單人轉交',
handpartscharge: '手配費',
modifythepayer: '修改付款對象',
balanceouttisp: '注：沖抵請勾選單據後點擊下方確認沖抵',
prepaymentrefund: '預付款退款',
zhutuanhao: '組團號',
yinliuren: '引流人',
guanlian: '關聯',
......
src/components/FinancialModule/Costdocuments.vue
View file @ e16e9ffd
......@@ -56,7 +56,7 @@
.icon-shenhebohui{color: #E95252}
.icon-icon-zancun{color: #FF9C01}
.zhuiClass{
}
.singeRowTable tr:hover{background-color: white}
._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px}
......@@ -318,10 +318,10 @@
</v-table>
</div>
<el-dialog custom-class='w400' :title="$t('objFill.Tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<el-dialog custom-class='w400' :title="$t('objFill.tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<template>
<el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')">
<el-form-item :label="$t('objFill.tothedocumenter')">
<el-select
v-model="zhuanjiaoMsg.CreateBy"
filterable
......@@ -460,7 +460,7 @@ Vue.component('table-RecPay',{ //收支样式
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
收入
收入
</span>
<span v-if="rowData.Type==5" style="display: inline-block;
padding: 2px 8px;
......@@ -868,7 +868,7 @@ export default {
{field: 'TradeWay', title: '交易方式',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-TradeWay'},
{field: 'Money', title: '应收/应付',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true},
{field: 'PayMoney', title: '实收/实付',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true},
// {field: 'Money', title: '金额',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-Money'},
{field: 'ClientTypeName', title: '付款对象',width: 180, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-ClientTypeName'},
{field: 'EmName', title: '制单人员',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true},
......@@ -1216,7 +1216,7 @@ export default {
}
}, err => {})
}
},
Financial_post_GetBranchAccountList(){ //获取交易方式列表
this.apipost('Financial_post_GetBranchAccountList',{}, res => {
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ e16e9ffd
......@@ -702,11 +702,11 @@
<button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">{{$t('objFill.mergerapproval')}}</button>
<button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">{{$t('objFill.closemergerapproval')}}</button>
<button v-loading="hbBtn" v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">{{$t('ios.shenpi')}}</button>
<button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">{{$t('objFill.Handdistributionfeeincome')}}</button>
<button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">{{$t('objFill.handdistributionfeeincome')}}</button>
<button class="hollowFixedBtn" @click="ZhiDanChongDi"> {{$t('objFill.precharge')}}</button>
<!-- v-if="F_Advance_Match" -->
<button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"
v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? $t('objFill.Disableapproval') : $t('objFill.Oneclickapproval')}}</button>
v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? $t('objFill.disableapproval') : $t('objFill.oneclickapproval')}}</button>
<button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn"
@click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
<button class="hollowFixedBtn" @click="BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1), BOSSBtn = false"
......@@ -1169,7 +1169,7 @@
class="iconfont icon-ico_commodity_defaul"
@click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('objFill.Urgesbtoexamine')" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('objFill.urgesbtoexamine')" placement="top">
<i v-if="msg.Conditon==1 && item.IsFinancePushOn==1" class="iconfont icon-cuishou"
@click="cuishen('Financial_post_SetFinancePushOn', item.FrID)"></i>
</el-tooltip>
......@@ -1193,11 +1193,11 @@
<i v-if="active==2" class="iconfont icon-zhifupeizhiguanli"
@click="showjiaoyi(item.FrID)"></i>
</el-tooltip> -->
<el-tooltip class="item" :content="$t('objFill.Commissionsetting')" placement="top"
<el-tooltip class="item" :content="$t('objFill.commissionsetting')" placement="top"
v-if="active==2 && item.Type==1 &&(F_Trademodify == true || isJapanCommission == true)">
<i class="iconfont icon-zhifupeizhiguanli" @click="showTranTax(item.FrID,'1')"></i>
</el-tooltip>
<el-tooltip class="item" :content="$t('objFill.Payersetup')" placement="top"
<el-tooltip class="item" :content="$t('objFill.payersetup')" placement="top"
v-if="(active==2 || active==3)&& istransaction == true && item.Type==2">
<i class="iconfont icon-zhifupeizhiguanli" @click="showTranTax(item.FrID,'2')"></i>
</el-tooltip>
......@@ -1274,7 +1274,7 @@
</div>
</el-dialog>
<!-- 修改交易方式 -->
<el-dialog :title="$t('objFill.Modifytradingmethod')" width="600px" :visible.sync="transactionmode" center :before-close="closeChangeMachie">
<el-dialog :title="$t('objFill.modifytradingmethod')" width="600px" :visible.sync="transactionmode" center :before-close="closeChangeMachie">
<el-form label-width="110px">
<div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'>
<p>{{$t('fnc.fkuanzhanghu')}}：
......@@ -1290,7 +1290,7 @@
</el-option>
</el-select>
</p>
<p>{{$t('objFill.Modifyexchangeratetips')}}</p>
<p>{{$t('objFill.modifyexchangeratetips')}}</p>
</div>
</el-form>
......@@ -1299,7 +1299,7 @@
<el-button class="normalBtn" type="primary" @click="preservetransaction()">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
<el-dialog :title="$t('objFill.Oneclickapproval')" width="400px" :visible.sync="BOSSDialog" center :close-on-press-escape="false"
<el-dialog :title="$t('objFill.oneclickapproval')" width="400px" :visible.sync="BOSSDialog" center :close-on-press-escape="false"
:close-on-click-modal="false">
<template v-if="!BOSSDialogText">
<el-form label-width="110px">
......@@ -1326,10 +1326,10 @@
</template>
</el-dialog>
<el-dialog custom-class='w400' :title="$t('objFill.Tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<el-dialog custom-class='w400' :title="$t('objFill.tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<template>
<el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')+'：'">
<el-form-item :label="$t('objFill.tothedocumenter')+'：'">
<el-select v-model="zhuanjiaoMsg.CreateBy" filterable remote reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethodEx" @change="$forceUpdate()">
<el-option v-for="item in searchList" :key="item.empId" :label="item.name" :value="item.empId">
......@@ -1346,7 +1346,7 @@
</div>
</template>
</el-dialog>
<el-dialog custom-class='w400' :title="$t('objFill.Handpartscharge')" :visible.sync="HandState" center>
<el-dialog custom-class='w400' :title="$t('objFill.handpartscharge')" :visible.sync="HandState" center>
<template>
<el-form label-width="100px">
<el-form-item :label="$t('visa.v_tuanhao')">
......@@ -1367,7 +1367,7 @@
<shouxufei :transTax="transTax" @success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei>
</template>
<el-dialog :title="$t('objFill.Modifythepayer')" width="300px" :visible.sync="PaymentSync" center :before-close="closeChangeMachie">
<el-dialog :title="$t('objFill.modifythepayer')" width="300px" :visible.sync="PaymentSync" center :before-close="closeChangeMachie">
<el-form class="cdForm" label-width="90px">
<el-form-item :label="$t('fnc.khleixing')" prop="ClientType">
<el-select filterable v-model='transTax.ClientType' :placeholder="$t('fnc.khleixing')"
......@@ -1413,7 +1413,7 @@
</el-form-item>
</el-form>
<p style="color: red;text-align: right;padding: 5px;">{{$t('objFill.Balanceouttisp')}}</p>
<p style="color: red;text-align: right;padding: 5px;">{{$t('objFill.balanceouttisp')}}</p>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="yfcdLoading">
<tr>
<th></th>
......@@ -1445,7 +1445,7 @@
</el-tooltip>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('objFill.Prepaymentrefund')" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('objFill.prepaymentrefund')" placement="top-start">
<button class="normalBtn" @click="goUrlZD(item)">
<i class="el-icon-right"></i>
</button>
......
src/components/FinancialModule/GetWOrkTransferPageLis.vue
View file @ e16e9ffd
......@@ -117,7 +117,7 @@
.boss_btn span{
color: #2BB87C;
}
</style>
<template >
......@@ -132,7 +132,7 @@
<button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
<button class="hollowFixedBtn" v-if="msg.Conditon === 3" @click="BOSSBtnClick(2)">转交</button>
<button class="hollowFixedBtn" v-if="msg.Conditon === 1" @click="getExchange2">批量转交</button>
</li>
</ul>
</div>
......@@ -178,11 +178,11 @@
</el-popover>
</td>
<td>
<span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
<span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
<el-tooltip class="item" effect="dark" :content="$t('objFill.zuijiatuankuan')" placement="top">
<span v-if="item.OtherType == 1" class="zhuiClass">{{$t('objFill.chase')}}</span>
</el-tooltip>
</td>
<td class="_number">
<template v-if="item.TCIDAndTCNUMList.length>0">
......@@ -212,10 +212,10 @@
</template>
<template v-else-if="item.OrderSource==11 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">{{$t('fnc.tsbianhao')}}：{{item.SourceID}}</p>
</template>
</template>
<template v-else-if="item.OrderSource==12 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">{{$t('fnc.smjpbianhao')}}：{{item.SourceID}}</p>
</template>
</template>
<template v-else-if="item.OrderSource==0">
<p class="_TCIDAndTCNUMList">{{ item.BranchName }}-{{item.DepartName}} </p>
</template>
......@@ -226,7 +226,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">
......@@ -250,10 +250,10 @@
<span class="_color_gar">{{$t('fnc.huikuanren')}}：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===2'>
<span class="_color_gar">{{$t('fnc.fkduixiang')}}：</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">{{$t('fnc.no')}}</span>
<span class="_color_gar">{{$t('fnc.no')}}</span>
</template>
</td>
<td valign="middle">
......@@ -398,10 +398,10 @@
</template>
</el-dialog>
<el-dialog custom-class='w400' :title="$t('objFill.Tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<el-dialog custom-class='w400' :title="$t('objFill.tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<template>
<el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')">
<el-form-item :label="$t('objFill.tothedocumenter')">
<el-select
v-model="zhuanjiaoMsg.CreateBy"
filterable
......@@ -430,10 +430,10 @@
</template>
</el-dialog>
<!-- 批量转交 -->
<el-dialog custom-class='w400' :title="$t('objFill.Tothedocumenter')" :visible.sync="zhuanjiaoBox2" center>
<el-dialog custom-class='w400' :title="$t('objFill.tothedocumenter')" :visible.sync="zhuanjiaoBox2" center>
<template>
<el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')">
<el-form-item :label="$t('objFill.tothedocumenter')">
<el-select
v-model="zhuanjiaoMsg2.CreateBy"
filterable
......@@ -525,7 +525,7 @@ export default {
WorkFlowId:0,
Description:''
},
updateMsg:{
updateMsg:{
FrID:0,
OTradeDate:'',
TradeDate:'',
......@@ -671,7 +671,7 @@ export default {
this.BoxState=false;
if(res.data.resultCode==1){
this.Success(res.data.message);
this.getPageList();
}else{
this.Error(res.data.message);
......@@ -716,7 +716,7 @@ export default {
message: this.$t('ios.yi') + this.$t('pub.cancelBtn')
});
});
},
//转交
getExchange(FrID){
......@@ -764,7 +764,7 @@ export default {
}else{
this.$message.error(res.data.message);
this.loading = false;
this.checkList = [];
this.checkList = [];
this.getPageList(1)
this.BOSSDialogText = false;
}
......@@ -788,7 +788,7 @@ export default {
this.BOSSDialog = true;
}
}
},
goTicketPage(data) { // 跳转机票
this.$router.push({ name: 'TicketManager',query:{id:data.SourceID,blank:'y',tab:'票务管理'} })
......@@ -799,7 +799,7 @@ export default {
this.zhuanMsg.TransferEmpId = this.msg.CreateBy
let msg = [];
msg.push(this.zhuanMsg);
this.BOSSDialogText = true;
this.BOSSDialogText = true;
if (this.BOSSBtn2) {
this.zhuanMsg.WorkFlowId = this.checkList[this.bossLen-1]
this.loading = true;
......@@ -811,7 +811,7 @@ export default {
}else{
this.$message.error(res.data.message);
this.loading = false;
this.checkList = [];
this.checkList = [];
this.getPageList(1)
}
},err=>{})
......
src/components/FinancialModule/RecPayQuery.vue
View file @ e16e9ffd
......@@ -720,10 +720,10 @@
</div>
</div>
<el-dialog custom-class='w400' :title="$t('objFill.Tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<el-dialog custom-class='w400' :title="$t('objFill.tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<template>
<el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')">
<el-form-item :label="$t('objFill.tothedocumenter')">
<el-select v-model="zhuanjiaoMsg.CreateBy" filterable remote reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod" @change="$forceUpdate()">
<el-option v-for="item in searchList" :key="item.empId" :label="item.name" :value="item.empId">
......@@ -760,7 +760,7 @@
</div>
</el-dialog>
<!-- 修改交易方式 -->
<el-dialog :title="$t('objFill.Modifytradingmethod')" width="600px" :visible.sync="transactionmode" center>
<el-dialog :title="$t('objFill.modifytradingmethod')" width="600px" :visible.sync="transactionmode" center>
<el-form label-width="110px">
<div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'>
<p>{{$t('fnc.fkuanzhanghu')}}：
......@@ -776,7 +776,7 @@
</el-option>
</el-select>
</p>
<p>{{$t('objFill.Modifyexchangeratetips')}}</p>
<p>{{$t('objFill.modifyexchangeratetips')}}</p>
</div>
</el-form>
......
src/components/FinancialModule/RecPayQueryWB.vue
View file @ e16e9ffd
......@@ -56,7 +56,7 @@
.icon-shenhebohui{color: #E95252}
.icon-icon-zancun{color: #FF9C01}
.zhuiClass{
}
.singeRowTable tr:hover{background-color: white}
._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px}
......@@ -318,10 +318,10 @@
</v-table>
</div>
<el-dialog custom-class='w400' :title="$t('objFill.Tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<el-dialog custom-class='w400' :title="$t('objFill.tothedocumenter')" :visible.sync="zhuanjiaoBox" center>
<template>
<el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')">
<el-form-item :label="$t('objFill.tothedocumenter')">
<el-select
v-model="zhuanjiaoMsg.CreateBy"
filterable
......@@ -460,7 +460,7 @@ Vue.component('table-RecPay',{ //收支样式
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
收入
收入
</span>
<span v-if="rowData.Type==5" style="display: inline-block;
padding: 2px 8px;
......@@ -1233,7 +1233,7 @@ export default {
}
}, err => {})
}
},
Financial_post_GetBranchAccountList(){ //获取交易方式列表
this.apipost('Financial_post_GetBranchAccountList',{}, res => {
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ e16e9ffd
......@@ -804,7 +804,7 @@
<template v-if="(isHandFee&&is_HandFee)||(is_HandFee&&this.GetDetail.Status==0)">
<div>
<p>
{{$t('objFill.Handpartscharge')}}：
{{$t('objFill.handpartscharge')}}：
<span>
<el-select v-model='HandFee.BranchId' class="w135 _border_b_1" :placeholder="$t('objFill.qinxuanzheshoupeifei')"
@change="chooseHandFee">
......@@ -814,7 +814,7 @@
</el-select>
</span>
<template v-if="HandFeeDetail">
<span style="margin-left: 20px;">{{$t('objFill.Handpartscharge')}}{{$t('hotel.hotel_Currency')}}：{{HandFeeDetail.CurrencyName}}</span>
<span style="margin-left: 20px;">{{$t('objFill.handpartscharge')}}{{$t('hotel.hotel_Currency')}}：{{HandFeeDetail.CurrencyName}}</span>
</template>
<span style="margin-left: 20px;color: red;">{{$t('objFill.shoupeifeizdscts')}}</span>
</p>
......
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