Merge branch 'master' into zzd

# Conflicts:
#	public/js/app.js
#	resources/views/waybill/index.blade.php

app/Exports/RejectedExport.php

@@ -65,7 +65,7 @@ class RejectedExport extends \PhpOffice\PhpSpreadsheet\Cell\StringValueBinder im
         $collection->prepend(['日期','审核号','客户名称','订单号','姓名',
             '手机','原单单号','退回单号','退回公司','到付费用',
             '是否入库','商品条码','商品名称','数量','是否正品',
-            '批次号','生产日期','效期','备注','录入人']);
+            '批次号','生产日期','效期','备注','退单备注','录入人']);
         return $collection;
     }
     private function injectRecord($collection,$bill,$item){
@@ -77,7 +77,7 @@ class RejectedExport extends \PhpOffice\PhpSpreadsheet\Cell\StringValueBinder im
             $bill['logistic_number_return'],$bill['logistic_name'],
             $bill['fee_collected'],$bill['is_loaded_str'],
             $item['barcode_goods'],$item['name_goods'],$item['amount'],$item['quality_label'],
-            $item['batch_number'],$item['made_at'],$item['validity_at'],$item['remark'],$bill['operator_name']]);
+            $item['batch_number'],$item['made_at'],$item['validity_at'],$item['remark'],$bill['remark'],$bill['operator_name']]);
         return $collection;
     }
 

app/Http/Controllers/LogisticNumberFeatureController.php

