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

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -73,7 +73,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}(${item.AccountHolder})`'
                                     :value='item.ID'
@@ -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-if="isShowCheckAll" 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,10 @@ export default {
             allBPrice:0,
             allWPrice:0,
             userInfo:{},
+            //是否全选
+            isCheckAll:false,
+            //是否显示全选框
+            isShowCheckAll:false,
         }
     },
     created(){
@@ -448,6 +453,12 @@ export default {
       
     }
   },methods:{
+    //选择付款对象出现全选框
+    getClientId(id){
+      if(id>0){
+        this.isShowCheckAll=true;
+      }
+    },
     Export(){
             let msg=this.msg;
             msg.EmployeeId = this.userInfo.EmployeeId;
@@ -548,7 +559,7 @@ export default {
         },
         getList(){ //获取列表
             this.checkList=[];        
-            // this.loading = true
+            this.loadingTable = true
             if( this.msg.ClientID == '' ){
                 this.msg.ClientID = 0;
             }
@@ -561,8 +572,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 +612,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 +846,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;

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1324,6 +1324,7 @@
       this.isUpdate = this.$route.query.isUpdate;
       this.msg.TCIDs = this.$route.query.id;
       this.NewCombinationNum = this.$route.query.NewCombinationNum;
+      this.LineId = this.$route.query.lineId ? this.$route.query.lineId : 0
       if (this.$route.query.OutBranchId == 1216) {
         this.IsShowRMB = true;
       }

src/components/dmc/manager/dmcTotalTable.vue

@@ -953,7 +953,8 @@
             isUpdate: true,
             OutBranchId:obj.OutBranchId,
             blank: 'y',
-            tab: title
+            tab: title,
+            lineId: outItem.PriceCommonList[0].LineId
           }
         })
       },

src/components/leaderPay2.vue

@@ -1643,8 +1643,8 @@
               if (!Diningmap[ai.UseTimeStr]) {
                 Diningdest.push({
                   UseTimeStr: ai.UseTimeStr,
-                  DiningID: ai.DiningID,
-                  id: ai.DiningID + ai.UseTimeStr,
+                  DiningID: ai.NewDiningID,
+                  id: ai.NewDiningID + ai.UseTimeStr,
                   data: [ai]
                 });
                 Diningmap[ai.UseTimeStr] = ai;
@@ -1652,7 +1652,7 @@
                 let list = []
                 for (var j = 0; j < Diningdest.length; j++) {
                   var dj = Diningdest[j];
-                  if (dj.UseTimeStr == ai.UseTimeStr && dj.DiningID == ai.DiningID) {
+                  if (dj.UseTimeStr == ai.UseTimeStr && dj.NewDiningID == ai.NewDiningID) {
                     dj.data.push(ai);
                     break;
                   } else {
@@ -1662,8 +1662,8 @@
                 for (let i = 0; i < list.length; i++) {
                   Diningdest.push({
                     UseTimeStr: ai.UseTimeStr,
-                    DiningID: ai.DiningID,
-                    id: ai.DiningID + ai.UseTimeStr,
+                    DiningID: ai.NewDiningID,
+                    id: ai.NewDiningID + ai.UseTimeStr,
                     data: [ai]
                   });
                 }