Merge branch 'waybill_ZD'

# Conflicts:
#	resources/views/weight/package/index.blade.php
#	resources/views/weight/weightExcepted/index.blade.php

app/Http/Controllers/PackageController.php

@@ -134,8 +134,14 @@ class PackageController extends Controller
     }
 
     public function export($id){
-        dd($id);
-        $id = explode( ',',$id);
+        if ($id==-1){
+            $id=[];
+            $packages=Package::select('id')->get();
+            foreach ($packages as $package){
+                array_push($id,$package->id);
+            }
+        }else $id = explode( ',',$id);
+        if (!$id)return ;
         $row=[[
             'id'=>'ID',
             'owner_name'=>'货主',

app/Http/Controllers/TestController.php

@@ -7,7 +7,9 @@ use App\Batch;
 use App\Events\CancelOrder;
 use App\Events\WmsReceiveNewEvent;
 use App\Jobs\ProcessReceiveCombined;
+use App\Logistic;
 use App\Order;
+use App\Package;
 use App\Rejected;
 use App\RejectedBill;
 use App\RejectedBillItem;
@@ -95,4 +97,18 @@ class TestController extends Controller
         ]);
         return $response->json();
     }
+
+    public function changePackage(){
+        $packages=Package::whereRaw('delivery_number IS NOT NULL AND logistic_id IS NULL')->get();
+        $logistics=Logistic::get();
+        foreach ($packages as $package){
+            foreach ($logistics as $logistic){
+                if ($package->WMSReflectPackage->CarrierID==$logistic->code){
+                    $package->logistic_id=$logistic->id;
+                    break;
+                }
+            }
+        }
+        return "OK";
+    }
 }

app/Http/Controllers/WaybillFinancialSnapshotsController.php

