资金池

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -421,7 +421,7 @@
                             <td v-else-if="OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
                             <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
                             || GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
-                            || GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58
+                            || GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58 || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
                             || GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
                             <td v-if="GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
                             <td v-if="GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 57 || GetDetail.TemplateId === 58" @click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span class="_jump_page _font_bold">车资分摊</span> </td>

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -62,7 +62,7 @@
                     </el-col>
                     <el-col :span="4" :gutter="35">
                         <el-form-item :label="$t('fnc.fkduixiang')">
-                            <el-select  filterable  v-model='msg.ClientID' >
+                            <el-select  filterable  v-model='msg.ClientID' @change='getClientId(msg.ClientID)'>
                                 <el-option v-for='item in ClientAccountList'
                                     :label='item.AccountAlias'
                                     :value='item.ID'
@@ -137,7 +137,7 @@
         <div class="cm_content">
             <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
                 <tr>
-                    <!-- <th rowspan="2"></th> -->
+                    <th rowspan="2" width="60"><input v-if="isShowCheckAll" type="checkbox" v-model="isCheckAll" @change="checkAllOrder()"/></th>
                     <th rowspan="2">{{$t('system.query_company')}}</th>
                     <th rowspan="2">{{$t('fnc.danhao')}}</th>
                     <th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th>
@@ -157,7 +157,7 @@
                     <th width="">{{$t('fnc.yueacc')}}</th>
                 </tr>
                 <tr>
-                    <td :colspan="5">{{$t('fnc.a_qcyue')}}：</td>
+                    <td :colspan="6">{{$t('fnc.a_qcyue')}}：</td>
                     <td></td>
                     <td></td>
                     <td> {{ moneyFormat(RStartMoney) }} </td>
@@ -186,8 +186,8 @@
                         <span v-if=" item.Type == 2">{{ item.ClientTypeName }}：{{ item.RemitterName }}</span>
                     </td>
                     <td>
-                        <span v-if=" item.Type == 1">{{$t('fnc.hkshijian')}}：{{ item.TradeDate }}</span>
-                        <span v-if=" item.Type == 2">{{$t('fnc.a_fkshijian')}}：{{ item.TradeDate }}</span>
+                        <span v-if=" item.Type == 1">{{$t('fnc.hkshijian')}}：<span v-if="item.TradeDate">{{ item.TradeDate }}</span></span>
+                        <span v-if=" item.Type == 2">{{$t('fnc.a_fkshijian')}}：<span v-if="item.TradeDate">{{ item.TradeDate }}</span></span>
                     </td>
                     <!-- <td>
                         {{ item.AccountNumber }}
@@ -215,7 +215,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td :colspan="5">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
+                    <td :colspan="6">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
                     <!-- <td></td>
                     <td></td>
                     <td> {{ moneyFormat(endRStartMoney) }} </td>
@@ -263,7 +263,7 @@
                   </tr>
                   <tr v-else class="_show_class">
                     <td>
-                      <el-select  filterable  v-model='item.AccName'  @change="clearAccBank()" class=" _border_b_1">
+                      <el-select  filterable  v-model='item.AccName'  @change="clearAccBank(payMsg.AccName)" class=" _border_b_1">
                         <el-option v-for='i in AccListT'
                                    :label='i.Name'
                                    :value='i.Name'
@@ -303,7 +303,7 @@
                 </template>
                 <tr>
                   <td>
-                    <el-select  filterable  v-model='payMsg.AccName'  @change="clearAccBank()" class=" _border_b_1">
+                    <el-select  filterable  v-model='payMsg.AccName'  @change="clearAccBank(payMsg.AccName)" class=" _border_b_1">
                       <el-option v-for='i in AccListT'
                                  :label='i.Name'
                                  :value='i.Name'
@@ -453,6 +453,7 @@ export default {
             TradeDate:'',
             BankList:[],
           },
+          TradeDate:'',
           AccListT:[],
           accountListT:[],
           listAllMoney:0,
@@ -465,6 +466,11 @@ export default {
           wZhi:0,
           bShou:0,
           bZhi:0,
+          //是否全选
+          isCheckAll:false,
+          //是否显示全选框
+          isShowCheckAll:false,
+          Newaccount:'',
         }
     },created(){
       this.userInfo = this.getLocalStorage();
@@ -750,15 +756,16 @@ export default {
           this.payMsg.Name = x.Name;
         }
       });
-      if(i===1){
-        this.bankaccount_post_GetListS()
-      }
-      if(i===2){
-        this.BankAccount_post_GetPlatformList()
-      }
-      if(i===3){
-        this.BankAccount_post_GetCashAccountList()
-      }
+      // if(i===1){
+      //   this.bankaccount_post_GetListS()
+      // }
+      // if(i===2){
+      //   this.BankAccount_post_GetPlatformList()
+      // }
+      // if(i===3){
+      //   this.BankAccount_post_GetCashAccountList()
+      // }
+      this.accountList=[];
       if(i===4){
         this.BankAccount_post_GetCashPoolList()
       }
@@ -809,7 +816,7 @@ export default {
       }, err => {})
     },
     BankAccount_post_GetCashPoolList(query){ // 获取资金池账
-      this.apipost('BankAccount_post_GetCashPoolList',{TypeId:4,BranchId:-1,Alias:''}, res => {
+      this.apipost('BankAccount_post_GetCashPoolList',{TypeId:this.Newaccount,BranchId:-1,Alias:''}, res => {
         if(res.data.resultCode === 1) {
           let data = res.data.data;
           data.forEach(x=>{
@@ -822,9 +829,14 @@ export default {
         }
       }, err => {})
     },
-    clearAccBank(){  // 选择账户类型清空数据
+    clearAccBank(Name){  // 选择账户类型清空数据
       this.payMsg.Type = '';
       this.payMsg.AccountId = '';
+      this.AccListT.forEach(item=>{
+        if(item.Name==Name){
+          this.Newaccount=item.ID;
+        }
+      })
     },
     submitAddChuNa(){
       // if(this.payMsgList.length===0) return this.$message.error('请选择交易方式！');
@@ -850,6 +862,39 @@ export default {
         this.allLoading = false
       },null)
     },
+    //选择付款对象出现全选框
+    getClientId(id){
+      if(id>0||this.AccountId>0){
+        this.isShowCheckAll=true;
+      }else{
+        this.isShowCheckAll=false;
+      }
+    },
+    //点击全选
+        checkAllOrder(){
+          this.checkList=[]
+          if(this.isCheckAll){
+            this.DataList.forEach(x=>{
+              x.check=true;
+            })
+          }else{
+            this.DataList.forEach(x=>{
+              x.check=false;
+            })
+          }
+          this.DataList.forEach((x,index)=>{
+            if(x.check&&x.ClientID>0){
+              this.checkList[index] = {
+                FinanceId:x.FinanceId,
+                Type:x.Type,
+                ClientID:x.ClientID,
+                ClientType:x.ClientType,
+                OriginalMoney:x.OriginalMoney,
+                Money:x.Money,
+              }
+            }
+          })
+        },
     addCheckbox(obj,index){
       // if(obj.Is_Cashier===1){
       //   obj.check = false;