Merge branch 'master' into zengjun

# Conflicts:
#	public/js/app.js
#	resources/views/order/index/delivering.blade.php
#	webpack.mix.js

app/Http/Controllers/InventoryController.php

@@ -36,32 +36,32 @@ class InventoryController extends Controller
         if ($date_start) $sql.=" and addtime > to_date('".$date_start." 00:00:00','yyyy-mm-dd hh24:mi:ss') ";
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if (!$date_start && !$date_end)$sql .= " and addtime >to_date('".date('Y-m-d H:i:s',strtotime("-1 day"))."','yyyy-mm-dd hh24:mi:ss') ";
-        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."%' ";
-        if ($SKU)$sql.=" and FMSKU like '".$SKU."%' ";
+        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."' ";
+        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
         $sql.=' group by TOCustomerID, TOLocation,FMSKU,FMLotNum union all ';
         $sql.=' select FMLotNum,FMSKU,FMCUSTOMERID 客户,sum(FMQty_Each) as 移出数量, 0 as 移入数量, FMLOCATION as 库位 ';
         $sql.=" from ACT_Transaction_Log where TransactionType='SO' ";
         if ($date_start) $sql.=" and addtime > to_date('".$date_start." 00:00:00','yyyy-mm-dd hh24:mi:ss') ";
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if (!$date_start && !$date_end)$sql .= " and addtime >to_date('".date('Y-m-d H:i:s',strtotime("-1 day"))."','yyyy-mm-dd hh24:mi:ss') ";
-        if ($TOLocation)$sql .= " and FMLOCATION like '".$TOLocation."%' ";
-        if ($SKU)$sql.=" and FMSKU like '".$SKU."%' ";
+        if ($TOLocation)$sql .= " and FMLOCATION like '".$TOLocation."' ";
+        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
         $sql.=' group by FMCustomerID, FMLocation,FMSKU,FMLotNum union all ';
         $sql.=' select FMLotNum,FMSKU,FMCUSTOMERID 客户,sum(FMQty_Each) as 移出数量,0 as 移入数量, FMLocation as 库位 ';
         $sql.=" from ACT_Transaction_Log  where TransactionType='MV' ";
         if ($date_start) $sql.=" and addtime > to_date('".$date_start." 00:00:00','yyyy-mm-dd hh24:mi:ss') ";
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if (!$date_start && !$date_end)$sql .= " and addtime >to_date('".date('Y-m-d H:i:s',strtotime("-1 day"))."','yyyy-mm-dd hh24:mi:ss') ";
-        if ($TOLocation)$sql .= " and FMLocation like '".$TOLocation."%' ";
-        if ($SKU)$sql.=" and FMSKU like '".$SKU."%' ";
+        if ($TOLocation)$sql .= " and FMLocation like '".$TOLocation."' ";
+        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
         $sql.=' group by FMLocation,FMCUSTOMERID,FMSKU,FMLotNum union all ';
         $sql.=' select FMLotNum,FMSKU,TOCustomerID 客户,0 as 移出数量,sum(TOQty_Each)as 移入数量, TOLocation as 库位 ';
         $sql.=" from ACT_Transaction_Log where TransactionType='MV' ";
         if ($date_start) $sql.=" and addtime > to_date('".$date_start." 00:00:00','yyyy-mm-dd hh24:mi:ss') ";
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if (!$date_start && !$date_end)$sql .= " and addtime >to_date('".date('Y-m-d H:i:s',strtotime("-1 day"))."','yyyy-mm-dd hh24:mi:ss') ";
-        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."%' ";
-        if ($SKU)$sql.=" and FMSKU like '".$SKU."%' ";
+        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."' ";
+        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
         $sql.=' group by TOLocation,TOCustomerID,FMSKU,FMLotNum)stockLog ';
         $sql.=' left join BAS_Customer customer on customer.CustomerID=stockLog.客户 ';
         $sql.=' left join BAS_SKU sku on sku.SKU=stockLog.FMSKU and sku.CUSTOMERID=stockLog.客户 ';
@@ -72,11 +72,11 @@ class InventoryController extends Controller
         $sql.=' ,sku.Descr_C,FMLotNum,lot.LotAtt05,lot.LotAtt08,lot.LotAtt02,lot.LotAtt04 ';
         $sql.=' , storeStatus.QTY, storeStatus.QtyAllocated,stockLog.客户  ';
         $sql.=' )result where 1=1 ';
-        if ($LotAtt05)$sql .=" and 属性仓 like '".$LotAtt05."%' ";
+        if ($LotAtt05)$sql .=" and 属性仓 like '".$LotAtt05."' ";
         if ($LotAtt02_start)$sql.=" and 失效日期 >='".$LotAtt02_start." 00:00:00' ";
         if ($LotAtt02_end)$sql.=" and 失效日期 <='".$LotAtt02_end." 23:59:59' ";
         if ($descr_c)$sql.=" and 货主 ='".$descr_c."' ";
-        if ($ALTERNATE_SKU1)$sql.=" and 产品条码 like '".$ALTERNATE_SKU1."%' ";
+        if ($ALTERNATE_SKU1)$sql.=" and 产品条码 like '".$ALTERNATE_SKU1."' ";
         if ($page&&$paginate)$sql.="  and ROWNUM<='".$page*$paginate."'";
         $sql.=' )  ';
         if ($page&&$paginate)$sql.="  where rn>'".($page-1)*$paginate."'";
