Commit d33141bf authored by youjie's avatar youjie

no message

parent a8c0ede1
...@@ -51,7 +51,8 @@ ...@@ -51,7 +51,8 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="addBtn"/> <input v-if="btnShow" type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="addBtn"/>
<input v-else type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/>
</li> </li>
...@@ -213,8 +214,10 @@ ...@@ -213,8 +214,10 @@
</div> </div>
<el-dialog title="资金调拨类型" :visible.sync="isCapitalAllocation" width="450px"> <el-dialog title="资金调拨类型" :visible.sync="isCapitalAllocation" width="450px">
<div style="text-align: center;"> <div style="text-align: center;">
<input v-if="btnShow" type="button" class="normalBtn" value="日本资金调拨" @click="goAddurl('addCapitalAllocation',1)"/> <template v-if="btnShow">
<input v-if="btnShow" type="button" class="normalBtn" value="台湾资金调拨" @click="goAddurl('addCapitalAllocation',2)"/> <input type="button" class="normalBtn" value="日本资金调拨" @click="goAddurl('addCapitalAllocation',1)"/>
<input type="button" class="normalBtn" value="台湾资金调拨" @click="goAddurl('addCapitalAllocation',2)"/>
</template>
<input type="button" class="normalBtn" value="通用资金调拨" @click="goURL('addCapitalAllocation')"/> <input type="button" class="normalBtn" value="通用资金调拨" @click="goURL('addCapitalAllocation')"/>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
......
...@@ -423,8 +423,7 @@ export default { ...@@ -423,8 +423,7 @@ export default {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.msg.RB_Depart_Id = userInfo.RB_Department_Id; this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id; this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
// 是否日本调拨 // fengs: 1日本调拨 2台湾调拨
if(this.$route.query.fengs){ if(this.$route.query.fengs){
if(this.$route.query.fengs==1){ if(this.$route.query.fengs==1){
this.msg.RB_Branch_Id = 1218; this.msg.RB_Branch_Id = 1218;
......
...@@ -608,7 +608,7 @@ ...@@ -608,7 +608,7 @@
</template> </template>
</el-table-column> </el-table-column>
<template slot="append" > <template slot="append" >
<div class="row justify-sb " style="padding:10px;"> <div class="row justify-sb" style="padding:10px;">
<div class="cF1416C"> <div class="cF1416C">
<div v-if="item.remark" style="min-width: 200px;max-width: 300px;"> <div v-if="item.remark" style="min-width: 200px;max-width: 300px;">
{{$t('pub.pubRemark')}}{{ item.remark }} {{$t('pub.pubRemark')}}{{ item.remark }}
......
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