Merge branch 'waybill_ZD' of ssh://was.baoshi56.com:10022/var/git/bswas into waybill_ZD

app/Http/Controllers/PackageController.php

@@ -150,6 +150,7 @@ class PackageController extends Controller
         $owners=Owner::get();
         $logistics=Logistic::get();
         if ($request->input('checkSign')){
+            $logistics=$this->checkLogistic($packages);
             if ($request->input('checkSign')=="-1"){
                 $excel=$this->statisticExport($packages,$owners,$logistics);
                 return $excel;
@@ -157,6 +158,7 @@ class PackageController extends Controller
             $id=$id = explode( ',',$request->input('checkSign'));
             $packages=Package::select(DB::raw('owner_id,logistic_id,COUNT(logistic_id) AS count'))
                 ->whereIn('owner_id',$id)->groupBy(['owner_id','logistic_id'])->get();
+            $logistics=$this->checkLogistic($packages);
             $excel=$this->statisticExport($packages,$owners,$logistics);
             return $excel;
 
@@ -164,6 +166,26 @@ class PackageController extends Controller
         return view('weight.package.statistics',["packages"=>$packages,'owners'=>$owners,'logistics'=>$logistics]);
     }
 
+    /*
+     * 根据packages统计记录删选物流公司
+     */
+    public function checkLogistic($packages){
+        $logisticIds=[];
+        foreach ($packages as $package){
+            $isLogistic=true;
+            for ($i=0;$i<count($logisticIds);$i++){
+                if ($package->logistic_id==$logisticIds[$i]){
+                    $isLogistic=false;
+                    break;
+                }
+            }
+            if ($isLogistic){
+                array_push($logisticIds,$package->logistic_id);
+            }
+        }
+        $logistics=Logistic::whereIn('id',$logisticIds)->get();
+        return $logistics;
+    }
 
     /**
      * Display the specified resource.

resources/views/maintenance/role/create.blade.php

@@ -34,12 +34,12 @@
                     </div>
                     <div class="form-group row">
                         <label class="col-2"></label>
-                        <div class="col-8">
+                        <div class="col-5">
                             <input name="authority" hidden   v-model="authorities" >
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.8;text-align: center;">
-                                <ul class="list-group tooltipTarget" style="width: 100%" onselectstart="return false;">
-                                    <li  :title="authority.style ? '双击删除权限' :'双击添加权限'"    v-for="authority in authoritiesAll" :id="authority.name" class="list-group-item list-group-item-action pt-0 pb-0"
-                                         @dblclick="selectedAuthority(authority)" :class="authority.style ? 'active' :''"><span style="cursor: default;" :id="authority.name"> @{{ authority.name }}  </span></li>
+                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
+                                <ul class="list-group tooltipTarget" style="width: 100%"  onselectstart="return false;">
+                                    <li  :data-original-title="authority.style ? '双击删除权限' :'双击添加权限'"    v-for="authority in authoritiesAll" :id="authority.name" class="tooltipTarget list-group-item list-group-item-action pt-0 pb-0"
+                                         @dblclick="selectedAuthority(authority)" :class="authority.style ? 'active' :''"><span style="cursor: default;" > @{{ authority.name }}  </span></li>
                                 </ul>
                             </div>
                             @error('authority')
@@ -48,6 +48,14 @@
                                     </span>
                             @enderror
                         </div>
+                        <div class="col-3" v-if="authoritiesList.length>0">
+                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                                <ul class="list-group tooltipTarget" style="width: 100%"  onselectstart="return false;">
+                                    <li  title="双击删除权限"    v-for="authority in authoritiesList" class=" list-group-item list-group-item-action pt-0 pb-0"
+                                         @dblclick="selectedAuthority(authority)"><span style="cursor: default;"> @{{ authority.name }}  </span></li>
+                                </ul>
+                            </div>
+                        </div>
                     </div>
                     <div class="form-group row">
                         <div class="col-8 offset-2">
@@ -71,16 +79,19 @@
                     @endforeach
                 ],
                 authorities:[{{old('authority')}}],
+                authoritiesList:[],
             },
             mounted:function(){
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 if (this.authorities.length>0){
+                    let authoritiesList=this.authoritiesList;
                     let authoritiesAll=this.authoritiesAll;
                     let authorities=this.authorities;
                     for (let i = 0; i < authorities.length; i++) {
                         authoritiesAll.every(function (authorityAll) {
                             if (authorityAll.id == authorities[i]) {
                                 authorityAll.style = true;
+                                authoritiesList.push({'id':authorityAll.id,'name':authorityAll.name});
                                 return false;
                             }
                             return true;
@@ -92,6 +103,7 @@
                 selectedAuthority:function (e) {
                     let authorities=this.authorities;
                     let authoritiesAll=this.authoritiesAll;
+                    let authoritiesList=this.authoritiesList;
                     let isAuthorty=true;
                     if (authorities) {
                         for (let i = 0; i < authorities.length; i++) {
@@ -104,6 +116,13 @@
                                     }
                                     return true;
                                 });
+                                authoritiesList.every(function (authority,i) {
+                                    if (authority.id==e.id){
+                                        authoritiesList.splice(i,1);
+                                        return false;
+                                    }
+                                    return  true;
+                                });
                                 isAuthorty= false;
                                 break;
                             }
@@ -115,11 +134,15 @@
                         authoritiesAll.every(function (authorityAll) {
                             if (authorityAll.id==e.id){
                                 authorityAll.style=true;
+                                authoritiesList.push({'id':authorityAll.id,'name':authorityAll.name});
                                 return false;
                             }
                             return  true;
                         });
                     }
+                    setTimeout(function(){
+                        $(".tooltipTarget").tooltip({'trigger':'hover'});
+                    },10)
                 },
                 seekAuthority:function (e) {
                     let $val=e.target.value;

resources/views/maintenance/role/edit.blade.php

@@ -40,11 +40,11 @@
                     </div>
                     <div class="form-group row">
                         <label class="col-2"></label>
-                        <div class="col-8">
+                        <div class="col-5">
                             <input name="authority" hidden   v-model="authorities" >
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.8;text-align: center;">
+                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
                                 <ul class="list-group" style="width: 100%" onselectstart="return false;">
-                                    <li  :title="authority.style ? '双击删除权限' :'双击添加权限'"    v-for="authority in authoritiesAll" :id="authority.name" class="list-group-item list-group-item-action pt-0 pb-0"
+                                    <li  :data-original-title="authority.style ? '双击删除权限' :'双击添加权限'"    v-for="authority in authoritiesAll" :id="authority.name" class="list-group-item list-group-item-action pt-0 pb-0"
                                          @dblclick="selectedAuthority(authority)" :class="authority.style ? 'active' :''"><span style="cursor: default;" :id="authority.name"> @{{ authority.name }} </span></li>
                                 </ul>
                             </div>
@@ -54,6 +54,14 @@
                                     </span>
                             @enderror
                         </div>
+                        <div class="col-3" v-if="authoritiesList.length>0">
+                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                                <ul class="list-group tooltipTarget" style="width: 100%"  onselectstart="return false;">
+                                    <li  title="双击删除权限"    v-for="authority in authoritiesList" class=" list-group-item list-group-item-action pt-0 pb-0"
+                                         @dblclick="selectedAuthority(authority)"><span style="cursor: default;"> @{{ authority.name }}  </span></li>
+                                </ul>
+                            </div>
+                        </div>
                     </div>
                     <div class="form-group row">
                         <div class="col-8 offset-2">
@@ -86,16 +94,19 @@
                         @endforeach
                     @endif
                 ],
+                authoritiesList:[],
             },
             mounted:function(){
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 if (this.authorities.length>0){
+                    let authoritiesList=this.authoritiesList;
                     let authoritiesAll=this.authoritiesAll;
                     let authorities=this.authorities;
                     for (let i = 0; i < authorities.length; i++) {
                         authoritiesAll.every(function (authorityAll) {
                             if (authorityAll.id == authorities[i]) {
                                 authorityAll.style = true;
+                                authoritiesList.push({'id':authorityAll.id,'name':authorityAll.name});
                                 return false;
                             }
                             return true;
@@ -107,6 +118,7 @@
                 selectedAuthority:function (e) {
                     let authorities=this.authorities;
                     let authoritiesAll=this.authoritiesAll;
+                    let authoritiesList=this.authoritiesList;
                     let isAuthorty=true;
                     if (authorities) {
                         for (let i = 0; i < authorities.length; i++) {
@@ -119,6 +131,13 @@
                                     }
                                     return true;
                                 });
+                                authoritiesList.every(function (authority,i) {
+                                    if (authority.id==e.id){
+                                        authoritiesList.splice(i,1);
+                                        return false;
+                                    }
+                                    return  true;
+                                });
                                 isAuthorty= false;
                                 break;
                             }
@@ -130,11 +149,15 @@
                         authoritiesAll.every(function (authorityAll) {
                             if (authorityAll.id==e.id){
                                 authorityAll.style=true;
+                                authoritiesList.push({'id':authorityAll.id,'name':authorityAll.name});
                                 return false;
                             }
                             return  true;
                         });
                     }
+                    setTimeout(function(){
+                        $(".tooltipTarget").tooltip({'trigger':'hover'});
+                    },10)
                 },
                 seekAuthority:function (e) {
                     let $val=e.target.value;

resources/views/maintenance/user/create.blade.php

@@ -76,12 +76,21 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-md-3"></label>
-                                <div class="col-md-7">
+                                <div class="col-md-4">
                                     <input name="role" hidden    v-model="roles" >
-                                    <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.8;text-align: center;">
+                                    <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
                                         <ul class="list-group tooltipTarget" style="width: 100%" onselectstart="return false;">
-                                            <li  :title="role.style ? '双击删除权限' : '双击添加权限'"    v-for="role in rolesAll" :id="role.name" class="list-group-item list-group-item-action pt-0 pb-0"
-                                                  @dblclick="selectedRole(role)" :class="role.style ? 'active' :''"><span style="cursor: default;" :id="role.name"> @{{ role.name }}  </span></li>
+                                            <li  :data-original-title="role.style ? '双击删除角色' : '双击添加角色'"    v-for="role in rolesAll" :id="role.name"
+                                                 class="tooltipTarget list-group-item list-group-item-action pt-0 pb-0"
+                                                  @dblclick="selectedRole(role)" :class="role.style ? 'active' :''"><span style="cursor: default;" > @{{ role.name }}  </span></li>
+                                        </ul>
+                                    </div>
+                                </div>
+                                <div class="col-md-3">
+                                    <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                                        <ul class="list-group" style="width: 100%" onselectstart="return false;">
+                                            <li  title="双击删除角色"    v-for="role in rolesList" :id="role.name" class="list-group-item list-group-item-action pt-0 pb-0"
+                                                 @dblclick="selectedRole(role)" ><span style="cursor: default;" > @{{ role.name }}  </span></li>
                                         </ul>
                                     </div>
                                 </div>
@@ -94,12 +103,22 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-md-3"></label>
-                                <div class="col-md-7">
+                                <div class="col-md-4">
                                     <input name="carrier" hidden   v-model="carriers" >
-                                    <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.8;text-align: center;">
+                                    <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
                                         <ul class="list-group tooltipTarget" style="width: 100%" onselectstart="return false;">
-                                            <li  :title="carrier.style ? '双击删除承运商' : '双击添加承运商'"    v-for="carrier in carriersAll" :id="carrier.name" class="list-group-item list-group-item-action pt-0 pb-0"
-                                                 @dblclick="selectedCarrier(carrier)" :class="carrier.style ? 'active' :''"><span style="cursor: default;" :id="carrier.name"> @{{ carrier.name }}  </span></li>
+                                            <li  :data-original-title="carrier.style ? '双击删除承运商' : '双击添加承运商'"    v-for="carrier in carriersAll" :id="carrier.name"
+                                                 class="tooltipTarget list-group-item list-group-item-action pt-0 pb-0"
+                                                 @dblclick="selectedCarrier(carrier)" :class="carrier.style ? 'active' :''"><span style="cursor: default;" > @{{ carrier.name }}  </span></li>
+                                        </ul>
+                                    </div>
+                                </div>
+                                <div class="col-md-3">
+                                    <input name="carrier" hidden   v-model="carriers" >
+                                    <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                                        <ul class="list-group" style="width: 100%" onselectstart="return false;">
+                                            <li  title="双击删除承运商"    v-for="carrier in carriersList"  class="list-group-item list-group-item-action pt-0 pb-0"
+                                                 @dblclick="selectedCarrier(carrier)" ><span style="cursor: default;" > @{{ carrier.name }}  </span></li>
                                         </ul>
                                     </div>
                                 </div>
@@ -132,22 +151,26 @@
                     @endforeach
                 ],
                 roles:[{{old('role')}}],
+                rolesList:[],
                 carriersAll:[
                     @foreach($carriers as $carrier)
                     {id:'{{$carrier->id}}',name:'{{$carrier->name}}',style:false},
                     @endforeach
                 ],
                 carriers:[{{old('carrier')}}],
+                carriersList:[],
             },
             mounted:function(){
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 if (this.roles.length>0){
                     let rolesAll=this.rolesAll;
                     let roles=this.roles;
+                    let rolesList=this.rolesList;
                     for (let i = 0; i < roles.length; i++) {
                         rolesAll.every(function (roleAll) {
                             if (roleAll.id == roles[i]) {
                                 roleAll.style = true;
+                                rolesList.push({'id':roleAll.id,'name':roleAll.name});
                                 return false;
                             }
                             return true;
@@ -157,10 +180,12 @@
                 if (this.carriers.length>0){
                     let carriersAll=this.carriersAll;
                     let carriers=this.carriers;
+                    let carriersList=this.carriersList;
                     for (let i = 0; i < carriers.length; i++) {
                         carriersAll.every(function (carrierAll) {
                             if (carrierAll.id == carriers[i]) {
                                 carrierAll.style = true;
+                                carriersList.push({'id':carrierAll.id,'name':carrierAll.name});
                                 return false;
                             }
                             return true;
@@ -172,6 +197,7 @@
                 selectedCarrier:function (e) {
                     let carriers=this.carriers;
                     let carriersAll=this.carriersAll;
+                    let carriersList=this.carriersList;
                     let isCarrier=true;
                     if (carriers&&carriersAll) {
                         for (let i = 0; i < carriers.length; i++) {
@@ -184,6 +210,13 @@
                                     }
                                     return true;
                                 });
+                                carriersList.every(function (carrier,i) {
+                                    if (carrier.id==e.id){
+                                        carriersList.splice(i,1);
+                                        return false;
+                                    }
+                                    return true;
+                                });
                                 isCarrier= false;
                                 break;
                             }
@@ -195,11 +228,15 @@
                         carriersAll.every(function (carrierAll) {
                             if (carrierAll.id==e.id){
                                 carrierAll.style=true;
+                                carriersList.push({'id':carrierAll.id,'name':carrierAll.name});
                                 return false;
                             }
                             return  true;
                         });
                     }
+                    setTimeout(function(){
+                        $(".tooltipTarget").tooltip({'trigger':'hover'});
+                    },10)
                 },
                 seekCarrier:function (e) {
                     let $val=e.target.value;
@@ -217,6 +254,7 @@
                 selectedRole:function (e) {
                     let roles=this.roles;
                     let rolesAll=this.rolesAll;
+                    let rolesList=this.rolesList;
                     let isRole=true;
                     if (roles&&rolesAll) {
                         for (let i = 0; i < roles.length; i++) {
@@ -229,6 +267,13 @@
                                     }
                                     return true;
                                 });
+                                rolesList.every(function (role,i) {
+                                    if (role.id==e.id){
+                                        rolesList.splice(i,1);
+                                        return false;
+                                    }
+                                    return true;
+                                });
                                 isRole= false;
                                 break;
                             }
@@ -240,11 +285,15 @@
                         rolesAll.every(function (roleAll) {
                             if (roleAll.id==e.id){
                                 roleAll.style=true;
+                                rolesList.push({'id':roleAll.id,'name':roleAll.name});
                                 return false;
                             }
                             return  true;
                         });
                     }
+                    setTimeout(function(){
+                        $(".tooltipTarget").tooltip({'trigger':'hover'});
+                    },10)
                 },
                 seekRole:function (e) {
                     let $val=e.target.value;

resources/views/maintenance/user/edit.blade.php

@@ -52,15 +52,23 @@
                     </div>
                     <div class="form-group row">
                         <label class="col-md-3"></label>
-                        <div class="col-md-7">
+                        <div class="col-md-4">
                             <input name="role" hidden    v-model="roles" >
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.8;text-align: center;">
+                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
                                 <ul class="list-group tooltipTarget" style="width: 100%" onselectstart="return false;">
-                                    <li  :title="role.style ? '双击删除角色' :'双击添加角色'"    v-for="role in rolesAll" :id="role.name" class="list-group-item list-group-item-action pt-0 pb-0"
+                                    <li  :data-original-title="role.style ? '双击删除角色' :'双击添加角色'"    v-for="role in rolesAll" :id="role.name" class="list-group-item list-group-item-action pt-0 pb-0"
                                          @dblclick="selectedRole(role)" :class="role.style ? 'active' :''"><span style="cursor: default;" :id="role.name"> @{{ role.name }}  </span></li>
                                 </ul>
                             </div>
                         </div>
+                        <div class="col-md-3">
+                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                                <ul class="list-group" style="width: 100%" onselectstart="return false;">
+                                    <li  title="双击删除角色"    v-for="role in rolesList" :id="role.name" class="list-group-item list-group-item-action pt-0 pb-0"
+                                         @dblclick="selectedRole(role)" ><span style="cursor: default;" > @{{ role.name }}  </span></li>
+                                </ul>
+                            </div>
+                        </div>
                     </div>
                     <div class="form-group row">
                         <label for="carrier" class="col-md-3 col-form-label text-md-right">可见承运商</label>
@@ -70,12 +78,21 @@
                     </div>
                     <div class="form-group row">
                         <label class="col-md-3"></label>
-                        <div class="col-md-7">
+                        <div class="col-md-4">
                             <input name="carrier" hidden   v-model="carriers" >
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.8;text-align: center;">
+                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
                                 <ul class="list-group tooltipTarget" style="width: 100%" onselectstart="return false;">
-                                    <li  :title="carrier.style ? '双击删除承运商' :'双击添加承运商'"    v-for="carrier in carriersAll" :id="carrier.name" class="list-group-item list-group-item-action pt-0 pb-0"
-                                         @dblclick="selectedCarrier(carrier)" :class="carrier.style ? 'active' :''"><span style="cursor: default;" :id="carrier.name"> @{{ carrier.name }}  </span></li>
+                                    <li  :data-original-title="carrier.style ? '双击删除承运商' :'双击添加承运商'"    v-for="carrier in carriersAll" :id="carrier.name" class="list-group-item list-group-item-action pt-0 pb-0"
+                                         @dblclick="selectedCarrier(carrier)" :class="carrier.style ? 'active' :''"><span style="cursor: default;" > @{{ carrier.name }}  </span></li>
+                                </ul>
+                            </div>
+                        </div>
+                        <div class="col-md-3">
+                            <input name="carrier" hidden   v-model="carriers" >
+                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                                <ul class="list-group" style="width: 100%" onselectstart="return false;">
+                                    <li  title="双击删除承运商"    v-for="carrier in carriersList"  class="list-group-item list-group-item-action pt-0 pb-0"
+                                         @dblclick="selectedCarrier(carrier)" ><span style="cursor: default;" > @{{ carrier.name }}  </span></li>
                                 </ul>
                             </div>
                         </div>
@@ -111,7 +128,7 @@
                         @endforeach
                     @endif
                 ],
-                rolesStr:'{{ old('role') }}',
+                rolesList:[],
                 carriersAll:[
                     @foreach($carriers as $carrier)
                     {id:'{{$carrier->id}}',name:'{{$carrier->name}}',style:false},
@@ -126,16 +143,19 @@
                         @endforeach
                     @endif
                 ],
+                carriersList:[],
             },
             mounted:function(){
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 if (this.roles.length>0){
                     let rolesAll=this.rolesAll;
                     let roles=this.roles;
+                    let rolesList=this.rolesList;
                     for (let i = 0; i < roles.length; i++) {
                         rolesAll.every(function (roleAll) {
                             if (roleAll.id == roles[i]) {
                                 roleAll.style = true;
+                                rolesList.push({'id':roleAll.id,'name':roleAll.name});
                                 return false;
                             }
                             return true;
@@ -145,10 +165,12 @@
                 if (this.carriers.length>0){
                     let carriersAll=this.carriersAll;
                     let carriers=this.carriers;
+                    let carriersList=this.carriersList;
                     for (let i = 0; i < carriers.length; i++) {
                         carriersAll.every(function (carrierAll) {
                             if (carrierAll.id == carriers[i]) {
                                 carrierAll.style = true;
+                                carriersList.push({'id':carrierAll.id,'name':carrierAll.name});
                                 return false;
                             }
                             return true;
@@ -160,6 +182,7 @@
                 selectedCarrier:function (e) {
                     let carriers=this.carriers;
                     let carriersAll=this.carriersAll;
+                    let carriersList=this.carriersList;
                     let isCarrier=true;
                     if (carriers&&carriersAll) {
                         for (let i = 0; i < carriers.length; i++) {
@@ -172,6 +195,13 @@
                                     }
                                     return true;
                                 });
+                                carriersList.every(function (carrier,i) {
+                                    if (carrier.id==e.id){
+                                        carriersList.splice(i,1);
+                                        return false;
+                                    }
+                                    return true;
+                                });
                                 isCarrier= false;
                                 break;
                             }
@@ -183,11 +213,15 @@
                         carriersAll.every(function (carrierAll) {
                             if (carrierAll.id==e.id){
                                 carrierAll.style=true;
+                                carriersList.push({'id':carrierAll.id,'name':carrierAll.name});
                                 return false;
                             }
                             return  true;
                         });
                     }
+                    setTimeout(function(){
+                        $(".tooltipTarget").tooltip({'trigger':'hover'});
+                    },10)
                 },
                 seekCarrier:function (e) {
                     let $val=e.target.value;
@@ -205,6 +239,7 @@
                 selectedRole:function (e) {
                     let roles=this.roles;
                     let rolesAll=this.rolesAll;
+                    let rolesList=this.rolesList;
                     let isRole=true;
                     if (roles&&rolesAll) {
                         for (let i = 0; i < roles.length; i++) {
@@ -217,6 +252,13 @@
                                     }
                                     return true;
                                 });
+                                rolesList.every(function (role,i) {
+                                    if (role.id==e.id){
+                                        rolesList.splice(i,1);
+                                        return false;
+                                    }
+                                    return true;
+                                });
                                 isRole= false;
                                 break;
                             }
@@ -228,11 +270,15 @@
                         rolesAll.every(function (roleAll) {
                             if (roleAll.id==e.id){
                                 roleAll.style=true;
+                                rolesList.push({'id':roleAll.id,'name':roleAll.name});
                                 return false;
                             }
                             return  true;
                         });
                     }
+                    setTimeout(function(){
+                        $(".tooltipTarget").tooltip({'trigger':'hover'});
+                    },10)
                 },
                 seekRole:function (e) {
                     let $val=e.target.value;

resources/views/store/index.blade.php

@@ -120,6 +120,7 @@
                         <td class="text-muted">@{{store.created_at}}</td>
                     </tr>
                 </table>
+                <div class="text-info h5 btn btn">{{$stores->count()}}/{{$stores->total()}}</div>
                 {{$stores->links()}}
             </div>
         </div>

resources/views/store/storeItem/index.blade.php

@@ -127,6 +127,7 @@
                         <td class="text-muted">@{{storeItem.created_at}}</td>
                     </tr>
                 </table>
+                <div class="text-info h5 btn btn">{{$storeItems->count()}}/{{$storeItems->total()}}</div>
                 {{$storeItems->links()}}
             </div>
         </div>

resources/views/waybill/index.blade.php

@@ -219,6 +219,7 @@
                     </td>
                 </tr>
             </table>
+            <div class="text-info h5 btn btn">{{$waybills->count()}}/{{$waybills->total()}}</div>
             {{$waybills->appends($filterData)->links()}}
         </div>
     </div>

resources/views/waybill/waybillFinancialSnapshot/index.blade.php

@@ -153,6 +153,7 @@
 
         </tbody>
     </table>
+        <div class="text-info h5 btn btn">{{$waybillFinancialSnapshots->count()}}/{{$waybillFinancialSnapshots->total()}}</div>
     </div>
 </div>
 

resources/views/weight/package/index.blade.php

@@ -132,6 +132,7 @@
                         <td class="text-muted">@{{package.recipientMobile}}</td>
                     </tr>
                 </table>
+                <div class="text-info h5 btn btn">{{$packages->count()}}/{{$packages->total()}}</div>
                 @if(isset($request))
                 {{$packages->appends($request)->links()}}
                 @else

resources/views/weight/package/statistics.blade.php

@@ -437,6 +437,11 @@
                 },
                 statisticExport:function (e) {
                     if (e==1){
+                        if (this.checkData&&this.checkData.length<=0){
+                            tempTip.setDuration(4000);
+                            tempTip.showSuccess('没有勾选任何记录');
+                            return;
+                        }
                         location.href="{{url('package/statistics?checkSign=')}}"+this.checkData;
                     }else{
 /*                        let formData=new FormData();

resources/views/weight/weightExcepted/index.blade.php

@@ -99,6 +99,7 @@
                         @endif
                     </tr>
                 </table>
+                <div class="text-info h5 btn btn">{{$weightExcepteds->count()}}/{{$weightExcepteds->total()}}</div>
                 {{$weightExcepteds->links()}}
             </div>
         </div>