Skip to content

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

修复bug

parent 2f106459
Expand all Show 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 = { ...@@ -144,16 +144,16 @@ export const obj = {
expensenote: 'Expense Notes', expensenote: 'Expense Notes',
lookonlyatuploads: 'Only look at uploading invoices', lookonlyatuploads: 'Only look at uploading invoices',
urgesbtoexamine: 'Urge sb. to examine', urgesbtoexamine: 'Urge sb. to examine',
commissionsetting: 'Commissionsetting', commissionsetting: 'commissionsetting',
payersetup: 'payer setup', payersetup: 'payer setup',
modifytheexchangerate: 'modifytheexchangerate', 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', 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', tothedocumenter: 'Document maker to hand over',
handpartscharge: 'hand charge', handpartscharge: 'hand charge',
modifythepayer: 'Modifythepayer', modifythepayer: 'modifythepayer',
balanceouttisp: 'Note: Please check the documents and click below to confirm the offset', balanceouttisp: 'Note: Please check the documents and click below to confirm the offset',
prepaymentrefund: 'Prepaymentrefund', prepaymentrefund: 'prepaymentrefund',
zhutuanhao: 'Group number', zhutuanhao: 'Group number',
yinliuren: 'Drainage man', yinliuren: 'Drainage man',
guanlian: 'connected', 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 = { ...@@ -135,25 +135,25 @@ export const obj = {
invoicevoucherreview: '伝票審査です', invoicevoucherreview: '伝票審査です',
mergerapproval: '合並審批', mergerapproval: '合並審批',
closemergerapproval: '關閉合並審批', closemergerapproval: '關閉合並審批',
Handdistributionfeeincome: '手配費收入', handdistributionfeeincome: '手配費收入',
Disableapproval: '關閉壹鍵審批入', disableapproval: '關閉壹鍵審批入',
Oneclickapproval: '壹鍵審批', oneclickapproval: '壹鍵審批',
noOneclicktransfer: '關閉壹鍵轉交', noOneclicktransfer: '關閉壹鍵轉交',
oneclicktransfer: '壹鍵轉交', oneclicktransfer: '壹鍵轉交',
payroll: '工資單', payroll: '工資單',
expensenote: '費用備注', expensenote: '費用備注',
lookonlyatuploads: '只看待上傳發票的', lookonlyatuploads: '只看待上傳發票的',
Urgesbtoexamine: '催審', urgesbtoexamine: '催審',
Commissionsetting: '手續費設置', commissionsetting: '手續費設置',
Payersetup: '付款對象設置', payersetup: '付款對象設置',
modifytheexchangerate: '修改彙率', modifytheexchangerate: '修改彙率',
Modifytradingmethod: '修改交易方式', modifytradingmethod: '修改交易方式',
Modifyexchangeratetips: '注意：如果修改爲不同幣種的賬戶，需修改單據的彙率', modifyexchangeratetips: '注意：如果修改爲不同幣種的賬戶，需修改單據的彙率',
Tothedocumenter: '制單人轉交', tothedocumenter: '制單人轉交',
Handpartscharge: '手配費', handpartscharge: '手配費',
Modifythepayer: '修改付款對象', modifythepayer: '修改付款對象',
Balanceouttisp: '注：沖抵請勾選單據後點擊下方確認沖抵', balanceouttisp: '注：沖抵請勾選單據後點擊下方確認沖抵',
Prepaymentrefund: '預付款退款', prepaymentrefund: '預付款退款',
zhutuanhao: '組團號', zhutuanhao: '組團號',
yinliuren: '引流人', yinliuren: '引流人',
guanlian: '關聯', guanlian: '關聯',
......
src/components/FinancialModule/Costdocuments.vue
View file @ e16e9ffd
...@@ -318,10 +318,10 @@ ...@@ -318,10 +318,10 @@
</v-table> </v-table>
</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> <template>
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')"> <el-form-item :label="$t('objFill.tothedocumenter')">
<el-select <el-select
v-model="zhuanjiaoMsg.CreateBy" v-model="zhuanjiaoMsg.CreateBy"
filterable filterable
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ e16e9ffd
...@@ -702,11 +702,11 @@ ...@@ -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 && 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-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-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> <button class="hollowFixedBtn" @click="ZhiDanChongDi"> {{$t('objFill.precharge')}}</button>
<!-- v-if="F_Advance_Match" --> <!-- v-if="F_Advance_Match" -->
<button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false" <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" <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn"
@click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button> @click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
<button class="hollowFixedBtn" @click="BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1), BOSSBtn = false" <button class="hollowFixedBtn" @click="BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1), BOSSBtn = false"
...@@ -1169,7 +1169,7 @@ ...@@ -1169,7 +1169,7 @@
class="iconfont icon-ico_commodity_defaul" class="iconfont icon-ico_commodity_defaul"
@click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i> @click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i>
</el-tooltip> </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" <i v-if="msg.Conditon==1 && item.IsFinancePushOn==1" class="iconfont icon-cuishou"
@click="cuishen('Financial_post_SetFinancePushOn', item.FrID)"></i> @click="cuishen('Financial_post_SetFinancePushOn', item.FrID)"></i>
</el-tooltip> </el-tooltip>
...@@ -1193,11 +1193,11 @@ ...@@ -1193,11 +1193,11 @@
<i v-if="active==2" class="iconfont icon-zhifupeizhiguanli" <i v-if="active==2" class="iconfont icon-zhifupeizhiguanli"
@click="showjiaoyi(item.FrID)"></i> @click="showjiaoyi(item.FrID)"></i>
</el-tooltip> --> </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)"> v-if="active==2 && item.Type==1 &&(F_Trademodify == true || isJapanCommission == true)">
<i class="iconfont icon-zhifupeizhiguanli" @click="showTranTax(item.FrID,'1')"></i> <i class="iconfont icon-zhifupeizhiguanli" @click="showTranTax(item.FrID,'1')"></i>
</el-tooltip> </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"> v-if="(active==2 || active==3)&& istransaction == true && item.Type==2">
<i class="iconfont icon-zhifupeizhiguanli" @click="showTranTax(item.FrID,'2')"></i> <i class="iconfont icon-zhifupeizhiguanli" @click="showTranTax(item.FrID,'2')"></i>
</el-tooltip> </el-tooltip>
...@@ -1274,7 +1274,7 @@ ...@@ -1274,7 +1274,7 @@
</div> </div>
</el-dialog> </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"> <el-form label-width="110px">
<div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'> <div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'>
<p>{{$t('fnc.fkuanzhanghu')}}： <p>{{$t('fnc.fkuanzhanghu')}}：
...@@ -1290,7 +1290,7 @@ ...@@ -1290,7 +1290,7 @@
</el-option> </el-option>
</el-select> </el-select>
</p> </p>
<p>{{$t('objFill.Modifyexchangeratetips')}}</p> <p>{{$t('objFill.modifyexchangeratetips')}}</p>
</div> </div>
</el-form> </el-form>
...@@ -1299,7 +1299,7 @@ ...@@ -1299,7 +1299,7 @@
<el-button class="normalBtn" type="primary" @click="preservetransaction()">{{$t('pub.sureBtn')}}</el-button> <el-button class="normalBtn" type="primary" @click="preservetransaction()">{{$t('pub.sureBtn')}}</el-button>
</div> </div>
</el-dialog> </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"> :close-on-click-modal="false">
<template v-if="!BOSSDialogText"> <template v-if="!BOSSDialogText">
<el-form label-width="110px"> <el-form label-width="110px">
...@@ -1326,10 +1326,10 @@ ...@@ -1326,10 +1326,10 @@
</template> </template>
</el-dialog> </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> <template>
<el-form label-width="100px"> <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 <el-select v-model="zhuanjiaoMsg.CreateBy" filterable remote reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethodEx" @change="$forceUpdate()"> :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"> <el-option v-for="item in searchList" :key="item.empId" :label="item.name" :value="item.empId">
...@@ -1346,7 +1346,7 @@ ...@@ -1346,7 +1346,7 @@
</div> </div>
</template> </template>
</el-dialog> </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> <template>
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item :label="$t('visa.v_tuanhao')"> <el-form-item :label="$t('visa.v_tuanhao')">
...@@ -1367,7 +1367,7 @@ ...@@ -1367,7 +1367,7 @@
<shouxufei :transTax="transTax" @success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei> <shouxufei :transTax="transTax" @success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei>
</template> </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 class="cdForm" label-width="90px">
<el-form-item :label="$t('fnc.khleixing')" prop="ClientType"> <el-form-item :label="$t('fnc.khleixing')" prop="ClientType">
<el-select filterable v-model='transTax.ClientType' :placeholder="$t('fnc.khleixing')" <el-select filterable v-model='transTax.ClientType' :placeholder="$t('fnc.khleixing')"
...@@ -1413,7 +1413,7 @@ ...@@ -1413,7 +1413,7 @@
</el-form-item> </el-form-item>
</el-form> </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"> <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="yfcdLoading">
<tr> <tr>
<th></th> <th></th>
...@@ -1445,7 +1445,7 @@ ...@@ -1445,7 +1445,7 @@
</el-tooltip> </el-tooltip>
</td> </td>
<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)"> <button class="normalBtn" @click="goUrlZD(item)">
<i class="el-icon-right"></i> <i class="el-icon-right"></i>
</button> </button>
......
src/components/FinancialModule/GetWOrkTransferPageLis.vue
View file @ e16e9ffd
...@@ -398,10 +398,10 @@ ...@@ -398,10 +398,10 @@
</template> </template>
</el-dialog> </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> <template>
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')"> <el-form-item :label="$t('objFill.tothedocumenter')">
<el-select <el-select
v-model="zhuanjiaoMsg.CreateBy" v-model="zhuanjiaoMsg.CreateBy"
filterable filterable
...@@ -430,10 +430,10 @@ ...@@ -430,10 +430,10 @@
</template> </template>
</el-dialog> </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> <template>
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')"> <el-form-item :label="$t('objFill.tothedocumenter')">
<el-select <el-select
v-model="zhuanjiaoMsg2.CreateBy" v-model="zhuanjiaoMsg2.CreateBy"
filterable filterable
......
src/components/FinancialModule/RecPayQuery.vue
View file @ e16e9ffd
...@@ -720,10 +720,10 @@ ...@@ -720,10 +720,10 @@
</div> </div>
</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> <template>
<el-form label-width="100px"> <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 <el-select v-model="zhuanjiaoMsg.CreateBy" filterable remote reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod" @change="$forceUpdate()"> :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"> <el-option v-for="item in searchList" :key="item.empId" :label="item.name" :value="item.empId">
...@@ -760,7 +760,7 @@ ...@@ -760,7 +760,7 @@
</div> </div>
</el-dialog> </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"> <el-form label-width="110px">
<div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'> <div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'>
<p>{{$t('fnc.fkuanzhanghu')}}： <p>{{$t('fnc.fkuanzhanghu')}}：
...@@ -776,7 +776,7 @@ ...@@ -776,7 +776,7 @@
</el-option> </el-option>
</el-select> </el-select>
</p> </p>
<p>{{$t('objFill.Modifyexchangeratetips')}}</p> <p>{{$t('objFill.modifyexchangeratetips')}}</p>
</div> </div>
</el-form> </el-form>
......
src/components/FinancialModule/RecPayQueryWB.vue
View file @ e16e9ffd
...@@ -318,10 +318,10 @@ ...@@ -318,10 +318,10 @@
</v-table> </v-table>
</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> <template>
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item :label="$t('objFill.Tothedocumenter')"> <el-form-item :label="$t('objFill.tothedocumenter')">
<el-select <el-select
v-model="zhuanjiaoMsg.CreateBy" v-model="zhuanjiaoMsg.CreateBy"
filterable filterable
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ e16e9ffd
...@@ -804,7 +804,7 @@ ...@@ -804,7 +804,7 @@
<template v-if="(isHandFee&&is_HandFee)||(is_HandFee&&this.GetDetail.Status==0)"> <template v-if="(isHandFee&&is_HandFee)||(is_HandFee&&this.GetDetail.Status==0)">
<div> <div>
<p> <p>
{{$t('objFill.Handpartscharge')}}： {{$t('objFill.handpartscharge')}}：
<span> <span>
<el-select v-model='HandFee.BranchId' class="w135 _border_b_1" :placeholder="$t('objFill.qinxuanzheshoupeifei')" <el-select v-model='HandFee.BranchId' class="w135 _border_b_1" :placeholder="$t('objFill.qinxuanzheshoupeifei')"
@change="chooseHandFee"> @change="chooseHandFee">
...@@ -814,7 +814,7 @@ ...@@ -814,7 +814,7 @@
</el-select> </el-select>
</span> </span>
<template v-if="HandFeeDetail"> <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> </template>
<span style="margin-left: 20px;color: red;">{{$t('objFill.shoupeifeizdscts')}}</span> <span style="margin-left: 20px;color: red;">{{$t('objFill.shoupeifeizdscts')}}</span>
</p> </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