@@ -93,8 +93,8 @@ class InventoryController extends Controller
     }
 
     public function exportData(Request $request){
-        if ($request->input('export')==1){
-            $oracleActTransactingLogs=json_decode($request->input('checkData'),true);
+        if (!$request->checkAllSign){
+            $oracleActTransactingLogs=json_decode($request->input('data'),true);
             return $this->export($oracleActTransactingLogs);
         }
         $oracleActTransactingLogs=$this->conditionQuery($request);

app/Http/Controllers/LaborReportController.php

@@ -34,6 +34,7 @@ class LaborReportController extends Controller
     {
         //if(!Gate::allows('人事管理')){ return redirect(url('/'));  }
         if(!Gate::allows('人事管理-临时工报表')){ return redirect(url('/'));  }
+        $paginateParams=$request->input();
         $user=Auth::user();
         if (!$user)return redirect('/');
         $userWorkgroupIds=$user->getPermittingWorkgroupIds(Gate::allows('人事管理-临时工报表-可见全部组'));
@@ -62,9 +63,8 @@ class LaborReportController extends Controller
                 $this->log(__METHOD__,"进场门卫未审核该条记录将在一小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
             }
         }
-        $request=$request->input();
         $userWorkGroups=UserWorkgroup::select('id','name')->get();
-        return view('personnel/laborReport/index',compact('laborReports','userWorkGroups','laravelEchoPrefix','permittingWorkgroups','request'));
+        return view('personnel/laborReport/index',compact('laborReports','userWorkGroups','laravelEchoPrefix','permittingWorkgroups','paginateParams'));
     }
     public function export(Request $request){
         if (!Gate::allows('人事管理-临时工报表')){return redirect(url('/')); }

app/Http/Controllers/OrderController.php

@@ -81,10 +81,7 @@ class OrderController extends Controller
         }else $request->offsetUnset('addtime');
         if ($soreference5){
             $arr=array_filter(preg_split('/[,， ]+/is', $soreference5));
-            if (count($arr)==1){
-                $sql.=" and soreference5 like '".$soreference5."%'";
-            }
-            if (count($arr)>1){
+            if (count($arr)>0){
                 $sql.=" and (soreference5 in (";
                 foreach ($arr as $index=>$str){
                     if ($index==0){

app/Http/Controllers/PackageController.php

@@ -35,8 +35,9 @@ class PackageController extends Controller
     public function index(Request $request,OwnerService $ownerService)
     {
         if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
+        $paginateParams = $request->input();
         $packages = app('packageService')->paginate($request);
-        return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'request'=>$request->input()]);
+        return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'paginateParams'=>$paginateParams]);
     }
 
     /**

app/Http/Controllers/ProcessController.php

@@ -45,9 +45,10 @@ class ProcessController extends Controller
     public function index(Request $request,OwnerService $ownerService)
     {
         if(!Gate::allows('二次加工管理-查询')){ return redirect(url('/'));  }
+        $paginateParams = $request->input();
         $processes = app('processService')->paginate($request);
         $owners=$ownerService->getSelection();
-        return view('process.index',['processes'=>$processes,'owners'=>$owners,'request'=>$request->input()]);
+        return view('process.index',['processes'=>$processes,'owners'=>$owners,'paginateParams'=>$paginateParams]);
     }
 
     //获取每日参与人
@@ -209,7 +210,7 @@ class ProcessController extends Controller
         $this->log(__METHOD__,"完成二次加工单_".__FUNCTION__,json_encode($process)." || ".json_encode($processStatistic),Auth::user()['id']);
         return ['success'=>true,'data'=>'交接完成'];
     }
-    private function statistic(Process $process){
+    private function statistic($process){
         if (count($process->processDailies)>0){
             $completed_amount=0;
             foreach ($process->processDailies as $processDaily){
@@ -605,23 +606,35 @@ class ProcessController extends Controller
         }
         if (isset($signMap[$msg]))return ['success'=>false,'data'=>'该单已被确认过！'];
         if (isset($signMap['二次加工组确认'])){
-            $signUnitPrice=$process->signUnitPrice();
+            $signUnitPrice=$process->signUnitPrice;
+            DB::beginTransaction();
             if ($signUnitPrice){
                 $process->update(['unit_price' => $signUnitPrice->mark]);
-                $this->statistic($process);
+                $result = $this->statistic($process);
+                if (!$result['success']){
+                    DB::rollBack();
+                    return $result['data'];
+                }
             }
             $process->createSign('财务确认');
             $process->destroySign();
+            DB::commit();
             return ['success'=>true,'data'=>false];
         }
         if (isset($signMap['财务确认'])){
-            $signUnitPrice=$process->signUnitPrice();
+            $signUnitPrice=$process->signUnitPrice;
+            DB::beginTransaction();
             if ($signUnitPrice){
                 $process->update(['unit_price' => $signUnitPrice->mark]);
-                $this->statistic($process);
+                $result = $this->statistic($process);
+                if (!$result['success']){
+                    DB::rollBack();
+                    return $result['data'];
+                }
             }
             $process->createSign('二次加工组确认');
             $process->destroySign();
+            DB::commit();
             return ['success'=>true,'data'=>false];
         }
         $sign = $process->createSign($msg);

app/Http/Controllers/RejectedController.php

@@ -44,12 +44,11 @@ class RejectedController extends Controller
                           QualityLabelService $qualityLabelService,LogisticService $logisticService)
     {
         if(!Gate::allows('退货管理-查询')){ return redirect(url('/login'));  }
-
+        $paginateParams = $request->input();
         $rejectedBills=app('rejectedService')->paginate($request);
         $owners = $ownerService->getSelection();
         $qualityLabels = $qualityLabelService->get();
         $logistics=$logisticService->get();
-        $paginateParams = $request->input();
         return view('rejected.search.general',compact('rejectedBills','owners','logistics',
             'paginateParams','qualityLabels'));
     }

app/Http/Controllers/WaybillsController.php → app/Http/Controllers/WaybillController.php

@@ -14,7 +14,6 @@ use App\WaybillAuditLog;
 use App\WaybillOnTop;
 use App\WaybillPriceModel;
 use App\Carrier;
-use App\CarType;
 use App\City;
 use App\Exports\Export;
 use App\Owner;
@@ -33,7 +32,7 @@ use Intervention\Image\Facades\Image;
 use Maatwebsite\Excel\Facades\Excel;
 use Ramsey\Uuid\Uuid;
 
-class WaybillsController extends Controller
+class WaybillController extends Controller
 {
     public function __construct()
     {
@@ -49,12 +48,13 @@ class WaybillsController extends Controller
     public function index(Request $request,OwnerService $ownerService,CarrierService $carrierService)
     {
         if(!Gate::allows('运输管理-查询')){ return redirect(url('/'));  }
+        $paginateParams = $request->input();
         $waybills=app('waybillService')->paginate($request);
         return view('waybill.index', [
             'waybills' => $waybills,
             'carriers' => $carrierService->getSelection(),
             'owners' => $ownerService->getSelection(),
-            'request'=>$request->input(),
+            'paginateParams'=>$paginateParams,
             'uriType'=>$request->uriType??'']);
     }
 
@@ -93,7 +93,7 @@ class WaybillsController extends Controller
         return view('waybill/edit',['waybill'=>$waybill,'carriers'=>$carrierService->getSelection(),'cities'=>$cities,'units'=>$units,'carTypes'=>$carTypes]);
     }
 
-    public function update(Request $request, $id)
+    public function update(Request $request, $id , CityService $cityService)
     {
         if(!Gate::allows('运输管理-调度')){ return redirect(url('/'));  }
         $waybill=app('waybillService')->find($id);
@@ -116,7 +116,7 @@ class WaybillsController extends Controller
         }
         if (!$request->destination)$request->destination = $waybill->destination;
         if ($request->destination_city_id && $waybill->destination_city_id != $request->destination_city_id){
-            $city=City::find($request->destination_city_id);
+            $city=$cityService->find($request->destination_city_id);
             if ($city && (mb_strpos($request->destination,$city->name)===false || mb_strpos($request->destination,$city->province_name)===false)){
                 if (mb_strpos($request->destination,$city->name)===false && mb_strpos($request->destination,$city->province_name)===false){
                     $request->destination=$city->province_name.$city->name.$request->destination;

app/Process.php

@@ -99,6 +99,7 @@ class Process extends Model
     }
 
     public function destroySign(){
-        Sign::where('signable_type','processes')->where('signable_id',$this->id)->where('field','unit_price')->delete();
+        Sign::where('signable_type','processes')->where('signable_id',$this->id)->where('field','unit_price')
+            ->orWhere('field','update_unit_price_value')->delete();
     }
 }

app/Services/CityService.php

@@ -17,4 +17,8 @@ Class CityService
         return City::query()->select($column)->get();
     }
 
+    public function find($id){
+        return City::query()->find($id);
+    }
+
 }

app/Services/PackageService.php

@@ -12,8 +12,8 @@ Class PackageService
     private function conditionQuery(Request $request){
         $packages = Package::query()->orderBy('id','DESC');
         $columnQueryRules=[
-            'logistic_number' => ['timeLimit' => 15],
-            'batch_number' => ['timeLimit' => 15],
+            'logistic_number' => ['like' => ''],
+            'batch_number' => ['like' => ''],
             'created_at_start' => ['alias' => 'created_at','startDate' => " 00:00:00"],
             'created_at_end' => ['alias' => 'created_at','endDate' => " 23:59:59"],
         ];

app/Services/ProcessService.php

@@ -10,46 +10,27 @@ use Illuminate\Http\Request;
 Class ProcessService
 { 
     private function conditionQuery(Request $request){
-        $processes=Process::filterAuthorities()->with(['tutorials','signs','processesContents'=>function($query){
+        $processes=Process::filterAuthorities()->with(['tutorials','signs','signUnitPrice','processesContents'=>function($query){
             return $query->with(['commodity'=>function($query){
                 return $query->with('barcodes');
             }]);
         }])->orderBy('processes.id','DESC');
-        $today=Carbon::now()->subDays(15)->format('Y-m-d');
         if ($request->input('commodity_barcode')){
             $barcode=$request->input('commodity_barcode');
-            $processesTem=clone $processes;
-            $processesTem=$processesTem->whereHas('processesContents',function ($query)use($barcode){
+            $processes=$processes->whereHas('processesContents',function ($query)use($barcode){
                 $query->whereHas('commodity',function ($builder)use($barcode){
                     $builder->whereHas('barcodes',function ($builder)use($barcode){
-                        $builder->where('code','like',$barcode.'%');
+                        $builder->where('code','like',$barcode);
                     });
                 });
-            })->where('created_at','>=',$today);
-            if ($processesTem->count()>0)$processes=$processesTem;
-            else{
-                $processes=$processes->whereHas('processesContents',function ($query)use($barcode){
-                    $query->whereHas('commodity',function ($builder)use($barcode){
-                        $builder->whereHas('barcodes',function ($builder)use($barcode){
-                            $builder->where('code',$barcode);
-                        });
-                    });
-                });
-            }
+            });
             $request->offsetUnset('commodity_barcode');
         }
         if ($request->input('wms_code')){
-            $processesTem=clone $processes;
             $wms_code=$request->input('wms_code');
-            $processesTem=$processesTem->whereHas('processesContents',function ($builder)use ($wms_code,$today){
-                $builder->where('wms_code','like','%'.$wms_code.'%');
-            })->where('created_at','>=',$today);
-            if ($processesTem->count()>0)$processes=$processesTem;
-            else{
-                $processes=$processes->whereHas('processesContents',function ($builder)use ($wms_code,$today){
-                    $builder->where('wms_code',$wms_code);
-                });
-            }
+            $processes=$processes->whereHas('processesContents',function ($builder)use ($wms_code){
+                $builder->where('wms_code','like',$wms_code);
+            });
             $request->offsetUnset('wms_code');
         }
         if (!$request->is_accomplish){
@@ -58,7 +39,8 @@ Class ProcessService
         $columnQueryRules=[
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'date_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'code' => ['like' => '']
+            'code' => ['like' => ''],
+            'owner_id' => ['multi' => ','],
         ];
         $processes = app(QueryService::class)->query($request,$processes,$columnQueryRules);
         return $processes;

app/Services/RejectedService.php

@@ -18,7 +18,7 @@ Class RejectedService
         $columnQueryRules=[
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'owner_id' => ['alias' => 'id_owner'],
+            'owner_id' => ['alias' => 'id_owner','multi' => ','],
             'order_number' => ['like' => ''],
             'logistic_number' => ['like' => ''],
             'mobile_sender' => ['like' => ''],

database/seeds/WaybillsCalculatesSeeder.php → database/seeds/WaybillCalculatesSeeder.php

@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Seeder;
 
-class WaybillsCalculatesSeeder extends Seeder
+class WaybillCalculatesSeeder extends Seeder
 {
     /**
      * Run the database seeds.

database/seeds/WaybillsSeeder.php → database/seeds/WaybillSeeder.php

@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Seeder;
 
-class WaybillsSeeder extends Seeder
+class WaybillSeeder extends Seeder
 {
     /**
      * Run the database seeds.

resources/js/queryForm/export.js

@@ -16,7 +16,7 @@ function excelExport(checkAllSign,checkData,url,sum,token) {
         } else {
             let form=$('<form hidden method="post" target="_blank" action="'+url+'">' +
                 '<input name="_token" value="'+token+'">' +
-                '<input name="data" value="'+checkData+'" >' +
+                "<input name='data' value='"+checkData+"' >" +
                 '</form>');
             $('body').append(form);
             form.submit();

resources/js/queryForm/queryForm.js

@@ -5,7 +5,7 @@ const query = function getQueryForm(data) {
         this.method = data.method || 'get';
         this.url = data.url || getPathname();
         this.condition = data.condition;
-        this.paginations = [50, 100, 200, 500] || data.paginations;
+        this.paginations = [50, 100, 200, 500,1000] || data.paginations;
         this.keydownfun = data.keydownfun || undefined;
         this.selectChange = data.selectChange || undefined;
         this.searchClick = data.searchClick || undefined;
@@ -35,7 +35,6 @@ const query = function getQueryForm(data) {
                 } else if ('array' === fetchJsType(map.value)) {
                     let string = map.value.join(',');
                     form.append("<input  name='" + key + "' value='" + string + "'>")
-                    console.log("string:"+string);
                 }
             }
             for (let key in this.param){
@@ -597,6 +596,7 @@ const query = function getQueryForm(data) {
                 })
                 let dom = {name: condition.name, type: 'checkbox', value: value, mold: 'check'};
                 modifyData(dom);
+                _this.onsubmit();
             });
         })
         return div1;
@@ -664,7 +664,7 @@ const query = function getQueryForm(data) {
         let label = $('#' + name + '_lab');
         let select = $('#' + name + '_sel');
         let dom_data = _data[name].value;
-        if (dom_data.length === 1 ) {
+        if (dom_data && dom_data.length === 1 ) {
             select.show();
             select.val(dom_data[0]);
             label.hide();
@@ -692,7 +692,6 @@ const query = function getQueryForm(data) {
         for (const key in _data) {
             if (!['', null, undefined].includes(_data[key].value)) {
                 if (controlJsType(_data[key].value, 'array') && _data[key].value.length === 0) {
-                    //console.log(key);
                     continue;
                 }
                 saveData[key] = {
@@ -797,7 +796,6 @@ const query = function getQueryForm(data) {
             }
         } else {
             $(_form).find("select[name='" + key + "']").val(value);
-            //console.log(value === _this.paginations[0]);
             if (key === 'paginate' && value == _this.paginations[0]) {
                 return;
             }
@@ -955,6 +953,9 @@ const query = function getQueryForm(data) {
                     if (condition.type === 'search_select') {
                         data.mold = 'select';
                     }
+                    if(condition.type === 'select_multiple_select'){
+                        data.value = [];
+                    }
                     _data[condition.name] = data;
                 } else if (['dataTime_dataTime', 'input_input', 'input_select', 'dataTime_select'].includes(condition.type)) {
                     let types = condition.type.split("_");
@@ -991,7 +992,6 @@ const query = function getQueryForm(data) {
     }
 
     function rendererOptionOnCookie() {
-        //console.log('rendererSearchFromOnCookie');
         let data = fetchCookie();
         if (data === undefined) {
             return;
@@ -1014,8 +1014,6 @@ const query = function getQueryForm(data) {
     }
 
     function rendererSearchFormOn_data() {
-        // console.log('rendererSearchFormOn_data', _data);
-
         for (let key in _data) {
             let value = _data[key].value, type = _data[key].type, mold = _data[key].mold;
             _data[key].select = value;

resources/views/inventory/statement/changeInventory.blade.php

@@ -4,92 +4,17 @@
 @section('content')
     @component('inventory.statement.menu')@endcomponent
 <div id="list" class="d-none card container-fluid" style="min-width: 1500px">
-    <form method="GET" action="{{url('inventory/statement/changeInventory')}}" id="form">
-        <table class="table  table-sm table-bordered text-nowrap  mb-0">
-            <tr v-if="isBeingFilterConditions">
-                <td colspan="10">
-                    <div class="col" style="padding:0">
-                        <a  href="{{url('inventory/statement/changeInventory')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
-                    </div></td>
-            </tr>
-            <tr>
-                <td >
-                    <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control form-control-sm" style="vertical-align: middle;max-width: 100px" @change="submit">
-                        <option value="50">50行</option>
-                        <option value="100">100行</option>
-                        <option value="200">200行</option>
-                        <option value="500">500行</option>
-                        <option value="1000">1000行</option>
-                    </select></td>
-                <td >
-                    <div class="form-inline">
-                    <input type="date" name="date_start" style="max-width: 150px" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
-                           v-model="filterData.date_start" :class="filterData.created_at_start?'bg-warning':''">
-                    <select v-model="filterData.range" name="range" @change="submit" title="查询内容的日期范围" class="form-control form-control-sm tooltipTarget m-2">
-                        <option value="">日期范围</option>
-                        <option value="1">近一天</option>
-                        <option value="3">近三天</option>
-                        <option value="7" selected>近七天</option>
-                        <option value="30">近三十天</option>
-                    </select></div>
-                </td>
-                <td>
-                    <input name="TOLocation" style="max-width: 200px" v-model="filterData.TOLocation" class="form-control form-control-sm tooltipTarget" placeholder="库位" :class="filterData.TOLocation?'bg-warning':''">
-                </td>
-                <td >
-                    <input name="LotAtt05" style="max-width: 200px" v-model="filterData.LotAtt05" class="form-control form-control-sm tooltipTarget" placeholder="属性仓" :class="filterData.LotAtt05?'bg-warning':''">
-                </td>
-                <td >
-                    <input style="max-width: 150px" type="date" class="form-control form-control-sm tooltipTarget" name="LotAtt02_start" title="选择显示失效日期的起始时间"
-                           v-model="filterData.LotAtt02_start" :class="filterData.LotAtt02_start?'bg-warning':''" >
-                </td>
-                <td colspan="5"></td>
-            </tr>
-            <tr>
-                <td >
-                    <div class="form-inline">
-                    <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="客户"
-                           style="width:70px" @input="owner_seek"
-                           title="输入关键词快速定位下拉列表，回车确定">
-                    <select name="descr_c" v-model="filterData.descr_c" @change="submit" style="max-width: 100px" class="form-control form-control-sm tooltipTarget"  title="选择要显示的客户" :class="filterData.descr_c?'bg-warning':''">
-                        <option >    </option>
-                        <option v-for="owner in owners" :value="owner.descr_c" >@{{owner.descr_c}}</option>
-                    </select></div>
-                </td>
-                <td >
-                    <input style="max-width: 150px" type="date" class="form-control form-control-sm tooltipTarget" name="date_end" title="选择显示指定日期的结束时间"
-                           v-model="filterData.date_end" :class="filterData.created_at_end?'bg-warning':''" >
-                </td>
-                <td>
-                    <input style="max-width: 200px" name="SKU" v-model="filterData.SKU" class="form-control form-control-sm tooltipTarget" placeholder="产品编码" :class="filterData.SKU?'bg-warning':''">
-                </td>
-                <td >
-                    <input style="max-width: 200px" name="ALTERNATE_SKU1" v-model="filterData.ALTERNATE_SKU1" class="form-control form-control-sm tooltipTarget" placeholder="产品条码" :class="filterData.ALTERNATE_SKU1?'bg-warning':''">
-                </td>
-                <td >
-                    <input style="max-width: 150px" type="date" class="form-control form-control-sm tooltipTarget" name="LotAtt02_end" title="选择显示失效日期的结束时间"
-                           v-model="filterData.LotAtt02_end" :class="filterData.LotAtt02_end?'bg-warning':''" >
-                </td>
-                <td colspan="5">
-                    <input type="submit" class="btn btn-sm btn-outline-dark pull-left" value="按条件搜索">
-                </td>
-            </tr>
-            <tr>
-                <td colspan="9">
-                               <span class="dropdown">
-                                        <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
-                                            导出Excel
-                                        </button>
-                                        <div class="dropdown-menu">
-                                            <a class="dropdown-item" @click="processExport(1)" href="javascript:">导出勾选内容</a>
-                                            <a class="dropdown-item" @click="processExport(2)" href="javascript:">导出所有页</a>
-                                        </div>
-                                    </span>
-                </td>
-            </tr>
-        </table>
-    </form>
+    <div id="form_div"></div>
+    <span class="dropdown">
+        <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
+                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+            导出Excel
+        </button>
+        <div class="dropdown-menu">
+            <a class="dropdown-item" @click="processExport(false)" href="javascript:">导出勾选内容</a>
+            <a class="dropdown-item" @click="processExport(true)" href="javascript:">导出所有页</a>
+        </div>
+    </span>
     <table class="table table-sm table-striped table-bordered table-hover text-nowrap card-body mt-2">
         <tr>
             <th>
@@ -132,20 +57,6 @@
             <td><span v-if="oracleActTransactingLog.占用数量">@{{ oracleActTransactingLog.占用数量 }}</span><span v-else>0</span></td>
         </tr>
     </table>
-    <form method="post" hidden action="{{url('inventory/statement/changeInventory/export')}}" id="checkDataForm">
-        @csrf
-        <input name="checkData" :value="checkData | json">
-        <input name="export" :value="filterData.export">
-        <input name="date_start" :value="filterData.date_start">
-        <input name="date_end" :value="filterData.date_end">
-        <input name="SKU" :value="filterData.SKU">
-        <input name="TOLocation" :value="filterData.TOLocation">
-        <input name="LotAtt05" :value="filterData.LotAtt05">
-        <input name="LotAtt02_start" :value="filterData.LotAtt02_start">
-        <input name="LotAtt02_end" :value="filterData.LotAtt02_end">
-        <input name="descr_c" :value="filterData.descr_c">
-        <input name="ALTERNATE_SKU1" :value="filterData.ALTERNATE_SKU1">
-    </form>
     <div >
         <button type="button" @click="pageUp()" :readonly="page>1?false:true" class="btn btn-sm " :class="page>1?'btn-outline-info':''">上一页</button>
         <button type="button" @click="pageDown()" :readonly="page<maxPage?false:true" class="btn btn-sm m-3" :class="page<maxPage?'btn-outline-info':''">下一页</button>
@@ -156,43 +67,52 @@
 @endsection
 
 @section('lastScript')
+    <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
             data:{
                 oracleActTransactingLogs:{!! $oracleActTransactingLogs !!},
                 page:Number('{{$page}}'),
-                filterData:{date_start:'',date_end:'',SKU:'',paginate:"50",TOLocation:'',range:'1',
-                    LotAtt05:'',LotAtt02_start:'',LotAtt02_end:'',descr_c:'',ALTERNATE_SKU1:'',export:''},
                 owners:[
                     @foreach($owners as $owner)
-                    {!! $owner !!},
+                    {name:'{{$owner->descr_c}}',value:'{{$owner->descr_c}}'},
                     @endforeach
                 ],
                 checkData:[],
                 maxPage:1,
-                sum:0
+                sum:0,
+                date:[{name:'1',value:'近一天'},{name:'3',value:'近三天'},{name:'7',value:'近一周'},{name:'30',value:'近一月'},],
             },
             mounted:function () {
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
-                this.initInputs();
                 $("#list").removeClass('d-none');
                 if (this.oracleActTransactingLogs.length>0){
                     this.maxPage=Math.ceil(this.oracleActTransactingLogs[0].sum/50);
                     this.sum=this.oracleActTransactingLogs[0].sum;
                 }
-            },
-            computed:{
-                isBeingFilterConditions:function(){
-
-                    for(let key in this.filterData){
-                        if(this.filterData[key] && key!='paginate'){
-                            return true
-                        }
-                    }
-                    return false;
-                },
-
+                let data=[
+                    [
+                        {name:['date_start','range'],type:'dataTime_select',tip:['选择创建日期的起始时间','查询内容的日期范围'],placeholder:['','查询内容的日期范围'],data: this.date},
+                        {name:'TOLocation',type:'input',tip:'库位：糊模查找需要在左边打上%符号',placeholder: '库位'},
+                        {name:'LotAtt05',type:'input',tip:'属性仓：糊模查找需要在左边打上%符号',placeholder: '属性仓'},
+                        {name:'LotAtt02_start',type:'dataTime',tip:'选择显示失效日期的起始时间'},
+                        {name:'descr_c',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                            placeholder:['货主','定位或多选货主'],data:this.owners},
+                    ],
+                    [
+                        {name:'date_end',type:'dataTime',tip:'选择创建日期的结束时间'},
+                        {name:'SKU',type:'input',tip:'产品编码：糊模查找需要在左边打上%符号',placeholder: '产品编码'},
+                        {name:'ALTERNATE_SKU1',type:'input',tip:'产品条码：糊模查找需要在左边打上%符号',placeholder: '产品条码'},
+                        {name:'LotAtt02_end',type:'dataTime',tip:'选择显示失效日期的结束时间'},
+                    ],
+                ];
+                this.form = new query({
+                    el:'#form_div',
+                    condition:data
+                });
+                this.form.init();
             },
             watch:{
                 checkData:{
@@ -207,59 +127,32 @@
                 }
             },
             methods:{
-                initInputs:function(){
-                    let data=this;
-                    let uriParts =decodeURI(location.href).split("?");
-                    if(uriParts.length>1){
-                        let params = uriParts[1].split('&');
-                        params.forEach(function(paramPair){
-                            let pair=paramPair.split('=');
-                            let key = pair[0], val = pair[1];
-                            $('input[name="'+key+'"]').val(val);
-                            $('select[name="'+key+'"]').val(val);
-                            decodeURI(data.filterData[key]=val);
-                        });
-                    }
-                },
                 pageUp(){
                     if (this.page<=1)return;
-                     this.page=this.page-1;
-                     this.href();
+                    this.href(this.page-1);
                 },
                 pageDown(){
                     if (this.page>=this.maxPage)return;
-                    this.page=this.page+1;
-                    this.href();
+                    this.href(this.page+1);
                 },
                 pageSkip(e){
-                  if (Number(e.target.value)<=0 || Number(e.target.value)>this.maxPage){
-                      tempTip.setDuration(2000);
-                      tempTip.show('页数不存在！ ');
-                      return
-                  }
-                  this.page=e.target.value;
-                  this.href();
+                    if (Number(e.target.value)<=0 || Number(e.target.value)>this.maxPage){
+                        tempTip.setDuration(2000);
+                        tempTip.show('页数不存在！ ');
+                        return
+                    }
+                    this.href(e.target.value);
                 },
-                href(){
-                    let url="{{url('inventory/statement/changeInventory?page=')}}"+this.page;
-                    if (this.filterData.date_start)url+="&&date_start="+this.filterData.date_start;
-                    if (this.filterData.date_end)url+="&&date_end="+this.filterData.date_end;
-                    if (this.filterData.SKU)url+="&&SKU="+this.filterData.SKU;
-                    if (this.filterData.paginate)url+="&&paginate="+this.filterData.paginate;
-                    if (this.filterData.TOLocation)url+="&&TOLocation="+this.filterData.TOLocation;
-                    if (this.filterData.LotAtt05)url+="&&LotAtt05="+this.filterData.LotAtt05;
-                    if (this.filterData.LotAtt02_start)url+="&&LotAtt02_start="+this.filterData.LotAtt02_start;
-                    if (this.filterData.LotAtt02_end)url+="&&LotAtt02_end="+this.filterData.LotAtt02_end;
-                    if (this.filterData.ALTERNATE_SKU1)url+="&&ALTERNATE_SKU1="+this.filterData.ALTERNATE_SKU1;
-                    if (this.filterData.descr_c)url+="&&descr_c="+this.filterData.descr_c;
-                    if (this.filterData.range)url+="&&range="+this.filterData.range;
+                href(page){
+                    let url = document.URL;
+                    if (url.indexOf('page='+this.page) != -1){
+                        url = url.replace("page="+this.page,"page="+page);
+                    }else{
+                        if (url.indexOf('?') == -1) url += "?page="+page;
+                        else url += "&page="+page;
+                    }
                     window.location.href=url;
                 },
-                //提交表单
-                submit:function(){
-                    let form = $("#form");
-                    form.submit();
-                },
                 //全选事件
                 checkAll(e){
                     if (e.target.checked){
@@ -272,28 +165,11 @@
                         this.checkData = [];
                     }
                 },
-                //寻找客户
-                owner_seek:function (e) {
-                    let _this=this;
-                    let $val=e.target.value;
-                    if($val==='')_this.filterData.descr_c='';
-                    else
-                        _this.owners.forEach(function (owner) {
-                            if (owner.descr_c.includes($val)){
-                                _this.filterData.descr_c=owner.descr_c;
-                            }
-                        });
-                },
-                processExport:function(value){
-                    if (value==1&&this.checkData.length <= 0) {
-                        tempTip.setDuration(2000);
-                        tempTip.showSuccess('没有勾选任何记录');
-                        return
-                    }
-                    this.filterData.export=value;
-                    setTimeout(function () {
-                        $("#checkDataForm").submit();
-                    },1);
+                processExport(checkAllSign){
+                    let url = '{{url('inventory/statement/changeInventory/export')}}';
+                    let token='{{ csrf_token() }}';
+                    let data= JSON.stringify( this.checkData );
+                    excelExport(checkAllSign,data,url,this.sum,token);
                 },
             },
             filters:{

resources/views/order/index/delivering.blade.php

@@ -19,6 +19,12 @@
                         </div>
                     </span>
                     @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
+                    @can('订单管理-编辑')
+                        <span class="btn btn-sm tooltipTarget ml-2" @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
+                              :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">冻结</span>
+                        <span class="btn btn-sm tooltipTarget ml-2" @click="deAllocationAll" style="cursor: pointer"  title="订单的取消分配条件要只局限在“分配完成”或“部分分配”"
+                              :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">取消分配</span>
+                    @endcan
                     @can('订单管理-订单问题件生成')<button type="button"  @click="orderIssueTag()" type="button" class="btn btn-sm ml-2 btn-outline-primary ">标记问题件</button>@endcan
 
                 </div>
@@ -38,7 +44,6 @@
                         </div><!-- /.modal-content -->
                     </div><!-- /.modal -->
                 </div>
-
                 <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3">
                     <tr class="text-nowrap">
                         <th>

resources/views/order/wave/search.blade.php

@@ -83,7 +83,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",
@@ -122,7 +122,6 @@
                     {name: 'start_time', type: 'dataTime', tip: '选择显示指定日期的起始时间', placeholder: ''},
                     {name: 'end_time', type: 'dataTime', tip: '选择显示指定日期的结束时间', placeholder: ''},
                     {name: 'wave_num', type: 'input', tip: '波次编号：如模糊搜索需要在条件前后输入%号，回车提交', placeholder: ''},
-                    // {name:'wave_status',type:'select',tip:'',placeholder:'',data:[]},
                 ]];
                 this.form = new query({
                     el: '#form_div',

resources/views/personnel/laborReport/index.blade.php

@@ -155,8 +155,8 @@
                     </tbody>
                 </table>
         <div class="text-info h5 btn btn">{{$laborReports->count()}}/@{{ sum }}</div>
-        <div>{{$laborReports->appends($request)->links()}}</div>
-        {{--      选择晚饭时长弹框       --}}
+        <div>{{$laborReports->appends($paginateParams)->links()}}</div>
+        {{--      选择晚饭时长弹框      --}}
         <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
@@ -234,7 +234,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};
@@ -346,8 +346,8 @@
                     ],
                     [
                         {name:'created_at_end',type:'dataTime',tip:'选择显示指定日期的结束时间'},
-                        {name:'mobile_phone',type:'input',tip:'',placeholder: '电话号'},
-                        {name:'identity_number',type:'input',tip:'',placeholder: '身份证号'},
+                        {name:'mobile_phone',type:'input',tip:'电话号:可在两侧增加百分号(%)进行模糊搜索',placeholder: '电话号'},
+                        {name:'identity_number',type:'input',tip:'身份证号:可在两侧增加百分号(%)进行模糊搜索',placeholder: '身份证号'},
                     ],
                 ];
                 this.form = new query({

resources/views/process/create.blade.php

@@ -4,7 +4,7 @@
     <div id="nav2">
         @component('process.menu')@endcomponent
     </div>
-    <div class="container-fluid" id="list">
+    <div class="container-fluid d-none" id="list">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <div class="modal fade" id="pasteData" tabindex="-1" role="dialog" aria-labelledby="pasteDataTitle" aria-hidden="true">
@@ -281,6 +281,7 @@
             },
             mounted:function(){
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
+                $("#list").removeClass('d-none');
             },
             methods:{
                 //新增库单据

resources/views/process/index.blade.php

@@ -271,14 +271,15 @@
                             <div v-if="processOne.status=='交接完成'">
                                 <div v-if="processOne.signs.length<=0">
                                     <div v-if="processOne.is_update_unit_price" >
-                                        <input type="text" :value="processOne.unit_price" :id="'unit_price_'+processOne.id" class="form-control form-control-sm" style="min-width: 50px;">
+                                        <input type="text" :value="processOne.unit_price"
+                                               :id="'unit_price_'+processOne.id" class="form-control form-control-sm" style="min-width: 50px;">
                                         <button type="button" class="btn btn-sm btn-outline-success" @click="updateUnitPrice(processOne)">确定</button>
                                         <button type="button" class="btn btn-sm btn-outline-danger" @click="processOne.is_update_unit_price=false;">取消</button>
                                     </div>
                                     <input readonly @click="processOne.is_update_unit_price=true;" v-else style="cursor: pointer;min-width: 50px" :value="processOne.unit_price" class="form-control form-control-sm">
                                 </div>
                                 <div v-else @mouseleave="processOne.is_update_unit_price=false;" @mouseenter="processOne.is_update_unit_price=true;">
-                                    <span class="flicker" style="cursor: move">@{{ processOne.unit_price }}</span>
+                                    <span class="flicker" style="cursor: move">@{{ processOne.signUnitPrice ? processOne.signUnitPrice : processOne.unit_price }}</span>
                                     <div v-if="processOne.is_update_unit_price" style="position: absolute;width: 150px;background-color: white;white-space: normal;margin-left: -50px"
                                          @mouseleave="processOne.is_update_unit_price=false;" @mouseenter="processOne.is_update_unit_price=true;">
                                         <p class="text-center text-dark font-weight-bold">待确认</p>
@@ -466,7 +467,7 @@
                 </tr>
                 </template>
             </table>
-            {{$processes->appends($request)->links()}}
+            {{$processes->appends($paginateParams)->links()}}
         </div>
 </div>
 
@@ -475,7 +476,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({
             el:"#process",
@@ -484,7 +485,7 @@
                 processes:[
                     @foreach($processes as $processOne)
                     {id:'{{$processOne->id}}',code:'{{$processOne->code}}',owner_name:'{{$processOne->owner_name}}',owner_id:'{{$processOne->owner_id}}',operatorLogs:{!! $processOne->operatorLogs !!},
-                        process_method_name:'{{$processOne->process_method_name}}',amount:'{{$processOne->amount}}',type:'{{$processOne->type}}',signs:{!!$processOne->signs  !!}
+                        process_method_name:'{{$processOne->process_method_name}}',amount:'{{$processOne->amount}}',type:'{{$processOne->type}}',signs:{!!$processOne->signs  !!},signUnitPrice:'{{$processOne->signUnitPrice ? $processOne->signUnitPrice->mark :''}}'
                         ,tutorials:{!! $processOne->tutorials !!},processesContents:{!! $processOne->processesContents !!},unit_price:'{{$processOne->unit_price}}',created_at:'{{$processOne->created_at}}',
                         completed_amount:'{{$processOne->completed_amount}}',status:'{{$processOne->status}}',remark:'{{$processOne->remark}}',detailFolding:false,openProcessHour:false,is_multi_row:false,is_verifier_show:false,is_update_unit_price:false,
                         buttonTexts:{'审核':'审','回滚':'回','编辑':'编','接单':'接','驳回':'驳','质量验收':'验','完成':'完','交接完成':'交','查看单据':'查','登记工时':'登'},
@@ -557,7 +558,8 @@
                 let data=[
                     [
                         {name:'date_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'owner_id',type:'select',placeholder: '客户',data:this.owners},
+                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                            placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'wms_code',type:'input',tip:'单据号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '单据号'},
                         {name:'status',type:'select',placeholder: '状态',data:this.status},
                     ],
@@ -1429,6 +1431,7 @@
                             if (response.data.success) {
                                 process.signs.push(response.data.sign);
                                 process.is_update_unit_price = false;
+                                process.unit_price = unit_price;
                                 tempTip.setDuration(2000);
                                 tempTip.showSuccess('“' + process.code + "”价格修改成功,确认通过后生效！");
                                 return;
@@ -1460,7 +1463,9 @@
                                 }else{
                                     _this.signs[process.code]=[];
                                     process.signs=[];
+                                    process.unit_price = process.signUnitPrice;
                                 }
+                                if (process.is_update_unit_price)process.is_update_unit_price = false;
                                 tempTip.setDuration(2000);
                                 tempTip.showSuccess('“' + process.code + "”新价格通过" + msg + "审核！");
                                 return;

resources/views/rejected/search/general.blade.php

@@ -209,7 +209,7 @@
         let csrfInput='@csrf';
     </script>
     <script src="{{asset('js/queryForm/export.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -233,13 +233,14 @@
                     @endforeach
                 ],
             },
-            mounted:function(){console.log(decodeURIComponent('eJxtkltLw0AQhf%2FLQt%2BWZO%2B7CRSJVqSCt7YWVPqQtiGW2gttlErxv3smbTGokIdvZ86eObNkzzbdKUulEF4Izj6KDUuZjETkGGfVFh2bOBGkF1IGCCY%2FNeutUUnC2Xgz7LD0RSoIrA8jqvRQOFS8EiN%2BQBeAyuAjTRcS9lpV620ax%2Bu8LKJ1MduulmW0KGbVe76MJqtFvH7LP8f5ZP7cj2fLabE7q%2FJxW7cuVSuIVnKBlAxmiwGZOc%2BlESj9Dzo5QSBwTfAnoL2daYIhUAB1AkkgAORsEy4VOdvQgEPLH29ZctYEJ0OrjyOsOCY0uGVIYygztQxuGTI0EFvyMRBbiqohdlTR0DgSazh78tFI6A09yrx%2BlD0%2Fv%2Bs8ofEboMgbz8YztGCBCbpmJ%2BGE5P377PbvkZa0qhYqidkqHJhWFYF3usM6XeAuqQ%2BYVtE0mnqDfwzd7axcgorr3eCx7GbZVZn1Htpt9vUNb5aS1Q%3D%3D'))
+            mounted:function(){
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 $('#list').removeClass('d-none');
                 let data=[
                     [
                         {name:'created_at_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'owner_id',type:'search_select',tip:['',''],placeholder:['客户',''],data:this.owners},
+                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                            placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'order_number',type:'input',tip:'订单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'订单号'},
                         {name:'logistic_number_return',type:'input',tip:'退回单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'退回单号'},
                         {name:'logistic_number',type:'input',tip:'原单单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'原单单号'},

resources/views/waybill/index.blade.php

@@ -308,7 +308,7 @@
                 </div>
             </div>
             <div class="text-info h5 btn btn">{{$waybills->count()}}/{{$waybills->total()}}</div>
-            {{$waybills->appends($request)->links()}}
+            {{$waybills->appends($paginateParams)->links()}}
         </div>
     </div>
 
@@ -362,7 +362,7 @@
         }
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',

resources/views/waybill/menu.blade.php

@@ -27,7 +27,7 @@
             </li>@endcan
             @can('运输管理-删除')
             <li class="nav-item">
-                <a class="nav-link" href="{{url('waybill/recycle')}}">回收站</a>
+                <a class="nav-link" href="{{url('waybill/recycle')}}" :class="{active:isActive('recycle',2)}">回收站</a>
             </li>
             @endcan
         </ul>

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

@@ -70,11 +70,7 @@
                     </tr>
                 </table>
                 <div class="text-info h5 btn btn">{{$packages->count()}}/{{$packages->total()}}</div>
-                @if(isset($request))
-                    {{$packages->appends($request)->links()}}
-                @else
-                    {{$packages->links()}}
-                @endif
+                {{$packages->appends($paginateParams)->links()}}
             </div>
         </div>
     </div>
@@ -82,7 +78,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

routes/apiLocal.php

@@ -25,6 +25,6 @@ Route::post('logistic/logisticNumberReturnIsUnique', 'RejectedBillController@api
 
 Route::post('commodity/getCommodityByBarcode', 'CommodityController@apiGetCommodityByBarcode');
 
-Route::post('waybill/recoverSelected', 'WaybillsController@apiRestoreSelected');
-Route::post('waybill/changeFee', 'WaybillsController@changeFee');
+Route::post('waybill/recoverSelected', 'WaybillController@apiRestoreSelected');
+Route::post('waybill/changeFee', 'WaybillController@changeFee');
 

routes/web.php

@@ -67,8 +67,8 @@ Route::post('maintenance/paperBox/excel/import','PaperBoxController@import');
 Route::resource('maintenance/paperBox', 'PaperBoxController');
 Route::get('maintenance/paperBox/excel/goImport',function (){return view('maintenance.paperBox.import');});
 
-Route::post('waybill/deleteImg','WaybillsController@deleteImg');
-Route::post('waybill/upload','WaybillsController@upload');
+Route::post('waybill/deleteImg','WaybillController@deleteImg');
+Route::post('waybill/upload','WaybillController@upload');
 Route::get('waybill/relating',function (){return view('waybill.menuWaybill');});
 Route::resource('maintenance/waybillPriceModel','WaybillPriceModelsController');
 Route::get('maintenance/waybillPriceModel/excel/goImport',function (){return view('maintenance.waybillPriceModel.import');});
@@ -77,22 +77,22 @@ Route::get('maintenance/waybillPriceModel/cities/{province_id}','WaybillPriceMod
 Route::resource('waybill/waybillFinancialSnapshot','WaybillFinancialSnapshotsController');
 Route::resource('waybill/waybillFinancialExcepted','WaybillFinancialExceptedController');
 
-Route::get('waybill/recycle', 'WaybillsController@recycle');   //回收站
-Route::any('waybill/ontop/top','WaybillsController@waybillOnTop');
-Route::any('waybill/ontop/cancel','WaybillsController@cancelOnTop');
+Route::get('waybill/recycle', 'WaybillController@recycle');   //回收站
+Route::any('waybill/ontop/top','WaybillController@waybillOnTop');
+Route::any('waybill/ontop/cancel','WaybillController@cancelOnTop');
 
-Route::get('waybill/index','WaybillsController@index');
-Route::get('waybill/delivering','WaybillsController@delivering');
-Route::post('waybill/storeCarrierBill','WaybillsController@storeCarrierBill');
-Route::post('waybill/is/waybillPriceModel','WaybillsController@isWaybillPriceModel');
-Route::post('waybill/addCounty','WaybillsController@addCounty');
-Route::any('waybill/waybillAudit','WaybillsController@waybillAudit');
-Route::any('waybill/waybillEdit/{id}','WaybillsController@waybillEdit');
-Route::any('waybill/waybillRetreatAudit','WaybillsController@waybillRetreatAudit');
-Route::any('waybill/waybillEndAudit','WaybillsController@waybillEndAudit');
-Route::any('waybill/export','WaybillsController@export');
-Route::any('waybill/waybillUpdate/{id}','WaybillsController@waybillUpdate');
-Route::resource('waybill','WaybillsController');
+Route::get('waybill/index','WaybillController@index');
+Route::get('waybill/delivering','WaybillController@delivering');
+Route::post('waybill/storeCarrierBill','WaybillController@storeCarrierBill');
+Route::post('waybill/is/waybillPriceModel','WaybillController@isWaybillPriceModel');
+Route::post('waybill/addCounty','WaybillController@addCounty');
+Route::any('waybill/waybillAudit','WaybillController@waybillAudit');
+Route::any('waybill/waybillEdit/{id}','WaybillController@waybillEdit');
+Route::any('waybill/waybillRetreatAudit','WaybillController@waybillRetreatAudit');
+Route::any('waybill/waybillEndAudit','WaybillController@waybillEndAudit');
+Route::any('waybill/export','WaybillController@export');
+Route::any('waybill/waybillUpdate/{id}','WaybillController@waybillUpdate');
+Route::resource('waybill','WaybillController');
 
 
 Route::any('waybillFinancialSnapshot/export/{id}','WaybillFinancialSnapshotsController@export');
@@ -289,7 +289,7 @@ Route::group(['prefix'=>'personnel'],function(){
 Route::group(['prefix'=>'inventory'],function (){
     //动库报表
     Route::get('statement/changeInventory','InventoryController@changeInventory');
-    Route::post('statement/changeInventory/export','InventoryController@exportData');
+    Route::any('statement/changeInventory/export','InventoryController@exportData');
     Route::get('statement/changeInventory/downLoadExcel','InventoryController@downLoadExcel');
     Route::post('statement/changeInventory/deleteExcel','InventoryController@deleteExcel');
 });

tests/Feature/WaybillsTest.php → tests/Feature/WaybillTest.php

@@ -13,7 +13,7 @@ use Tests\TestCase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class WaybillsTest extends TestCase
+class WaybillTest extends TestCase
 {
     use RefreshDatabase;
 

tests/codeCoverage/Http/Controllers/WaybillsController.php.html

@@ -2,7 +2,7 @@
 <html lang="en">
  <head>
   <meta charset="UTF-8">
-  <title>Code Coverage for D:\Demo\bswas\app\Http\Controllers\WaybillsController.php</title>
+  <title>Code Coverage for D:\Demo\bswas\app\Http\Controllers\WaybillController.php</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href="../../.css/bootstrap.min.css" rel="stylesheet" type="text/css">
   <link href="../../.css/octicons.css" rel="stylesheet" type="text/css">
@@ -19,7 +19,7 @@
          <li class="breadcrumb-item"><a href="../../index.html">D:\Demo\bswas\app</a></li>
          <li class="breadcrumb-item"><a href="../index.html">Http</a></li>
          <li class="breadcrumb-item"><a href="index.html">Controllers</a></li>
-         <li class="breadcrumb-item active">WaybillsController.php</li>
+         <li class="breadcrumb-item active">WaybillController.php</li>
 
        </ol>
       </nav>
@@ -73,7 +73,7 @@
       </tr>
 
       <tr>
-       <td class="danger"><abbr title="App\Http\Controllers\WaybillsController">WaybillsController</abbr></td>
+       <td class="danger"><abbr title="App\Http\Controllers\WaybillController">WaybillController</abbr></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -403,7 +403,7 @@
      <tr><td><div align="right"><a name="21"></a><a href="#21">21</a></div></td><td class="codeLine"><span class="keyword">use</span><span class="default">&nbsp;</span><span class="default">Maatwebsite</span><span class="default">\</span><span class="default">Excel</span><span class="default">\</span><span class="default">Facades</span><span class="default">\</span><span class="default">Excel</span><span class="keyword">;</span></td></tr>
      <tr><td><div align="right"><a name="22"></a><a href="#22">22</a></div></td><td class="codeLine"><span class="keyword">use</span><span class="default">&nbsp;</span><span class="default">Ramsey</span><span class="default">\</span><span class="default">Uuid</span><span class="default">\</span><span class="default">Uuid</span><span class="keyword">;</span></td></tr>
      <tr><td><div align="right"><a name="23"></a><a href="#23">23</a></div></td><td class="codeLine"></td></tr>
-     <tr><td><div align="right"><a name="24"></a><a href="#24">24</a></div></td><td class="codeLine"><span class="keyword">class</span><span class="default">&nbsp;</span><span class="default">WaybillsController</span><span class="default">&nbsp;</span><span class="keyword">extends</span><span class="default">&nbsp;</span><span class="default">Controller</span></td></tr>
+     <tr><td><div align="right"><a name="24"></a><a href="#24">24</a></div></td><td class="codeLine"><span class="keyword">class</span><span class="default">&nbsp;</span><span class="default">WaybillController</span><span class="default">&nbsp;</span><span class="keyword">extends</span><span class="default">&nbsp;</span><span class="default">Controller</span></td></tr>
      <tr><td><div align="right"><a name="25"></a><a href="#25">25</a></div></td><td class="codeLine"><span class="keyword">{</span></td></tr>
      <tr><td><div align="right"><a name="26"></a><a href="#26">26</a></div></td><td class="codeLine"></td></tr>
      <tr><td><div align="right"><a name="27"></a><a href="#27">27</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">public</span><span class="default">&nbsp;</span><span class="keyword">function</span><span class="default">&nbsp;</span><span class="default">index</span><span class="keyword">(</span><span class="default">Request</span><span class="default">&nbsp;</span><span class="default">$request</span><span class="keyword">)</span></td></tr>

tests/codeCoverage/Http/Controllers/index.html

@@ -772,7 +772,7 @@
       </tr>
 
       <tr>
-       <td class="warning"><img src="../../.icons/file-code.svg" class="octicon" /><a href="WaybillsController.php.html">WaybillsController.php</a></td>
+       <td class="warning"><img src="../../.icons/file-code.svg" class="octicon" /><a href="WaybillController.php.html">WaybillController.php</a></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="65.09" aria-valuemin="0" aria-valuemax="100" style="width: 65.09%">
            <span class="sr-only">65.09% covered (warning)</span>

webpack.mix.js

@@ -22,5 +22,5 @@ mix.copy('resources/images','public/images');
 mix.copy('resources/icon/faviconc.ico','public/faviconc.ico');
 mix.js('resources/js/trix.js','public/js/trix.js');
 mix.copy('resources/sass/trix.css','public/css/trix.css');
-mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200803a.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export.js');