Merge branch 'master' into Haozi

# Conflicts:
#	app/Http/Controllers/LaborReportController.php
#	resources/views/personnel/laborReport/index.blade.php

app/Console/Commands/FluxOrderFix.php

@@ -44,9 +44,16 @@ class FluxOrderFix extends Command
     }
 
     public function fixEdisendflagAtWrong(){
-        OracleDOCOrderHeader::where('edisendflag','W')->whereNotNull('edisendtime')->where('edisendtime','>',Carbon::now()->subDays(2))
-            ->update(['edisendflag'=>'N','manualflag'=>'N',
-//                'edisendtime'=>null
-            ]);
+        OracleDOCOrderHeader::where('edisendflag','W')
+            ->whereNull('EDI_RESENDTIME')
+            ->where('edisendtime','>',Carbon::now()->subDays(2))
+            ->where('ediremarks2','<>','不支持的单据类型')
+        ->update(['edisendflag'=>'N','manualflag'=>'N','EDI_RESENDTIME'=>Carbon::now()]);
+
+        OracleDOCOrderHeader::where('edisendflag','W')
+            ->where('EDI_RESENDTIME','>',Carbon::now()->subDays(2))
+            ->where('edisendtime','>',Carbon::now()->subDays(2))
+            ->where('ediremarks2','<>','不支持的单据类型')
+        ->update(['edisendflag'=>'N','manualflag'=>'N']);
     }
 }

app/Console/Kernel.php

@@ -29,7 +29,7 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         $schedule->command('LogExpireDelete')->dailyAt('00:01');
-        $schedule->command('FluxOrderFix')->hourlyAt(6);
+        $schedule->command('FluxOrderFix')->hourlyAt(1);
     }
 
     /**

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

@@ -33,7 +33,7 @@ class LaborReportController extends Controller
     public function index(Request $request)
     {
         if(!Gate::allows('人事管理-临时工报表')){ return redirect(url('/'));  }
-        $requests=$request->input();
+        $paginateParams=$request->input();
         $user=Auth::user();
         if (!$user)return redirect('/');
         $laravelEchoPrefix = config('database.redis.options.prefix');

app/Http/Controllers/OrderController.php

@@ -37,7 +37,20 @@ class OrderController extends Controller
         if ($orderdate_end){
             $sql.=" and addtime<='".$orderdate_end.":59' ";
         }
-        if ($customerid)$sql.=" and customerid='".$customerid."'";
+        if ($customerid){
+            $arr = explode(',',$customerid);
+            if (count($arr)>0) {
+                $sql.=" and customerid in (";
+                foreach ($arr as $index=>$str){
+                    if ($index==0){
+                        $sql.="'".$str."'";
+                        continue;
+                    }
+                    $sql.=",'".$str."'";
+                }
+                $sql.=")";
+            }
+        }
         if ($orderno)$sql.=" and orderno like '".$orderno."%'";
         if ($codename_c&&$codename_c_end)$sql.=" and sostatus between '".$codename_c."' and '".$codename_c_end."'";
         if ($codename_c&&!$codename_c_end)$sql.=" and sostatus = '".$codename_c."'";
@@ -45,7 +58,10 @@ class OrderController extends Controller
         if ($carriername)$sql.=" and carriername like '".$carriername."%'";
         if ($soreference1){
             $arr=array_filter(preg_split('/[,， ]+/is', $soreference1));
-            if (count($arr)>0){
+            if (count($arr)==1){
+                $sql.=" and soreference1 like '".$soreference1."%'";
+            }
+            if (count($arr)>1){
                 $sql.=" and soreference1 in (";
                 foreach ($arr as $index=>$str){
                     if ($index==0){
@@ -93,10 +109,10 @@ class OrderController extends Controller
             }
         }
         if ($edisendflag2){
-            $sql.=" and edisendflag2 = '".$edisendflag2."'";
+            $sql.=" and edisendflag2 like '".$edisendflag2."%'";
         }
         if ($edisendflag){
-            $sql.=" and edisendflag = '".$edisendflag."'";
+            $sql.=" and edisendflag like '".$edisendflag."%'";
         }
         return $sql;
     }

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){
@@ -414,16 +415,16 @@ class ProcessController extends Controller
     public function updateProcessDailyParticipant(Request $request){
         if(!Gate::allows('二次加工管理-登记工时')){ return redirect(url('/'));  }
         $id=$request->input('id');
-        if (!$id) return ['status'=>"error",'data'=>"修改失败，ID未传递"];
+        if (!$id) return ['success'=>false,'data'=>"修改失败，ID未传递"];
         $errors=$this->validatorProcessDailyParticipant($request)->errors();
-        if (count($errors)>0)return ['status'=>"error",'data'=>$errors];
+        if (count($errors)>0)return ['success'=>false,'data'=>$errors];
         $processDailyParticipant=ProcessDailyParticipant::with(['processDaily'=>function($query){
             $query->with('process');
         },'userLabor'])->find($id);
         if (!$processDailyParticipant || !$processDailyParticipant->processDaily
-            || !$processDailyParticipant->processDaily->process || !$processDailyParticipant->userLabor) return ['status'=>"error",'data'=>"修改失败，该信息不存在"];
+            || !$processDailyParticipant->processDaily->process || !$processDailyParticipant->userLabor) return ['success'=>false,'data'=>"修改失败，该信息不存在"];
         if ($processDailyParticipant->userLabor->isOccupiedAt($processDailyParticipant->processDaily->date,$request->started_at)){
-            ['status'=>"error",'data'=>"该临时工此时间段已存在工作记录"];
+            ['success'=>false,'data'=>"该临时工此时间段已存在工作记录"];
         }
         $processDailyParticipant->user_id=$request->input('user_id');
         $processDailyParticipant->started_at=$request->input('started_at');
@@ -440,7 +441,7 @@ class ProcessController extends Controller
             $this->statistic($processDailyParticipant->processDaily->process);
         }
         //$processDailyParticipant=$this->countParticipantManHour($processDailyParticipant,$processDailyParticipant->processDaily->date);
-        return ['status'=>"success",'data'=>$processDailyParticipant];
+        return ['success'=>true,'data'=>$processDailyParticipant];
     }
     /*//参与人审核
     public function processDailyParticipantAudit($id){
@@ -605,20 +606,27 @@ 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;
             if ($signUnitPrice){
                 $process->update(['unit_price' => $signUnitPrice->mark]);
-                $this->statistic($process);
+                $result = $this->statistic($process);
+                if (!$result['success'])return $result['data'];
             }
             $process->createSign('二次加工组确认');
             $process->destroySign();
@@ -1123,8 +1131,8 @@ class ProcessController extends Controller
             'user_id'=>'参与人',
             'started_at'=>'开始时间',
             'ended_at'=>'结束时间',
-            'hour_price'=>'计时工资',
-            'unit_price'=>'计件工资',
+            'hour_price'=>'计时单价',
+            'unit_price'=>'计件单价',
             'dinner_duration'=>'晚饭时间',
             'hour_count'=>'计时工时',
             'unit_count'=>'计件数量',

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/TestController.php

@@ -87,29 +87,14 @@ class TestController extends Controller
     function t2(Request $request)
     { //x        $packagesBatch=Package::where('batch_number',$batch_number)->first();
 
-        $uploaded = 0;
-        $count = DB::table('logs')->where('operation', 'like', "%PackageController::new_%")
-            ->where('created_at', '>', "2020-06-03 14:02:00")
-            ->where('created_at', '<', "2020-06-03 15:05:00")
-            ->where('type', "request_new_")
-            ->where('description', 'like', "%W200603000117%")
-            ->count();
-        $requests = DB::table('logs')->where('operation', 'like', "%PackageController::new_%")
-            ->where('created_at', '>', "2020-06-03 14:02:00")
-            ->where('created_at', '<', "2020-06-03 15:05:00")
-            ->where('description', 'like', "%W200603000117%")
-            ->where('type', "request_new_")
+
+        $objs=OracleDOCOrderHeader::select(['EDI_RESENDTIME'])->where('edisendflag','W')
+            ->where('EDI_RESENDTIME','>',Carbon::now()->subDays(2))
+            ->where('edisendtime','>',Carbon::now()->subDays(2))
+            ->where('ediremarks2','<>','不支持的单据类型')
             ->get();
-        $requests->each(function ($request) use (&$uploaded) {
-            $requestJson = json_decode($request->description, true);
-            $response = Zttp::withHeaders(['content-type' => 'application/json',
-            ])->post('https://was.baoshi56.com/api/thirdPart/flux/package/new',
-                $requestJson
-            );
-            if ($response->json() && $response->json()['response'] && $response->json()['response']['flag'] == 'Y')
-                $uploaded += 1;
-        });
-        dd($uploaded . '/' . $count);
+//        ->update(['edisendflag'=>'N','manualflag'=>'N','EDI_RESENDTIME'=>Carbon::now()]);
+        dd($objs);
 
 
     }
@@ -292,7 +277,6 @@ class TestController extends Controller
     /*1*/
     function test(Request $request)
     {/**/
-        dd(City::select('id','name')->first());
     }
 
 }

