Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -135,9 +135,9 @@
 			</ul>
 		</div>
         <div class="cm_content">
-            <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
+            <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loadingTable">
                 <tr>
-                    <th></th>
+                    <th><input type="checkbox" v-model="isCheckAll" @change="checkAllOrder()"/></th>
                     <th>{{$t('system.query_company')}}</th>
                     <th>{{$t('fnc.danhao')}}</th>
                     <th>{{$t('fnc.a_zhaiyao')}}</th>
@@ -376,6 +376,7 @@ export default {
             ClientAccountList:[],
             GetCostTypeList:[],
             CompanyList:[],
+            loadingTable:false,
             loading:false,
             date:'',
             accType:'',
@@ -416,6 +417,8 @@ export default {
             allBPrice:0,
             allWPrice:0,
             userInfo:{},
+            //是否全选
+            isCheckAll:false,
         }
     },
     created(){
@@ -548,7 +551,7 @@ export default {
         },
         getList(){ //获取列表
             this.checkList=[];        
-            // this.loading = true
+            this.loadingTable = true
             if( this.msg.ClientID == '' ){
                 this.msg.ClientID = 0;
             }
@@ -561,8 +564,7 @@ export default {
             }
             this.allMoney = '';
             this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
-              
-                this.loading = false;
+                this.loadingTable = false
                  if(res.data.resultCode==1){
                     let data = res.data.data;
                     if(data.length){
@@ -602,8 +604,7 @@ export default {
                         this.msg.ClientID = '';
                     }
                 }else{
-                    this.$message.error(res.data.message)
-                    this.loading = false;
+                    this.Error(res.data.message)
                     if( this.msg.ClientID == 0 ){
                         this.msg.ClientID = '';
                     }
@@ -837,6 +838,31 @@ export default {
             })
           }
         },
+        //点击全选
+        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){
+              this.checkList[index] = {
+                FinanceId:x.FinanceId,
+                Type:x.Type,
+                ClientID:x.ClientID,
+                ClientType:x.ClientType,
+                OriginalMoney:x.OriginalMoney,
+                Money:x.Money,
+              }
+            }
+          })
+        },
         addChuNaFun(){  // 添加出纳按钮点击事件
           let count = 0;
           let allBPrice = 0;