资金调拨新增台湾

src/components/FinancialModule/CapitalAllocation.vue

@@ -51,8 +51,7 @@
     <div class="query-box">
       <ul>
         <li>
-          <input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')" @click="goAddurl('addCapitalAllocation')"/>
-          <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
+          <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="addBtn"/>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
           <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/>
         </li>
@@ -212,12 +211,23 @@
             </el-pagination>
         </div>
     </div>
+    <el-dialog title="资金调拨类型" :visible.sync="isCapitalAllocation" width="450px">
+      <div style="text-align: center;">
+        <input v-if="btnShow" type="button" class="normalBtn" value="日本资金调拨" @click="goAddurl('addCapitalAllocation',1)"/>
+        <input v-if="btnShow" type="button" class="normalBtn" value="台湾资金调拨" @click="goAddurl('addCapitalAllocation',2)"/>
+        <input type="button" class="normalBtn" value="通用资金调拨" @click="goURL('addCapitalAllocation')"/>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="isCapitalAllocation = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
 export default {
   data(){
     return {
+      isCapitalAllocation: false,
       msg: {
         pageIndex: 1,
         pageSize: 15,
@@ -277,6 +287,9 @@ export default {
     }
   },
   methods:{
+    addBtn(){
+      this.isCapitalAllocation = true
+    },
     getList: function () {  // 获取列表数据
       if (this.msg.FrID === '') {
         this.msg.FrID = 0
@@ -359,10 +372,16 @@ export default {
         }
       }, err => {})
     },
-    goAddurl(url){
-       this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
+    goAddurl(url,type){
+        this.isCapitalAllocation = false
+        if(type==1){
+          this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
+        }else{
+          this.$router.push({ name: url,query:{fengs: 2,blank: 'y', tab: '新增资金调拨'}})
+        }
     },
     goURL: function (url, edit, id) {
+       this.isCapitalAllocation = false
        this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y', tab: '新增资金调拨'}})
     },
     goDetail:function(url,id){

src/components/FinancialModule/addCapitalAllocation.vue

@@ -393,7 +393,8 @@ export default {
         BackId: 0,
         TypeId: 0,
         BankType: 0,
-        Alias: ''
+        Alias: '',
+        StandCurrBranchId: 0
       },
       AccList: [],
       accountList: [],
@@ -422,9 +423,20 @@ export default {
       let userInfo = this.getLocalStorage();
       this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
       this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
+      // 是否日本调拨
+      
       if(this.$route.query.fengs){
-        this.msg.RB_Branch_Id = 1218;
+        if(this.$route.query.fengs==1){
+          this.msg.RB_Branch_Id = 1218;
+        }
+        if(this.$route.query.fengs==2){
+          this.msg.RB_Branch_Id = 1220;
+        }
       }
+      if(this.msg.RB_Branch_Id==1218||this.msg.RB_Branch_Id==1220){
+        this.queryAccMsg.StandCurrBranchId = this.msg.RB_Branch_Id;
+      }
+      
       this.BillName = userInfo.GroupName;
       if(userInfo.RB_Group_id==96){
         this.msg.TemplateId = 145;