@@ -54,7 +54,14 @@ class WaybillFinancialSnapshotsController extends Controller
     }
 
     public function export($id){
-        $id = explode( ',',$id);
+        if ($id==-1){
+            $id=[];
+            $waybillFinancialSnapshots=WaybillFinancialSnapshot::select('id')->get();
+            foreach ($waybillFinancialSnapshots as $waybillFinancialSnapshot){
+                array_push($id,$waybillFinancialSnapshot->id);
+            }
+        }else $id = explode( ',',$id);
+        if (!$id)return ;
         $row=[[
             'type'=>'运单类型',
             'waybill_number'=>'运单号',

app/Http/Controllers/WaybillsController.php

@@ -563,7 +563,14 @@ class WaybillsController extends Controller
     }
 
     public function waybillExport($id){
-        $id = explode( ',',$id);
+        if ($id==-1){
+            $id=[];
+            $waybills = Waybill::select('id')->get();
+            foreach ($waybills as $waybill){
+                array_push($id,$waybill->id);
+            }
+        }else $id = explode( ',',$id);
+        if (!$id)return ;
         $row=[[
             'type'=>'运单类型',
             'waybill_number'=>'运单号',

app/Http/Controllers/WeighExceptedController.php

@@ -43,9 +43,16 @@ class WeighExceptedController extends Controller
     }
 
    public function export($id){
-       $id = explode( ',',$id);
+       if ($id==-1){
+           $id=[];
+           $packages=Package::where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orWhere('status','下发异常')->select('id')->get();
+           foreach ($packages as $package){
+               array_push($id,$package->id);
+           }
+       }else $id = explode( ',',$id);
+       if (!$id)return ;
        $weighExcepted=Package::find($id[0]);
-       if ($weighExcepted->status=="上传异常"){
+       if (!$weighExcepted->status=="下发异常"){
            $row=[[
                'id'=>'ID',
                'logistic_number'=>'快递单号',

resources/views/waybill/index.blade.php

@@ -87,8 +87,12 @@
                     <tr>
                         <td colspan="5">
                             <label style="margin-left: 5px"> 操作选定记录：</label>
-                            <span class="btn btn-sm" @click="waybillExport" style="cursor: pointer"
-                                  :class="[checkData>0?'btn-dark':'btn-outline-dark']">导出Excel</span>
+                            <select @change="waybillExport($event)" :class="[checkData>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
+                                    title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                                <option >导出Excel   </option>
+                                <option value="1">导出勾选内容</option>
+                                <option value="2">导出所有页</option>
+                            </select>
                             <input hidden type="submit" value="kk">
                         </td>
                     </tr>
@@ -278,6 +282,7 @@
             },
             mounted:function(){
                 this.initInputs();
+                $(".tooltipTarget").tooltip({'trigger':'hover'});
             },
             methods:{
                 initInputs:function(){
@@ -426,12 +431,17 @@
                         this.checkData = [];
                     }
                 },
-                waybillExport(){
-                    if (this.checkData.length<=0){
-                        tempTip.setDuration(4000);
-                        tempTip.showSuccess('没有勾选任何记录');
-                    }else{
-                        location.href="{{url('waybillExport')}}/"+this.checkData;
+                waybillExport(e){
+                    let val=e.target.value;
+                    if (val===1) {
+                        if (this.checkData.length <= 0) {
+                            tempTip.setDuration(4000);
+                            tempTip.showSuccess('没有勾选任何记录');
+                        } else {
+                            location.href = "{{url('waybillExport')}}/" + this.checkData;
+                        }
+                    }else {
+                        location.href = "{{url('waybillExport/-1')}}";
                     }
                 }
             },

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

@@ -43,7 +43,12 @@
     @if(!isset($excepted))
     <div class="card-header">
     <label>操作选定记录：</label>
-    <button @click="waybillExport" class="btn btn-outline-dark">导出Excel</button>
+    <select @change="waybillExport($event)" :class="[checkData>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
+            title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+        <option >导出Excel   </option>
+        <option value="1">导出勾选内容</option>
+        <option value="2">导出所有页</option>
+    </select>
     </div>
     @endif
     <table class="table  table-hover table-bordered text-nowrap " style="width: 1500px;height: auto">
@@ -186,6 +191,7 @@
         },
         mounted:function(){
             this.initInputs();
+            $(".tooltipTarget").tooltip({'trigger':'hover'});
         },
         methods:{
             initInputs:function(){
@@ -213,12 +219,17 @@
                     this.checkData = [];
                 }
             },
-            waybillExport(){
-                if (this.checkData.length<=0){
-                    tempTip.setDuration(4000);
-                    tempTip.showSuccess('没有勾选任何记录');
-                }else{
-                    location.href="{{url('waybillFinancialSnapshot/export')}}/"+this.checkData;
+            waybillExport(e){
+                let val=e.target.value;
+                if (val===1) {
+                    if (this.checkData.length <= 0) {
+                        tempTip.setDuration(4000);
+                        tempTip.showSuccess('没有勾选任何记录');
+                    } else {
+                        location.href = "{{url('waybillFinancialSnapshot/export')}}/" + this.checkData;
+                    }
+                }else {
+                    location.href = "{{url('waybillFinancialSnapshot/export/-1')}}";
                 }
             },
         }

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

@@ -78,7 +78,7 @@
                                 <td colspan="9">
                                     <select @change="packageExport" :class="[checkData>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
                                              title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
-                                        <option >导出Excel</option>
+                                        <option >选择导出规则</option>
                                         <option value="1">导出勾选内容</option>
                                         <option value="2">导出所有页</option>
                                     </select>
@@ -235,16 +235,16 @@
                     }
                 },
                 packageExport(e){
-                    if (this.checkData&&this.checkData.length<=0){
-                        tempTip.setDuration(4000);
-                        tempTip.showSuccess('没有勾选任何记录');
-                    }else{
-                        if (e===1){
+                    let val=e.target.value;
+                    if (val===1){
+                        if (this.checkData&&this.checkData.length<=0){
+                            tempTip.setDuration(4000);
+                            tempTip.showSuccess('没有勾选任何记录');
+                        }else{
                             location.href="{{url('package/export').'/'}}"+this.checkData;
-                        } else {
-                            location.href="{{url('package/export/-1')}}";
                         }
-
+                    } else {
+                        location.href="{{url('package/export/-1')}}";
                     }
                 },
                 owner_seek:function (e) {

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

@@ -23,8 +23,12 @@
                                     </select></label></td>
                                 <td colspan="5">
                                     <label style="margin-left: 5px"> 操作选定记录：</label>
-                                    <span class="btn btn-sm" @click="weightExport" style="cursor: pointer"
-                                          :class="[checkData>0?'btn-dark':'btn-outline-dark']">导出Excel</span>
+                                    <select @change="weightExport($event)" :class="[checkData>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
+                                            title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                                        <option >导出Excel</option>
+                                        <option value="1">导出勾选内容</option>
+                                        <option value="2">导出所有页</option>
+                                    </select>
                                     <input hidden type="submit" value="kk">
                                 </td>
                             </tr>
@@ -168,12 +172,17 @@
                         this.checkData = [];
                     }
                 },
-                weightExport(){
-                    if (this.checkData.length<=0){
-                        tempTip.setDuration(4000);
-                        tempTip.showSuccess('没有勾选任何记录');
-                    }else{
-                        location.href="{{url('package/weightExcepted/export').'/'}}"+this.checkData;
+                weightExport(e){
+                    let val=e.target.value;
+                    if (val===1) {
+                        if (this.checkData.length <= 0) {
+                            tempTip.setDuration(4000);
+                            tempTip.showSuccess('没有勾选任何记录');
+                        } else {
+                            location.href = "{{url('package/weightExcepted/export').'/'}}" + this.checkData;
+                        }
+                    }else {
+                        location.href="{{url('package/weightExcepted/export/-1')}}";
                     }
                 }
             }