app/Http/Controllers/UserLaborController.php

@@ -140,7 +140,7 @@ class UserLaborController extends Controller
             'mobile_phone'=>'电话',
             'gender'=>'性别',
             'identity_number'=>'身份证号',
-            'default_hour_price'=>'默认计时工资',
+            'default_hour_price'=>'默认计时单价',
             'name'=>'劳务所',
         ])->validate();
         $userDetail=UserDetail::find($id);

app/Http/Controllers/WaybillsController.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;
@@ -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??'']);
     }
 
@@ -96,7 +96,7 @@ class WaybillsController extends Controller
     public function update(Request $request, $id)
     {
         if(!Gate::allows('运输管理-调度')){ return redirect(url('/'));  }
-        $waybill=Waybill::find($id);
+        $waybill=app('waybillService')->find($id);
         if (!$request->warehouse_weight && $request->warehouse_weight_unit_id){
             $request->offsetUnset('warehouse_weight_unit_id');
         }

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/LaborReportService.php

@@ -39,10 +39,11 @@ class LaborReportService
             $laborReports->orWhereNull('user_workgroup_id');
         }
         $columnQueryRules=[
-            'enter_number' => ['timeLimit' => 15],
+            'enter_number' => ['like' => ''],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'identity_number' => ['timeLimit' => 15]
+            'identity_number' => ['like' => ''],
+            'mobile_phone' => ['like' => ''],
         ];
         $laborReports = app(QueryService::class)->query($request,$laborReports,$columnQueryRules);
         return $laborReports;

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,9 +18,11 @@ 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'],
-            'order_number' => ['timeLimit' => 15],
-            'logistic_number' => ['timeLimit' => 15]
+            'owner_id' => ['alias' => 'id_owner','multi' => ','],
+            'order_number' => ['like' => ''],
+            'logistic_number' => ['like' => ''],
+            'mobile_sender' => ['like' => ''],
+            'checked_numbers' => ['like' => ''],
         ];
         if($request->id_quality_label!=''){
             if($request->id_quality_label==1){

app/Services/WaybillService.php

@@ -19,12 +19,12 @@ Class WaybillService
             ->orderBy('waybill_on_tops.updated_at','desc')
             ->orderBy('waybills.id','desc');
         $columnQueryRules=[
-            'waybill_number' => ['timeLimit' => 15],
-            'carrier_bill' => ['timeLimit' => 15],
+            'waybill_number' => ['like' => ''],
+            'carrier_bill' => ['like' => ''],
             'owner_id' => ['multi' => ','],
-            'wms_bill_number' => ['timeLimit' => 15],
-            'origination' => ['timeLimit' => 15],
-            'destination' => ['timeLimit' => 15],
+            'wms_bill_number' => ['like' => ''],
+            'origination' => ['like' => ''],
+            'destination' => ['like' => ''],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'uriType' => ['alias' => 'type']

app/Services/common/QueryService.php

@@ -60,7 +60,7 @@ Class QueryService
                     $isExecute = true;
                 }
                 if ($rule === 'like'){
-                    $query = $query->where($tableName.$column,'like',$value.$request->input($param).'%');
+                    $query = $query->where($tableName.$column,'like',$value.$request->input($param).$value);
                     $isExecute = true;
                 }
                 if ($rule === 'multi'){

database/migrations/2020_03_25_164303_create_process_daily_participants_table.php

@@ -21,9 +21,9 @@ class CreateProcessDailyParticipantsTable extends Migration
             $table->bigInteger('user_id')->index()->comment('外键用户');
             $table->time('started_at')->nullable()->comment('开始时间');
             $table->time('ended_at')->nullable()->comment('开始时间');
-            $table->decimal('hour_price')->nullable()->comment('计时工资');
+            $table->decimal('hour_price')->nullable()->comment('计时单价');
             $table->tinyInteger('hour_count')->nullable()->comment('计时工时');
-            $table->decimal('unit_price')->nullable()->comment('计件工资');
+            $table->decimal('unit_price')->nullable()->comment('计件单价');
             $table->integer('unit_count')->nullable()->comment('计件数');
             $table->integer('dinner_duration')->default(0)->comment('晚饭时间');
             $table->string('remark')->nullable()->comment('备注');

database/migrations/2020_03_25_164350_create_user_labors_table.php

@@ -17,7 +17,7 @@ class CreateUserLaborsTable extends Migration
     {
         Schema::create('user_labors', function (Blueprint $table) {
             $table->bigInteger('user_id')->unique()->comment('外键用户');
-            $table->decimal('default_hour_price')->nullable()->comment('默认计时工资');
+            $table->decimal('default_hour_price')->nullable()->comment('默认计时单价');
             $table->string('company')->nullable()->index()->comment('劳务所');
         });
     }

database/migrations/2020_05_22_173230_change_user_labors_table.php

@@ -17,7 +17,7 @@ class ChangeUserLaborsTable extends Migration
         Schema::dropIfExists('user_labors');
         Schema::create('user_labors', function (Blueprint $table) {
             $table->bigInteger('user_id')->index()->comment('外键用户');
-            $table->decimal('default_hour_price')->nullable()->comment('默认计时工资');
+            $table->decimal('default_hour_price')->nullable()->comment('默认计时单价');
             $table->bigInteger('labor_company_id')->nullable()->index()->comment('外键劳务所');
         });
     }

public/js/app.js

@@ -60732,6 +60732,8 @@ module.exports = yeast;
 
 __webpack_require__(/*! ./bootstrap */ "./resources/js/bootstrap.js");
 
+__webpack_require__(/*! ./mounted */ "./resources/js/mounted.js");
+
 window.Vue = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.common.js");
 window.tempTip = __webpack_require__(/*! ./utilities/tempTip */ "./resources/js/utilities/tempTip.js");
 window.getGetVal = __webpack_require__(/*! ./utilities/getGetVal */ "./resources/js/utilities/getGetVal.js");
@@ -60814,6 +60816,29 @@ window.initEcho = function () {
 
 /***/ }),
 
+/***/ "./resources/js/mounted.js":
+/*!*********************************!*\
+  !*** ./resources/js/mounted.js ***!
+  \*********************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+//解决input number类型上下滚动 禁用滚轮事件
+setTimeout(function () {
+  for (var i = 0; i < $("input[type='number']").length; i++) {
+    $("input[type='number']")[i].setAttribute('onmousewheel', 'return false'); //禁止谷歌浏览器、Opera浏览器以及360浏览器等采用谷歌内核的浏览器
+
+    $("input[type='number']")[i].addEventListener('DOMMouseScroll', MouseWheel, false); //禁止Firefox浏览器
+  }
+}, 100);
+
+function MouseWheel(event) {
+  event = event || window.event;
+  event.preventDefault();
+}
+
+/***/ }),
+
 /***/ "./resources/js/utilities/datetimeRelating.js":
 /*!****************************************************!*\
   !*** ./resources/js/utilities/datetimeRelating.js ***!

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;
@@ -551,10 +551,10 @@ const query = function getQueryForm(data) {
         })
         input.blur(function () {
             setTimeout(function () {
-                if (!select_div.is(':focus')) {
+                if (!ul_div.is(':focus')) {
                     ul_div.hide();
                 }
-            }, 1000);
+            }, 100);
         })
         select_div.focus(function () {
             ul_div.show();
@@ -566,6 +566,11 @@ const query = function getQueryForm(data) {
             ul_div.hide();
         })
         ul_div.hide();
+        ul_div.mouseleave(function () {
+            if(_data[condition.name].value){
+                _this.onsubmit();
+            }
+        });
         return div;
     }
 
@@ -584,6 +589,7 @@ const query = function getQueryForm(data) {
                 })
                 let dom = {name: condition.name, type: 'checkbox', value: value, mold: 'check'};
                 modifyData(dom);
+                _this.onsubmit();
             });
         })
         return div1;
@@ -620,15 +626,18 @@ const query = function getQueryForm(data) {
             li.click(function () {
                 let value = li.attr('value');
                 let dom_data = _data[name].value;
-                if (controlJsType(dom_data, ['undefined', 'null', 'string'])) {
+                if(!dom_data){
+                    dom_data = [];
+                }
+                if (controlJsType(dom_data,'string')){
                     dom_data = [dom_data];
                 }
                 if (dom_data.includes(value)) {
                     dom_data.splice(dom_data.indexOf(value), 1);
                 } else {
                     dom_data.push(value);
-                    dom_data = arrDuplicate(dom_data);
                 }
+                dom_data = arrDuplicate(dom_data);
                 let dom = {
                     name: ul.attr('name'),
                     type: 'select_multiple_select',
@@ -636,10 +645,10 @@ const query = function getQueryForm(data) {
                     select: dom_data,
                     mold: 'select_multiple_select'
                 };
+                modifyData(dom)
                 modifyData(dom);
                 redenerUl(ul);
                 isMultiple(ul.attr('name'));
-                _this.onsubmit();
             })
         })
     }
@@ -647,11 +656,7 @@ const query = function getQueryForm(data) {
     function isMultiple(name) {
         let label = $('#' + name + '_lab');
         let select = $('#' + name + '_sel');
-        let dom_data = _data[name].data;
-        console.log(_data[name],_data);
-        console.log(dom_data);
-        console.log(name);
-
+        let dom_data = _data[name].value;
         if (dom_data.length === 1 ) {
             select.show();
             select.val(dom_data[0]);
@@ -1088,12 +1093,15 @@ const query = function getQueryForm(data) {
                     }
                 } else if (key === 'page') {
                     _page = data[key];
-                }  else if(_data[key].type === 'select_multiple_select' && !data[key]){
-                    _data[key].value = data[key].split(',');
+                }  else if(_data[key].type === 'select_multiple_select' ){
+                    if(!_data[key]){
+                        _data[key].value = [];
+                    }else{
+                        _data[key].value = data[key].split(',');
+                    }
                 }else {
                     _data[key].value = data[key];
                 }
-                // console.log('key', key, typeof key);
             }
         }
     }
@@ -1232,4 +1240,4 @@ const query = function getQueryForm(data) {
         return string;
     }
 
-};
+};

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

@@ -4,91 +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="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>
@@ -131,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>
@@ -155,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/queryForm200803.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
             data:{
                 oracleActTransactingLogs:{!! $oracleActTransactingLogs !!},
                 page:Number('{{$page}}'),
-                filterData:{date_start:'',date_end:'',SKU:'',paginate:"50",TOLocation:'',range:'',
-                    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:{
@@ -206,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){
@@ -271,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/maintenance/userLabor/edit.blade.php

@@ -57,7 +57,7 @@
                     @enderror
                 </div>
                 <div class="form-group row">
-                    <label for="default_hour_price" class="form-check-label col-3 pull-left">默认计时工资/小时：</label>
+                    <label for="default_hour_price" class="form-check-label col-3 pull-left">默认计时单价/小时：</label>
                     <input name="default_hour_price" :value="userLabor.default_hour_price" id="default_hour_price" class="@error('default_hour_price') is-invalid @enderror col-7 form-control" type="text">
                     @error('default_hour_price')
                     <span class="invalid-feedback col-7 offset-3 mt-0" role="alert">

resources/views/maintenance/userLabor/index.blade.php

@@ -24,9 +24,9 @@
                                     <td>开始时间</td>
                                     <td>结束时间</td>
                                     <td>计件数</td>
-                                    <td>计件工资</td>
+                                    <td>计件单价</td>
                                     <td>计时数</td>
-                                    <td>计时工资</td>
+                                    <td>计时单价</td>
                                 </tr>
                                 </thead>
                                 <tbody>

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

@@ -38,12 +38,11 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="remark" class="col-2 col-form-label text-right">需要录入备注</label>
+                        <label for="remark" class="col-2 col-form-label text-right">进组时需要备注</label>
                         <div class="col-8">
                             <select id="remark" type="text" class="form-control @error('remark') is-invalid @enderror" name="remark" autocomplete="off"  >
-                                <option></option>
                                 <option value="是">是</option>
-                                <option value="否">否</option>
+                                <option value="否" selected>否</option>
                             </select>
                             @error('remark')
                             <span class="invalid-feedback" role="alert">

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

@@ -37,12 +37,12 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="remark" class="col-2 col-form-label text-right">需要录入备注</label>
+                        <label for="remark" class="col-2 col-form-label text-right">进组时需要备注</label>
                         <div class="col-8">
                             <select id="remark" type="text" class="form-control @error('remark') is-invalid @enderror" name="remark" autocomplete="off"  >
                                 <option :value="userWorkgroup.remark">@{{ userWorkgroup.remark }}</option>
                                 <option value="是">是</option>
-                                <option value="否">否</option>
+                                <option value="否" selected>否</option>
                             </select>
                             @error('remark')
                             <span class="invalid-feedback" role="alert">

resources/views/maintenance/userWorkgroup/index.blade.php

@@ -18,7 +18,7 @@
                         <th>仓库</th>
                         <th>名称</th>
                         <th>录入时间</th>
-                        <th>需要录入备注</th>
+                        <th>进组时需要备注</th>
                         <th>操作</th>
                     </tr>
                     <tr v-for="userWorkgroup in userWorkgroups">

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
                 </div>
                 <div class="modal fade " style="top: 20%" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
                     <div class="modal-dialog">
@@ -137,9 +143,9 @@
                         <td>
                             @can('订单管理-编辑')
                                 <button v-if="order.releasestatus!=='H'" @click="freeze(order.orderno,order.waveno)" class="btn btn-sm btn-outline-dark text-nowrap"
-                                        :disabled="!(order.codename_c==='创建订单'||order.codename_c==='分配完成'||order.codename_c==='拣货完成'||order.codename_c==='播种完成')">冻结</button>
+                                        :disabled="!(order.ordercodename==='创建订单'||order.ordercodename==='分配完成'||order.ordercodename==='拣货完成'||order.ordercodename==='播种完成')">冻结</button>
                                 <button v-else @click="thaw(order.orderno,order.waveno)" class="btn btn-sm btn-outline-danger text-nowrap"
-                                        :disabled="!(order.codename_c==='创建订单'||order.codename_c==='分配完成'||order.codename_c==='拣货完成'||order.codename_c==='播种完成')">解冻</button>
+                                        :disabled="!(order.ordercodename==='创建订单'||order.ordercodename==='分配完成'||order.ordercodename==='拣货完成'||order.ordercodename==='播种完成')">解冻</button>
                             @else
                                 @{{ order.releasestatus }}
                             @endcan
@@ -167,7 +173,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200724.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -178,7 +184,7 @@
                 checkData:[],
                 owners:[
                         @foreach($customers as $customer)
-                    { name:'{{$customer->descr_c}}',value:'{{$customer->customerid}}' },
+                    { name:'{{$customer->customerid}}',value:'{{$customer->descr_c}}' },
                     @endforeach
                 ],
                 orders:{!! $orders !!},

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

@@ -3,7 +3,7 @@
 
 @section("content")
     @component("order.wave.menu")@endcomponent
-    <div class="container-fluid" id="wave_div">
+    <div class="container-fluid d-none" id="wave_div">
         <div style="min-width: 2000px;">
 
 
@@ -82,7 +82,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",
@@ -116,11 +116,11 @@
 
             },
             mounted: function () {
+                $('#wave_div').removeClass('d-none')
                 let data = [[
                     {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/checking-in/QRcode.blade.php

@@ -28,8 +28,8 @@
 {{--                </div>--}}
                     <div class="row">
                         <div class="col text-center" style="float:left;">
-                            <img id="img" class="img-thumbnail" style="margin-top: 20px" :src="userWorkgroup.url" />
-                            <p class="m-2 h5 text-center" >@{{ userWorkgroup.name }}工作组</p>
+                            <img id="img" class="img-thumbnail" style="margin-top: 20px" :src="userWorkgroup.url" width="35%"/>
+                            <p class="m-2 h1 text-center" >@{{ userWorkgroup.name }}工作组</p>
                         </div>
                     </div>
             </div>

resources/views/personnel/checking-in/getQRcode.blade.php

@@ -9,7 +9,7 @@
         <div class="card col-md-10 offset-md-1 p-0">
             <div class="card-body">
                 <div class="list-group list-group-horizontal-lg align-content-center">
-                <a target="_blank" class="btn col-md-2 btn-outline-primary"  :href="('{{url('personnel/checking-in/importAndExportQRCode')}}')" >进出场打卡</a>
+                <a target="_blank" class="btn col-md-2 btn-outline-primary ml-5"  style="transform: scale(1.5)" :href="('{{url('personnel/checking-in/importAndExportQRCode')}}')" >进出场打卡</a>
                 </div>
                 <br>
                 <div class="card-header"><h3 style="color: red">组二维码</h3>

resources/views/personnel/checking-in/importAndExportQRCode.blade.php

@@ -20,9 +20,9 @@
                 </div>
 
                 <div class="row">
-                    <div class="col-6 text-center" v-for="importAndExportQRCode in importAndExportQRCodes">
-                            <img id="img" class="img-thumbnail"  :src="importAndExportQRCode.url" />
-                        <p class="font-weight-bold m-2 h5 text-center" style="color: red">@{{ importAndExportQRCode.source }}</p>
+                    <div class="col-6 text-center" v-for="importAndExportQRCode in importAndExportQRCodes" >
+                            <img id="img" class="img-thumbnail img-fluid"  :src="importAndExportQRCode.url" width="75%"/>
+                        <p class="font-weight-bold m-2 h1 text-center" style="color: red">@{{ importAndExportQRCode.source }}</p>
                     </div>
                 </div>
             </div>

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

@@ -18,7 +18,7 @@
                     <a class="dropdown-item" @click="laborReportExport(true)" href="javascript:">导出所有页</a>
                 </div>
             </span>
-        <table class="table table-sm table-hover table-striped d-none d-xl-block p-0 text-nowrap table-bordered" >
+        <table class="table table-sm table-hover table-striped d-none d-sm-block p-0 text-nowrap table-bordered" >
             <tr>
                 <th class="text-center">
                     <label for="all">
@@ -153,7 +153,7 @@
             </tr>
         </table>
         <div class="text-info h5 btn btn">{{$laborReports->count()}}/@{{ sum }}</div>
-        <div>{{$laborReports->appends($requests)->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">

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:{
                 //新增库单据
@@ -574,11 +575,13 @@
                     axios.post('{{url('process/importPasteData')}}',{data:this.pasteData,rows:this.rows})
                         .then(res=>{
                             if (res.data.success){
+                                let sum=0;
                                 res.data.data.forEach(function (processContent) {
                                     _this.processContents.unshift(processContent);
                                     _this.commodityIds.push(processContent.commodity_id+"_"+processContent.type);
-                                    _this.sum += Number(processContent.amount);
+                                    if (!processContent.type) sum += Number(processContent.amount);
                                 });
+                                _this.sum += sum;
                                 $('#pasteData').modal('hide');
                                 tempTip.setDuration(2000);
                                 tempTip.showSuccess('导入完毕');

resources/views/process/index.blade.php

@@ -81,14 +81,14 @@
                         </div>
                         <div v-if="errors.hour_price" class="row"><label class="col-3"></label><small  class="text-danger col-7">@{{ errors.hour_price[0] }}</small></div>
                         <div class="form-group row">
-                            <label for="initial_weight" class="col-3 col-form-label text-right">计时工资</label>
+                            <label for="initial_weight" class="col-3 col-form-label text-right">计时单价</label>
                             <div class="col-7">
                                 <input :class="{ 'is-invalid' : errors.hour_price }"  type="text" class="form-control" autocomplete="off" v-model="processDailyParticipantOne.hour_price" >
                             </div>
                         </div>
                         <div v-if="errors.unit_price" class="row"><label class="col-3"></label><small  class="text-danger col-7">@{{ errors.unit_price[0] }}</small></div>
                         <div class="form-group row">
-                            <label for="initial_weight" class="col-3 col-form-label text-right">计件工资</label>
+                            <label for="initial_weight" class="col-3 col-form-label text-right">计件单价</label>
                             <div class="col-7">
                                 <input :class="{ 'is-invalid' : errors.unit_price }" type="text" class="form-control" autocomplete="off" v-model="processDailyParticipantOne.unit_price" >
                             </div>
@@ -181,7 +181,7 @@
                     <th style="min-width: 200px">单据号</th>
                     <th style="min-width: 100px">本单数量</th>
                     <th style="min-width: 200px">商品条码</th>
-                    <th style="min-width: 200px">商品名称 </th>
+                    <th style="min-width: 300px">商品名称 </th>
                     <th>备注</th>
                     <th></th>
                 </tr>
@@ -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>
@@ -318,10 +319,10 @@
                             </tr>
                         </table>
                         <div v-else :style="[{background: (!processOne.id || processOne.is_multi_row)  ? (!processOne.id) ? '#e8eef6' :'rgb(246, 238, 232)' : (processOne.processesContents.length>0 ? ((processOne.processesContents[0].type=='成品单') ? '#e8eef6' : 'rgb(246, 238, 232)') :'')}
-                        ,{'-webkit-transform':'scale('+(1/Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))+')'},{height: (35*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))+'px'}
-                        ,{width: (100*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))+'%'},{'margin-left': (-100*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))-1)/2)+'%'}
-                        ,{'margin-top': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))-1)/2)+'px'},{'margin-bottom': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))-1)/2)+'px'}]">
-                            <div v-for="(processesContent,i) in arrayFilter(processOne.processesContents,processOne)"  class=" row  p-1" style="float: left;margin-right: 20px;-webkit-transform-origin: 0" :style="[{opacity:1/0.7},
+                        ,{'-webkit-transform':'scale('+(1/Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))+')'},{height: (35*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))+'px'}
+                        ,{width: (100*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))+'%'},{'margin-left': (-100*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))-1)/2)+'%'}
+                        ,{'margin-top': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))-1)/2)+'px'},{'margin-bottom': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))-1)/2)+'px'}]">
+                            <div v-for="(processesContent,i) in arrayFilter(processOne.processesContents,processOne)"  class=" row  p-1" style="float: left;margin-right: 10px;-webkit-transform-origin: 0" :style="[{opacity:1/0.7},
                             {'margin-left': arrayFilter(processOne.processesContents,processOne).length >3 ? (1*parseInt(arrayFilter(processOne.processesContents,processOne).length/3))+'px' : '0px'}]">
                                 <span>@{{ processesContent.bill_type }}</span>&nbsp;&nbsp;
                                 <span>@{{ processesContent.wms_code }}</span>&nbsp;&nbsp;
@@ -369,8 +370,8 @@
                                 <td>参与者</td>
                                 <td>开始时间</td>
                                 <td>结束时间</td>
-                                <td>计时工资</td>
-                                <td>计件工资</td>
+                                <td>计时单价</td>
+                                <td>计件单价</td>
                                 <td>晚饭时间</td>
                                 <td>计时工时</td>
                                 <td>计件数量</td>
@@ -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/queryForm200724.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.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,14 +558,15 @@
                 let data=[
                     [
                         {name:'date_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'owner_id',type:'select',placeholder: '客户',data:this.owners},
-                        {name:'wms_code',type:'input',tip:'单据号：支持15内模糊搜索与15天外精确搜索',placeholder: '单据号'},
+                        {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},
                     ],
                     [
                         {name:'date_end',type:'dataTime',tip:'选择显示指定日期的结束时间'},
-                        {name:'commodity_barcode',type:'input',tip:'商品条码：支持15内模糊搜索与15天外精确搜索',placeholder: '商品条码'},
-                        {name:'code',type:'input',tip:'任务号：支持15内模糊搜索与15天外精确搜索',placeholder: '任务号'},
+                        {name:'commodity_barcode',type:'input',tip:'商品条码：可在两侧增加百分号(%)进行模糊搜索',placeholder: '商品条码'},
+                        {name:'code',type:'input',tip:'任务号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '任务号'},
                         {name:'is_accomplish',type:'checkbox',data:[{name:'sign',value:'显示交接完成的记录'}]},
                     ],
                 ];
@@ -1145,35 +1147,39 @@
                     let _this = this;
                     axios.post("{{url('process/updateProcessDailyParticipant')}}", this.processDailyParticipantOne)
                         .then(function (response) {
-                            if (response.data.status == "error") {
-                                tempTip.setDuration(3000);
-                                _this.errors = response.data.data;
-                            }
-                            if (response.data.status == "success") {
-                                _this.processDailyParticipants.every(function (processDailyParticipant) {
-                                    if (processDailyParticipant.id == response.data.data.id) {
-                                        processDailyParticipant.status = response.data.data.status;
-                                        processDailyParticipant.user_detail_full_name = response.data.data.user_detail_full_name;
-                                        processDailyParticipant.started_at = response.data.data.started_at;
-                                        processDailyParticipant.ended_at = response.data.data.ended_at;
-                                        processDailyParticipant.hour_price = response.data.data.hour_price;
-                                        processDailyParticipant.unit_price = response.data.data.unit_price;
-                                        processDailyParticipant.dinner_duration = response.data.data.dinner_duration;
-                                        processDailyParticipant.hour_count = response.data.data.hour_count;
-                                        processDailyParticipant.unit_count = response.data.data.unit_count;
-                                        processDailyParticipant.remark = response.data.data.remark;
-                                        processDailyParticipant.hour = response.data.data.hour;
-                                        processDailyParticipant.diff = response.data.data.diff;
-                                        processDailyParticipant.billingHour = response.data.data.billingHour;
-                                        processDailyParticipant.isAddProcessDailyParticipant = true;
-                                        return false;
-                                    }
-                                    return true;
-                                });
-                                tempTip.setDuration(3000);
-                                tempTip.showSuccess('参与人修改成功！');
-                                $("#updateModal").modal('hide');
+                            if (!response.data.success) {
+                                if (response.data.data.length>0){
+                                    _this.errors = response.data.data;
+                                }
+                                else {
+                                    tempTip.setDuration(3000);
+                                    tempTip.show(response.data.data);
+                                }
+                                return;
                             }
+                            _this.processDailyParticipants.every(function (processDailyParticipant) {
+                                if (processDailyParticipant.id == response.data.data.id) {
+                                    processDailyParticipant.status = response.data.data.status;
+                                    processDailyParticipant.user_detail_full_name = response.data.data.user_detail_full_name;
+                                    processDailyParticipant.started_at = response.data.data.started_at;
+                                    processDailyParticipant.ended_at = response.data.data.ended_at;
+                                    processDailyParticipant.hour_price = response.data.data.hour_price;
+                                    processDailyParticipant.unit_price = response.data.data.unit_price;
+                                    processDailyParticipant.dinner_duration = response.data.data.dinner_duration;
+                                    processDailyParticipant.hour_count = response.data.data.hour_count;
+                                    processDailyParticipant.unit_count = response.data.data.unit_count;
+                                    processDailyParticipant.remark = response.data.data.remark;
+                                    processDailyParticipant.hour = response.data.data.hour;
+                                    processDailyParticipant.diff = response.data.data.diff;
+                                    processDailyParticipant.billingHour = response.data.data.billingHour;
+                                    processDailyParticipant.isAddProcessDailyParticipant = true;
+                                    return false;
+                                }
+                                return true;
+                            });
+                            tempTip.setDuration(3000);
+                            tempTip.showSuccess('参与人修改成功！');
+                            $("#updateModal").modal('hide');
                         }).catch(function (err) {
                         tempTip.setDuration(5000);
                         tempTip.show('修改参与人发生了一些严重错误：' + err);
@@ -1425,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;
@@ -1456,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/recycle.blade.php

@@ -62,13 +62,13 @@
 {{--                                                <label for="">订单号：</label>--}}
 {{--                                                <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索订单号" name="order_number"--}}
 {{--                                                       :class="filterParams.order_number?'bg-warning':''"--}}
-{{--                                                       @keypress="order_numberEntering" title="15天以内的支持模糊搜索，回车提交">--}}
+{{--                                                       @keypress="order_numberEntering" title="可在两侧增加百分号(%)进行模糊搜索">--}}
 {{--                                            </td>--}}
 {{--                                            <td>--}}
 {{--                                                <label for="">退回单号：</label>--}}
 {{--                                                <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索退回单号" name="logistic_number_return"--}}
 {{--                                                       :class="filterParams.logistic_number_return?'bg-warning':''"--}}
-{{--                                                       @keypress="logistic_number_returnEntering" title="15天以内的支持模糊搜索，回车提交">--}}
+{{--                                                       @keypress="logistic_number_returnEntering" title="可在两侧增加百分号(%)进行模糊搜索">--}}
 {{--                                            </td>--}}
 {{--                                            <td>--}}
 {{--                                                <label for="">审核：</label>--}}

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/queryForm200724.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -239,10 +239,11 @@
                 let data=[
                     [
                         {name:'created_at_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'owner_id',type:'search_select',tip:['',''],placeholder:['客户',''],data:this.owners},
-                        {name:'order_number',type:'input',tip:'订单号：支持15内模糊搜索与15天外精确搜索',placeholder:'订单号'},
-                        {name:'logistic_number_return',type:'input',tip:'退回单号：支持查找多个以逗号或空格分隔的单号，15天以内的支持模糊搜索，回车提交',placeholder:'退回单号'},
-                        {name:'logistic_number',type:'input',tip:'原单单号：支持15内模糊搜索与15天外精确搜索',placeholder:'原单单号'},
+                        {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:'原单单号'},
                         {name:'is_checked',type:'select',placeholder: '是否审核',data:[{name:1,value:'已审核'},{name:0,value:'未审核'}]},
                         {name:'id_logistic_return',type:'select',placeholder: '快递名称',data:this.logistics},
                     ],[

resources/views/waybill/delivering.blade.php

@@ -20,11 +20,11 @@
                                v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''" >
                     </div>
                     <div class=" col-md-2 mr-0 " style="max-width: 160px">
-                        <input type="text" title="运单号：支持15内模糊搜索与15天外精确搜索" name="waybill_number" placeholder="运单号"
+                        <input type="text" title="运单号：可在两侧增加百分号(%)进行模糊搜索" name="waybill_number" placeholder="运单号"
                                class="form-control form-control-sm tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle;width: 153px" :class="filterData.waybill_number?'bg-warning':''">
                     </div>
                     <div class=" col-md-2 ml-2 p-0" style="max-width: 160px">
-                        <input type="text" title="承运商单号：支持15内模糊搜索与15天外精确搜索"  name="carrier_bill" placeholder="承运商单号"
+                        <input type="text" title="承运商单号：可在两侧增加百分号(%)进行模糊搜索"  name="carrier_bill" placeholder="承运商单号"
                                class="form-control form-control-sm tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle;width: 153px" :class="filterData.carrier_bill?'bg-warning':''">
                     </div>
                     <input type="submit" hidden>

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/queryForm200724.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',
@@ -448,15 +448,15 @@
                         {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'created_at_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'origination',type:'input',tip:'始发地：支持15内模糊搜索与15天外精确搜索',placeholder: '始发地'},
-                        {name:'carrier_bill',type:'input',tip:'承运商单号：支持15内模糊搜索与15天外精确搜索',placeholder: '承运商单号'},
+                        {name:'origination',type:'input',tip:'始发地：可在两侧增加百分号(%)进行模糊搜索',placeholder: '始发地'},
+                        {name:'carrier_bill',type:'input',tip:'承运商单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '承运商单号'},
                         {name:'status',type:'select',placeholder: '运单状态',data:this.status},
                     ],
                     [
-                        {name:'wms_bill_number',type:'input',tip:'WMS单号：支持15内模糊搜索与15天外精确搜索',placeholder: 'WMS单号'},
+                        {name:'wms_bill_number',type:'input',tip:'WMS单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: 'WMS单号'},
                         {name:'created_at_end',type:'dataTime',tip:'选择显示指定日期的结束时间'},
-                        {name:'destination',type:'input',tip:'目的地：支持15内模糊搜索与15天外精确搜索',placeholder: '目的地'},
-                        {name:'waybill_number',type:'input',tip:'运单号：支持15内模糊搜索与15天外精确搜索',placeholder: '运单号'},
+                        {name:'destination',type:'input',tip:'目的地：可在两侧增加百分号(%)进行模糊搜索',placeholder: '目的地'},
+                        {name:'waybill_number',type:'input',tip:'运单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '运单号'},
                         {name:'carrier_id',type:'select',placeholder: '承运商',data:this.carriers},
                     ],
                 ];

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/queryForm200724.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};
@@ -118,10 +114,10 @@
                 let data = [[
                     {name:'created_at_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
                     {name:'owner_id',type:'search_select',tip:['',''],placeholder:['客户',''],data:_this.owners},
-                    {name:'logistic_number',type:'input',tip:'快递单号：支持15内模糊搜索与15天外精确搜索',placeholder:'快递单号'},
+                    {name:'logistic_number',type:'input',tip:'快递单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'快递单号'},
                 ],[
                     {name:'created_at_end',type:'dataTime',tip:'选择显示指定日期的结束时间'},
-                    {name:'batch_number',type:'input',tip:'波次号：支持15内模糊搜索与15天外精确搜索',placeholder:'波次号'}
+                    {name:'batch_number',type:'input',tip:'波次号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'波次号'}
                 ]];
 
                 _this.form = new query({

routes/web.php

@@ -290,7 +290,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/webApi/test.http

@@ -37,4 +37,3 @@ Content-Type: application/json
 GET https://was.baoshi56.com/api/thirdPart/weixin/waybill?api_token=fb7efc3
 
 ###
-

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/queryForm200724.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200803.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export.js');