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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -929,9 +929,7 @@
       </tr>
       <tr>
         <th width="100">使用时间</th>
-        <th width="40">
-          <el-checkbox :isIndeterminate="isIndeterminate4" v-model="checkedAll4" @change="getCheckedAll(4)"></el-checkbox>
-        </th>
+        <th width="55"><el-checkbox :indeterminate="isIndeterminate4" v-model="checkedAll4" @change="getCheckedAll(4)"></el-checkbox></th>
         <th width="180">景点名称</th>
         <th width="100">总人数</th>
         <th width="">门票类别</th>
@@ -2078,7 +2076,6 @@
           })
         }
         this.getNewChecked(checkeds,checkedsAll,type)
-        this.$forceUpdate()
       },
       getNewChecked(checkeds,checkedsAll,type){
         if(checkeds.length>0&&checkeds.length==checkedsAll.length){
@@ -2090,13 +2087,14 @@
           if(type==1){ this.isIndeterminate1 = true }
           if(type==2){ this.isIndeterminate2 = true }
           else if(type==3){ this.isIndeterminate3 = true }
-          else if(type==4){ this.isIndeterminate4 = true }
+          else if(type==4){this.isIndeterminate4 = true}
         }else if(checkeds.length==0){
           if(type==1){ this.checkedAll1 = false }
           if(type==2){ this.checkedAll2 = false }
           else if(type==3){ this.checkedAll3 = true }
           else if(type==4){ this.checkedAll4 = true }
         }
+        // this.$forceUpdate()
       },
       // 全选
       getCheckedAll(type){
@@ -2182,7 +2180,7 @@
           TCID: this.$route.query.id
         }, res => {
           if (res.data.resultCode == 1) {
-            console.log(res.data.data,'成本财务单据')
+            // console.log(res.data.data,'成本财务单据')
             res.data.data.forEach(item=>{
               if(item.EduCommissionEmp==null||item.EduCommissionEmp==""){
                 this.getOrderList('',item,2,item.OrderSource)