@@ -49,6 +49,9 @@ class LogisticNumberFeatureController extends Controller
     public function apiComputeLogisticByNumber(Request $request)
     {
         $logisticNumber=$request->input('logistic_number_return');
+        if(!$logisticNumber){
+            return ['success'=>'false',];
+        }
         $logistic=$this->getLogisticByFeatures($logisticNumber);
         if(!$logistic){
             return ['success'=>'false',];

app/Http/Controllers/MeasureMonitorController.php

@@ -27,7 +27,6 @@ class MeasureMonitorController extends Controller
     public function data(Request $request){
         $measuring_machine_id=$request->input('id');
         if ($measuring_machine_id){
-            /*$package=Package::with('owner','paperBox','measuringMachine')->where('measuring_machine_id',$measuringMachines[0]->id)->orderBy('id','DESC')->first();*/
             $package=Package::with('owner','paperBox','measuringMachine')->where('measuring_machine_id',$measuring_machine_id)->orderBy('id','DESC')->first();
             if (!$package){
                 $measuringMachine=MeasuringMachine::where('id',$measuring_machine_id)->first();
@@ -36,14 +35,6 @@ class MeasureMonitorController extends Controller
             }
             return $package;
         }
-        /*else{
-            $package=Package::with('owner','paperBox','measuringMachine')->where('measuring_machine_id',$measuring_machine_id)->orderBy('id','DESC')->first();
-            if (!$package){
-                $measuringMachine=MeasuringMachine::where('id',$measuring_machine_id)->first();
-                $package=new Package();
-                if ($measuringMachine)$package->measuringMachine=$measuringMachine;
-            }*/
-
         return '';
     }
 

app/Http/Controllers/PackageController.php

@@ -46,10 +46,12 @@ class PackageController extends Controller
             $packages=$this->preciseQuery('logistic_number',$request,$packages);
         }
         if ($request->input('created_at_start')){
-            $packages=$packages->where('created_at','>=',$request->input('created_at_start'));
+            $created_at_start=$request->input('created_at_start')." 00:00:00";
+            $packages=$packages->where('created_at','>=',$created_at_start);
         }
         if ($request->input('created_at_end')){
-            $packages=$packages->where('created_at','<=',$request->input('created_at_end'));
+            $created_at_end=$request->input('created_at_end')." 23:59:59";
+            $packages=$packages->where('created_at','<=',$created_at_end);
         }
         if ($request->input('owner_id')){
             $packages=$packages->where('owner_id',$request->input('owner_id'));

app/Http/Controllers/ProcessController.php

@@ -41,10 +41,12 @@ class ProcessController extends Controller
             });
         }
         if ($request->input('date_start')){
-            $processes=$processes->where('created_at','>=',$request->input('date_start'));
+            $date_start=$request->input('date_start')." 00:00:00";
+            $processes=$processes->where('created_at','>=',$date_start);
         }
         if ($request->input('date_end')){
-            $processes=$processes->where('created_at','<=',$request->input('date_end'));
+            $date_end=$request->input('date_end')." 23:59:59";
+            $processes=$processes->where('created_at','<=',$date_end);
         }
         if ($request->input('owner_id')){
             $processes=$processes->where('owner_id',$request->input('owner_id'));

app/Http/Controllers/RejectedController.php

@@ -23,6 +23,7 @@ use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\View\View;
 use Maatwebsite\Excel\Facades\Excel;
+use phpDocumentor\Reflection\Types\Array_;
 use function foo\func;
 
 class RejectedController extends Controller
@@ -184,15 +185,20 @@ class RejectedController extends Controller
             }
         }
         if($logistic_number_return){
-            $startDay = Carbon::now()->subDays(15);
-            $rejectedBillsQueryTem=clone $rejectedBillsQuery;
-            $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('created_at','>',$startDay->format('Y-m-d'));
-            $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('logistic_number_return','like','%'.$logistic_number_return.'%');
-            if($rejectedBillsQueryTem->count()==0
-                ||$rejectedBillsQueryTem->first()['logistic_number_return']==$logistic_number_return){
-                $rejectedBillsQuery=$rejectedBillsQuery->where('logistic_number_return',$logistic_number_return);
+            if(strpos($logistic_number_return,',')||strpos($logistic_number_return,'，')||strpos($logistic_number_return,' ')){
+                $arr=array_filter(preg_split('/[,， ]+/is', $logistic_number_return));
+                $rejectedBillsQuery=$rejectedBillsQuery->whereIn('logistic_number_return',$arr);
             }else{
-                $rejectedBillsQuery=$rejectedBillsQueryTem;
+                $startDay = Carbon::now()->subDays(15);
+                $rejectedBillsQueryTem=clone $rejectedBillsQuery;
+                $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('created_at','>',$startDay->format('Y-m-d'));
+                $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('logistic_number_return','like','%'.$logistic_number_return.'%');
+                if($rejectedBillsQueryTem->count()==0
+                    ||$rejectedBillsQueryTem->first()['logistic_number_return']==$logistic_number_return){
+                    $rejectedBillsQuery=$rejectedBillsQuery->where('logistic_number_return',$logistic_number_return);
+                }else{
+                    $rejectedBillsQuery=$rejectedBillsQueryTem;
+                }
             }
         }
         if($logistic_number){

app/Http/Controllers/WaybillFinancialExceptedController.php

@@ -13,10 +13,12 @@ class WaybillFinancialExceptedController extends Controller
 {
     public function conditionQuery(Request $request,$waybillFinancialSnapshots){
         if ($request->input('created_at_start')){
-            $waybillFinancialSnapshots=$waybillFinancialSnapshots->where('created_at','>',$request->input('created_at_start'));
+            $created_at_start=$request->input('created_at_start')." 00:00:00";
+            $waybillFinancialSnapshots=$waybillFinancialSnapshots->where('created_at','>=',$created_at_start);
         }
         if ($request->input('created_at_end')){
-            $waybillFinancialSnapshots=$waybillFinancialSnapshots->where('created_at','<',$request->input('created_at_end'));
+            $created_at_end=$request->input('created_at_end')." 23:59:59";
+            $waybillFinancialSnapshots=$waybillFinancialSnapshots->where('created_at','<=',$created_at_end);
         }
         $waybillFinancialSnapshots=$waybillFinancialSnapshots->paginate(50);
         return $waybillFinancialSnapshots;

app/Http/Controllers/WaybillFinancialSnapshotsController.php

@@ -14,10 +14,12 @@ class WaybillFinancialSnapshotsController extends Controller
 {
     public function conditionQuery(Request $request,$waybillFinancialSnapshots){
         if ($request->input('created_at_start')){
-            $waybillFinancialSnapshots=$waybillFinancialSnapshots->where('created_at','>',$request->input('created_at_start'));
+            $created_at_start=$request->input('created_at_start')." 00:00:00";
+            $waybillFinancialSnapshots=$waybillFinancialSnapshots->where('created_at','>=',$created_at_start);
         }
         if ($request->input('created_at_end')){
-            $waybillFinancialSnapshots=$waybillFinancialSnapshots->where('created_at','<',$request->input('created_at_end'));
+            $created_at_end=$request->input('created_at_end')." 23:59:59";
+            $waybillFinancialSnapshots=$waybillFinancialSnapshots->where('created_at','<=',$created_at_end);
         }
         $waybillFinancialSnapshots=$waybillFinancialSnapshots->paginate(50);
         return $waybillFinancialSnapshots;

app/Http/Controllers/WaybillsController.php

@@ -63,10 +63,12 @@ class WaybillsController extends Controller
             $waybills=$this->preciseQuery("destination",$request,$waybills);
         }
         if ($request->input('created_at_start')){
-            $waybills=$waybills->where('created_at','>',$request->input('created_at_start'));
+            $created_at_start=$request->input('created_at_start')." 00:00:00";
+            $waybills=$waybills->where('created_at','>=',$created_at_start);
         }
         if ($request->input('created_at_end')){
-            $waybills=$waybills->where('created_at','<',$request->input('created_at_end'));
+            $created_at_end=$request->input('created_at_end')." 23:59:59";
+            $waybills=$waybills->where('created_at','<=',$created_at_end);
         }
         if ($request->input('status')){
             $waybills=$waybills->where('status',$request->input('status'));
@@ -599,6 +601,8 @@ class WaybillsController extends Controller
         $row=[[
             'type'=>'运单类型',
             'owner'=>'货主',
+            'source_bill'=>'上游单号',
+            'wms_bill_number'=>'wms订单号',
             'waybill_number'=>'运单号',
             'origination'=>'始发地',
             'destination'=>'目的地',
@@ -641,6 +645,7 @@ class WaybillsController extends Controller
                 'type'=>isset($waybill->type)?$waybill->type:'',
                 'waybill_number'=>isset($waybill->waybill_number)?$waybill->waybill_number:'',
                 'owner'=>isset($waybill->owner->name)?$waybill->owner->name:'',
+                'source_bill'=>isset($waybill->source_bill)?$waybill->source_bill:'',
                 'wms_bill_number'=>isset($waybill->wms_bill_number)?$waybill->wms_bill_number:'',
                 'origination'=>isset($waybill->origination)?$waybill->origination:'',
                 'destination'=>isset($waybill->destination)?$waybill->destination:'',

app/Http/Controllers/api/thirdPart/flux/PackageController.php

@@ -9,7 +9,6 @@ use App\Owner;
 use App\Package;
 use App\WMSReflectPackage;
 use Carbon\Carbon;
-use function GuzzleHttp\Promise\all;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 use Zttp\Zttp;
@@ -20,14 +19,14 @@ class PackageController extends Controller
     public function new_(Request $request)
     {
         $requestInputs=$request->all();
-        $receiveInputs=$requestInputs['request'];
         $this->log(__METHOD__,'request_'.__FUNCTION__,json_encode($requestInputs),null);
         $errors=$this->validatorForNew($requestInputs)->errors();
         if(count($errors)>0){
-            $this->log(__METHOD__,'error2_'.__FUNCTION__,json_encode($receiveInputs).'||'.json_encode($errors),null);
+            $this->log(__METHOD__,'error2_'.__FUNCTION__,json_encode($requestInputs).'||'.json_encode($errors),null);
             return ['response'=>['flag'=>'W','message'=>'fields wrong, see Errors report please.',
                 'errors'=>$errors]];
         }
+        $receiveInputs=$requestInputs['request'];
         $package=Package::where('logistic_number',$receiveInputs['SOReference5'])->first();
         if (!$receiveInputs['Customer']) {
             $this->log(__METHOD__, __FUNCTION__, '富勒没有下发货主！快递单号：'.$receiveInputs['SOReference5'] , null);
@@ -74,7 +73,13 @@ class PackageController extends Controller
         }
         //package不存在
         $receive = new WMSReflectPackage($receiveInputs);
-        $receive->save();
+        try{
+            $receive->save();
+        }catch (\Exception $exception){
+            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'WMS下发请求保存异常：'.$exception->getMessage(),null);
+            return ['response'=>['flag'=>'W','message'=>'already send, order number unique violation.',
+                'errors'=>$exception->getMessage()]];
+        }
         if (isset($owner->id)&&isset($logistic->id)){
             $createPackage = new Package([
                 'logistic_number'=>$receiveInputs['SOReference5'],
@@ -197,7 +202,7 @@ class PackageController extends Controller
             $this->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
             return ['result'=>'false'];
         }catch (\Exception $exception){
-            $this->log(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
+            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
             return ['result'=>'false'];
         }
     }

app/Http/Controllers/api/thirdPart/flux/ReceiveController.php

@@ -241,7 +241,7 @@ class ReceiveController extends Controller
             try{
                 $response = Zttp::post($url, $sendingJson);
             }catch (\Exception $exception){
-                $this->log(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
+                Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
                 return 'fail';
             }
             $noIssues=true;

app/Http/Controllers/api/thirdPart/flux/WaybillController.php

@@ -132,7 +132,7 @@ class WaybillController extends Controller
         try{
             $response = Zttp::post($url, $sendingJson);
         }catch (\Exception $exception){
-            $this->log(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
+            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
             return false;
         }
         $responseJson = $response->json();

public/js/app.js

@@ -2259,7 +2259,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
   false;
 
 /**
@@ -61384,8 +61384,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! D:\wamp64\www\bswas\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\wamp64\www\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),
@@ -61401,4 +61401,4 @@ module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss *
 
 /***/ })
 
-/******/ });
+/******/ });

public/t.php

@@ -1,14 +1,8 @@
 <?php
+$str = ',1, 2， 3,     4               5';
+//$str=preg_replace('/([\s]*)|(，)/i',',',trim($str));
+//$str=preg_replace('/[,]{2,}/i',',',$str);
+//$str = trim($str,',');
+$str=preg_split('/[,， ]+/is', $str);
+var_dump($str);
 
-?>
-
-<div style="width: 500px;height: 500px;background: #c99e9e;flex-direction:column;display: flex;justify-content:center">
-
-    <span>a</span>
-    <span>a</span>
-    <span>a</span>
-
-</div>
-
-<style>
-</style>

resources/sass/layout.scss

@@ -45,44 +45,50 @@ table.waybill-table{
             background: #aaeace;
         }
     }
-    th:nth-child(4),th:nth-child(5),th:nth-child(6),th:nth-child(7),th:nth-child(8),th:nth-child(9),th:nth-child(10){
-        background: #eac3aa;
-    }
-    th:nth-child(11),th:nth-child(12),th:nth-child(13),th:nth-child(14),th:nth-child(15),th:nth-child(16){
-        background: #aac7ea;
-    }
-    th:nth-child(17),th:nth-child(18),th:nth-child(19),th:nth-child(20){
-        background: #aaeace;
-    }
-    td:nth-child(4),td:nth-child(5),td:nth-child(6),td:nth-child(7),td:nth-child(8),td:nth-child(9),td:nth-child(10){
-        background: rgb(246, 238, 232);
-    }
-    td:nth-child(11),td:nth-child(12),td:nth-child(13),td:nth-child(14),td:nth-child(15),td:nth-child(16){
-        background: #e8eef6;
+    th{
+        &.td-bill{
+            background: #eac3aa;
+        }
+        &.td-transit{
+            background: #aac7ea;
+        }
+        &.td-fee{
+            background: #aaeace;
+        }
     }
-    td:nth-child(17),td:nth-child(18),td:nth-child(19),td:nth-child(20){
-        background: #e7f5ee;
+    td{
+        &.td-bill{
+            background: rgb(246, 238, 232);
+        }
+        &.td-transit{
+            background: #e8eef6;
+        }
+        &.td-fee{
+            background: #e7f5ee;
+        }
     }
-    tr:nth-child(even){
-        td:nth-child(4),td:nth-child(5),td:nth-child(6),td:nth-child(7),td:nth-child(8),td:nth-child(9),td:nth-child(10){
+    tr:nth-child(even) td{
+        &.td-bill{
             background: rgb(248, 244, 241);
         }
-        td:nth-child(11),td:nth-child(12),td:nth-child(13),td:nth-child(14),td:nth-child(15),td:nth-child(16){
+        &.td-transit{
             background: #edf0f5;
         }
-        td:nth-child(17),td:nth-child(18),td:nth-child(19),td:nth-child(20){
-            background: #ecf3ef;
+        &.td-fee{
+            background:  #ecf3ef;
         }
     }
     tr:hover{
-        td:nth-child(4),td:nth-child(5),td:nth-child(6),td:nth-child(7),td:nth-child(8),td:nth-child(9),td:nth-child(10){
-            background: rgb(246, 233, 220);
-        }
-        td:nth-child(11),td:nth-child(12),td:nth-child(13),td:nth-child(14),td:nth-child(15),td:nth-child(16){
-            background: #d3e0f1;
-        }
-        td:nth-child(17),td:nth-child(18),td:nth-child(19),td:nth-child(20){
-            background: #d7f3e5;
+        td{
+            &.td-bill{
+                background: rgb(246, 233, 220);
+            }
+            &.td-transit{
+                background: #d3e0f1;
+            }
+            &.td-fee{
+                background: #d7f3e5;
+            }
         }
     }
 }

resources/views/layouts/app.blade.php

@@ -10,7 +10,7 @@
     <title>@yield('title') {{ config('app.name', '宝时WAS') }}</title>
     @yield('head')
     <!-- Styles -->
-    <link href="{{ asset('css/app200515d.css') }}" rel="stylesheet">
+    <link href="{{ asset('css/app200519b.css') }}" rel="stylesheet">
 </head>
 <body>
 <div id="app">

resources/views/process/index.blade.php

@@ -57,9 +57,9 @@
                                <input name="commodity_barcode" v-model="filterData.commodity_barcode" class="form-control-sm" placeholder="商品条码" :class="filterData.commodity_barcode?'bg-warning':''">
                            </td>
                            <td >
-                               <label for="status">&nbsp;状&nbsp;&nbsp;态&nbsp;：</label>
-                               <select id="status" name="status" v-model="filterData.status" @change="submit" class="form-control-sm tooltipTarget" :class="filterData.status?'bg-warning':''">
-                                   <option >    </option>
+
+                               <select id="status" name="status" v-model="filterData.status" @change="submit" class="form-control-sm tooltipTarget" :class="filterData.status?'bg-warning':''" >
+                                   <option value="" selected>状态</option>
                                    <option value="待接单">待接单</option>
                                    <option value="待加工">待加工</option>
                                    <option value="驳回">驳回</option>

resources/views/rejected/index.blade.php

@@ -58,7 +58,7 @@
                                 <td>
                                     <input type="text" class="form-control-sm tooltipTarget" placeholder="退回单号" name="logistic_number_return"
                                            :class="filterParams.logistic_number_return?'bg-warning':''"
-                                           @input="logistic_number_returnEntering" @keypress="submitFilterOnEnter" title="退回单号：15天以内的支持模糊搜索，回车提交">
+                                           @input="logistic_number_returnEntering" @keypress="submitFilterOnEnter" title="退回单号：支持查找多个以逗号或空格分隔的单号，15天以内的支持模糊搜索，回车提交">
                                 </td>
                                 <td>
                                     <input type="text" class="form-control-sm tooltipTarget" placeholder="原单单号" name="logistic_number"

resources/views/waybill/index.blade.php

@@ -120,42 +120,42 @@
             </div>
             <table class="table table-striped table-sm table-bordered table-hover text-nowrap waybill-table" style="background: #fff;">
                 <tr>
-                    <th class="table-header-layer-1" colspan="3"></th>
-                    <th class="table-header-layer-1" colspan="7"><span class="fa fa-file-text-o"></span> 运单信息</th>
-                    <th class="table-header-layer-1" colspan="6"><span class="fa fa-truck"></span> 运输信息</th>
-                    <th class="table-header-layer-1" colspan="4"><span class="fa fa-rmb"></span> 费用信息</th>
+                    <th class="table-header-layer-1" :colspan="elementCount('th.td-operation')"></th>
+                    <th class="table-header-layer-1" :colspan="elementCount('th.td-bill')"><span class="fa fa-file-text-o"></span> 运单信息</th>
+                    <th class="table-header-layer-1" :colspan="elementCount('th.td-transit')"><span class="fa fa-truck"></span> 运输信息</th>
+                    <th class="table-header-layer-1" :colspan="elementCount('th.td-fee')"><span class="fa fa-rmb"></span> 费用信息</th>
                 </tr>
                 <tr>
-                    <th>
+                    <th class="td-operation">
                         <label for="all">
                             <input id="all" type="checkbox" @click="checkAll($event)">全选
                         </label>
                     </th>
                     @can('运输管理-编辑','运输管理-运单审核','运输管理-调度','运输管理-编辑','运输管理-删除')
-                        <th>操作</th>
+                        <th class="td-operation">操作</th>
                     @endcan
-                    <th>状态</th>
-                    <th>ID</th>
-                    <th>创建时间</th>
-                    <th>运单类型</th>
-                    <th>货主</th>
-                    <th>上游单号</th>
-                    <th>WMS订单号</th>
-                    <th>运单号</th>
-                    <th>收件人</th>
-                    <th>收件人电话</th>
-                    <th>始发地</th>
-                    <th>目的地</th>
-                    <th>承运商</th>
-                    <th>单号/车型</th>
-                    <th>仓库计抛</th>
-                    <th>承运商计抛</th>
-                    <th>仓库计重</th>
-                    <th>承运商计重</th>
-                    <th>运费</th>
-                    <th>提货费</th>
-                    <th>其他费用</th>
-                    <th>调度备注</th>
+                    <th class="td-operation">状态</th>
+                    <th class="td-bill">ID</th>
+                    <th class="td-bill">创建时间</th>
+                    <th class="td-bill">运单类型</th>
+                    <th class="td-bill">货主</th>
+                    <th class="td-bill">上游单号</th>
+                    <th class="td-bill">WMS订单号</th>
+                    <th class="td-bill">运单号</th>
+                    <th class="td-transit">收件人</th>
+                    <th class="td-transit">收件人电话</th>
+                    <th class="td-transit">始发地</th>
+                    <th class="td-transit">目的地</th>
+                    <th class="td-transit">承运商</th>
+                    <th class="td-transit">单号/车型</th>
+                    <th class="td-transit">仓库计抛</th>
+                    <th class="td-transit">承运商计抛</th>
+                    <th class="td-transit">仓库计重</th>
+                    <th class="td-transit">承运商计重</th>
+                    <th class="td-fee">运费</th>
+                    <th class="td-fee">提货费</th>
+                    <th class="td-fee">其他费用</th>
+                    <th class="td-fee">调度备注</th>
                     {{--                    <th>WMS单号</th>--}}
                     {{--                    <th>收件人</th>--}}
                     {{--                    <th>收件人电话</th>--}}
@@ -199,31 +199,31 @@
                         </span>
                     </td>
                     <td :class="[waybill.status=='已审核'?'text-success':'']">@{{waybill.status}}</td>
-                    <td class="text-muted">@{{waybill.id}}</td>
-                    <td class="text-muted">@{{waybill.created_at}}</td>
-                    <td>@{{waybill.type}}</td>
-                    <td>@{{waybill.owner}}</td>
-                    <td>@{{waybill.source_bill}}</td>
-                    <td>@{{waybill.wms_bill_number}}</td>
-                    <td>@{{waybill.waybill_number}}</td>
-                    <td>@{{waybill.recipient}}</td>
-                    <td>@{{waybill.recipient_mobile}}</td>
-                    <td class="text-muted">@{{waybill.origination}}</td>
-                    <td class="text-muted">@{{waybill.destination}}</td>
-                    <td>@{{waybill.carrier}}</td>
-                    <td><span v-if="waybill.type=='专线'">@{{waybill.carrier_bill}}</span>
+                    <td class="td-bill text-muted">@{{waybill.id}}</td>
+                    <td class="td-bill text-muted">@{{waybill.created_at}}</td>
+                    <td class="td-bill">@{{waybill.type}}</td>
+                    <td class="td-bill">@{{waybill.owner}}</td>
+                    <td class="td-bill">@{{waybill.source_bill}}</td>
+                    <td class="td-bill">@{{waybill.wms_bill_number}}</td>
+                    <td class="td-bill">@{{waybill.waybill_number}}</td>
+                    <td class="td-transit">@{{waybill.recipient}}</td>
+                    <td class="td-transit">@{{waybill.recipient_mobile}}</td>
+                    <td class="td-transit text-muted">@{{waybill.origination}}</td>
+                    <td class="td-transit text-muted">@{{waybill.destination}}</td>
+                    <td class="td-transit">@{{waybill.carrier}}</td>
+                    <td class="td-transit"><span v-if="waybill.type=='专线'">@{{waybill.carrier_bill}}</span>
                         <span v-if="waybill.type=='直发车'">
                             <span v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span></span></td>
-                    <td>@{{waybill.warehouse_weight}}  @{{waybill.warehouse_weight_unit}}</td>
-                    <td>@{{waybill.carrier_weight}}  @{{waybill.carrier_weight_unit}}</td>
-                    <td>@{{waybill.warehouse_weight_other}}  @{{waybill.warehouse_weight_unit_other}}</td>
-                    <td>@{{waybill.carrier_weight_other}}  @{{waybill.carrier_weight_unit_other}}</td>
+                    <td class="td-transit">@{{waybill.warehouse_weight}}  @{{waybill.warehouse_weight_unit}}</td>
+                    <td class="td-transit">@{{waybill.carrier_weight}}  @{{waybill.carrier_weight_unit}}</td>
+                    <td class="td-transit">@{{waybill.warehouse_weight_other}}  @{{waybill.warehouse_weight_unit_other}}</td>
+                    <td class="td-transit">@{{waybill.carrier_weight_other}}  @{{waybill.carrier_weight_unit_other}}</td>
                     @can('运输管理-可见费用项')
-                        <td><span v-if="waybill.type=='专线'"></span><span v-else>@{{waybill.fee}}</span></td>
-                        <td>@{{waybill.pick_up_fee}}</td>
-                        <td>@{{waybill.other_fee}}</td>
+                        <td class="td-fee"><span v-if="waybill.type=='专线'"></span><span v-else>@{{waybill.fee}}</span></td>
+                        <td class="td-fee">@{{waybill.pick_up_fee}}</td>
+                        <td class="td-fee">@{{waybill.other_fee}}</td>
                     @endcan
-                    <td>@{{waybill.dispatch_remark}}</td>
+                    <td class="td-fee">@{{waybill.dispatch_remark}}</td>
 
                     {{--                    <td>@{{waybill.wms_bill_number}}</td>--}}
                     {{--                    <td>@{{waybill.recipient}}</td>--}}
@@ -563,6 +563,9 @@
                             return true;
                         });
                     }
+                },
+                elementCount:function(elementName){
+                    return $(elementName).length;
                 }
             },
         });

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

@@ -36,7 +36,7 @@
                                     <span class="text-muted">根据条件过滤：</span>
                                 </td>
                                 <td >
-                                        <input style="width: 150px" name="created_at_start" type="date" v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''" class="form-control-sm tooltipTarget" title="选择显示指定日期的起始时间">
+                                    <input style="width: 150px" name="created_at_start" type="date" v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''" class="form-control-sm tooltipTarget" title="选择显示指定日期的起始时间">
 
                                 </td>
                                 <td>
@@ -44,7 +44,7 @@
                                            style="width:70px" @input="owner_seek"
                                            title="输入关键词快速定位下拉列表，回车确定">
                                     <select name="owner_id" id="owner_id" :class="filterData.owner_id?'bg-warning':''" v-model="filterData.owner_id" @change="setOwner"
-                                             class="form-control-sm tooltipTarget"  title="选择要显示的客户">
+                                            class="form-control-sm tooltipTarget"  title="选择要显示的客户">
                                         @foreach($owners as $owner)
                                             <option value="{{$owner->id}}">{{$owner->name}}</option>
                                         @endforeach
@@ -53,9 +53,9 @@
                                 </td>
 
                                 <td >
-                                        <input :class="filterData.logistic_number?'bg-warning':''" type="text" title="支持15内模糊搜索与15天外精确搜索" name="logistic_number" class="form-control-sm  tooltipTarget" v-model="filterData.logistic_number" style="vertical-align: middle" placeholder="快递单号"></td>
+                                    <input :class="filterData.logistic_number?'bg-warning':''" type="text" title="支持15内模糊搜索与15天外精确搜索" name="logistic_number" class="form-control-sm  tooltipTarget" v-model="filterData.logistic_number" style="vertical-align: middle" placeholder="快递单号"></td>
                                 <td >
-                                        <input :class="filterData.delivery_number?'bg-warning':''" type="text" title="支持15内模糊搜索与15天外精确搜索" name="delivery_number" class="form-control-sm  tooltipTarget" v-model="filterData.delivery_number" style="vertical-align: middle" placeholder="发货单号"></td>
+                                    <input :class="filterData.delivery_number?'bg-warning':''" type="text" title="支持15内模糊搜索与15天外精确搜索" name="delivery_number" class="form-control-sm  tooltipTarget" v-model="filterData.delivery_number" style="vertical-align: middle" placeholder="发货单号"></td>
                                 <td colspan="5"></td>
                             </tr>
                             <tr>
@@ -63,7 +63,7 @@
                                     <input style="width: 150px" type="date" name="created_at_end" v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''" class="form-control-sm tooltipTarget" title="选择显示指定日期的结束时间">
                                 </td>
                                 <td >
-                                        <input type="text" title="支持15内模糊搜索与15天外精确搜索" name="batch_number" class="form-control-sm  tooltipTarget" v-model="filterData.batch_number"  :class="filterData.batch_number?'bg-warning':''" style="vertical-align: middle" placeholder="波次号"></td>
+                                    <input type="text" title="支持15内模糊搜索与15天外精确搜索" name="batch_number" class="form-control-sm  tooltipTarget" v-model="filterData.batch_number"  :class="filterData.batch_number?'bg-warning':''" style="vertical-align: middle" placeholder="波次号"></td>
                             </tr>
                             <tr>
                                 <td>

webpack.mix.js

@@ -12,7 +12,7 @@ const mix = require('laravel-mix');
  */
 
 mix.js('resources/js/app.js', 'public/js')
-    .sass('resources/sass/app.scss', 'public/css/app200515d.css');
+    .sass('resources/sass/app.scss', 'public/css/app200519b.css');
 mix.js('resources/js/singles/rejectedIndex.js', 'public/js/singles/rejectedIndex200513.js');
 mix.copy('resources/sass/fonts/','public/fonts');
 mix.copy('resources/icon','public/icon');