修改了与商品有关部分，增加了二维码与解除设备绑定入口

app/Http/Controllers/ProcessController.php

@@ -31,8 +31,12 @@ class ProcessController extends Controller
         $today=Carbon::now()->subDays(15);
         if ($request->input('commodity_barcode')){
             $barcode=$request->input('commodity_barcode');
-            $processes=$processes->with('commodity')->whereHas('commodity',function (Builder $query)use($barcode){
-                $query->where('barcode','like',$barcode.'%');
+            $processes=$processes->with('processesContents')->whereHas('processesContents',function (Builder $query)use($barcode){
+                $query->whereHas('commodity',function (Builder $builder)use($barcode){
+                    $builder->whereHas('barcodes',function (Builder $builder)use($barcode){
+                        $builder->where('code','like',$barcode.'%');
+                    });
+                });
             });
         }
         if ($request->input('date_start')){
@@ -44,6 +48,9 @@ class ProcessController extends Controller
         if ($request->input('owner_id')){
             $processes=$processes->where('owner_id',$request->input('owner_id'));
         }
+        if ($request->input('status')){
+            $processes=$processes->where('status',$request->input('status'));
+        }
         if ($request->input('wms_code')){
             $wms_code=$request->input('wms_code');
             $date=$today->format('Y-m-d');
@@ -64,7 +71,11 @@ class ProcessController extends Controller
     public function index(Request $request)
     {
         if(!Gate::allows('二次加工管理-查询')){ return redirect(url('/'));  }
-        $processes=Process::with(['tutorials','processesContents'])->orderBy('processes.id','DESC');
+        $processes=Process::with(['tutorials','processesContents'=>function($query){
+            return $query->with(['commodity'=>function($query){
+                return $query->with('barcodes');
+            }]);
+        }])->orderBy('processes.id','DESC');
         if ($request->input('checkSign')){
             $excel=$this->isExport($request,$processes);
             return $excel;
@@ -309,11 +320,11 @@ class ProcessController extends Controller
         }
 
         //同步二次加工单统计
-        $processDailiesStatistic=$processDailies->where('output'>0);
+        $processDailiesStatistic=$processDailies->where('output','>',0);
         $processStatistic=ProcessStatistic::find($processDaily->process_id);
         $processStatistic->top_capacity=$processDailiesStatistic->max('output');
         $processStatistic->bottom_capacity=$processDailiesStatistic->min('output');
-        $processStatistic->average_capactiy=$processDailiesStatistic->avg('output');
+        $processStatistic->average_capacity=$processDailiesStatistic->avg('output');
         $processStatistic->update();
         //修改二次加工单状态
         $result=[];
@@ -328,10 +339,10 @@ class ProcessController extends Controller
     public function changeProcessCheck($process_id){
         $process=Process::select('id','status')->find($process_id);
         if ($process->status=="加工中"){
-            $process->ended_at="待验收";
+            $process->status="待验收";
             $process->update();
             $processStatistic=ProcessStatistic::find($process_id);
-            $processStatistic->started_at=date('Y-m-d H:i:s');
+            $processStatistic->ended_at=date('Y-m-d H:i:s');
             $processStatistic->update();
             $this->log(__METHOD__,"二次加工单待验收".__FUNCTION__,json_encode($process)." || ".json_encode($processStatistic),Auth::user()['id']);
         }
@@ -447,11 +458,11 @@ class ProcessController extends Controller
     public function processDailyParticipantAudit($id){
         if(!Gate::allows('二次加工管理-登记工时-审核')){ return redirect(url('/'));  }
         $processDailyParticipant=ProcessDailyParticipant::select('id','status')->find($id);
-        if (!$processDailyParticipant) return ['success'=>'false'];
+        if (!$processDailyParticipant) return ['success'=>false];
         $processDailyParticipant->status='已审核';
         $processDailyParticipant->update();
         $this->log(__METHOD__,"登记工时参与人审核".__FUNCTION__,json_encode($processDailyParticipant),Auth::user()['id']);
-        return ['success'=>'true','processDailyParticipant'=>$processDailyParticipant];
+        return ['success'=>true,'processDailyParticipant'=>$processDailyParticipant];
     }
     /*//临时工详情
     public function showUserDetail(Request $request){
@@ -471,27 +482,27 @@ class ProcessController extends Controller
         }
         $tutorials=Tutorial::where('owner_id',$process->owner_id)->get();
         if ($tutorials_id && $tutorials) $tutorials=$tutorials->diff(Tutorial::whereIn('id',$tutorials_id)->get());
-        return ['success'=>'true','data'=>$tutorials];
+        return ['success'=>true,'data'=>$tutorials];
     }
     //添加教程关联
     public function selectedTutorial(Request $request){
         $process_id=$request->input('process_id');
         $tutorial_id=$request->input('tutorial_id');
-        if (!$process_id || !$tutorial_id) return ['success'=>'false','data'=>'二次加工或教程传递错误!'];
+        if (!$process_id || !$tutorial_id) return ['success'=>false,'data'=>'二次加工或教程传递错误!'];
         $tutorial=Tutorial::find($tutorial_id);
-        if (!$tutorial)return ['success'=>'false','data'=>'未找到相关教程!'];
+        if (!$tutorial)return ['success'=>false,'data'=>'未找到相关教程!'];
         $tutorial->processes()->syncWithoutDetaching([$process_id]);
         $this->log(__METHOD__,"添加教程关联".__FUNCTION__,json_encode($process_id),Auth::user()['id']);
-        return ['success'=>'true','data'=>$tutorial];
+        return ['success'=>true,'data'=>$tutorial];
     }
     //删除教程关联
     public function deleteTutorial(Request $request){
         $process_id=$request->input('process_id');
         $tutorial_id=$request->input('tutorial_id');
-        if (!$process_id || !$tutorial_id) return ['success'=>'false','data'=>'二次加工或教程传递错误!'];
+        if (!$process_id || !$tutorial_id) return ['success'=>false,'data'=>'二次加工或教程传递错误!'];
         DB::table('process_tutorial')->where('process_id',$process_id)->where('tutorial_id',$tutorial_id)->delete();
         $this->log(__METHOD__,"删除教程关联".__FUNCTION__,json_encode($process_id),Auth::user()['id']);
-        return ['success'=>'true'];
+        return ['success'=>true];
     }
     /**
      * Show the form for creating a new resource.
@@ -520,12 +531,12 @@ class ProcessController extends Controller
         $userDetail=UserDetail::with(['userDutyChecks'=>function ($query){
             return $query->orderBy('checked_at','DESC')->limit(5);
         }])->where('full_name',$full_name)->get();
-        return ['success'=>'true','data'=>$userDetail];
+        return ['success'=>true,'data'=>$userDetail];
     }
     //录入补卡
     public function storeReplenishClock(Request $request){
         $errors=$this->validatorUserDutyCheck($request)->errors();
-        if (count($errors)>0)return ['success'=>'false','data'=>$errors];
+        if (count($errors)>0)return ['success'=>false,'data'=>$errors];
         $user_id=$request->input('user_id');
         $checked_at=$request->input('checked_at');
         $type=$request->input('type');
@@ -537,7 +548,7 @@ class ProcessController extends Controller
         ]);
         $userDutyCheck->save();
         $this->log(__METHOD__,"录入补卡".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
-        return ['success'=>'true','data'=>$userDutyCheck];
+        return ['success'=>true,'data'=>$userDutyCheck];
     }
 
     //去往打卡审核
@@ -654,7 +665,7 @@ class ProcessController extends Controller
             'amount'=>$request->input('amount'),
         ]);
         $process->save();
-        $process->code='P'.date ("Ymd").str_pad($process->id,3,"0");
+        $process->code='P'.date ("Ymd").str_pad($process->id,3,"0",STR_PAD_LEFT);
         $process->update();
         $processStatistic=new ProcessStatistic([
             'process_id'=>$process->id,
@@ -761,6 +772,13 @@ class ProcessController extends Controller
                 continue;
             }
             foreach($process->processesContents as $processesContent){
+                $barcodes="";
+                if ($processesContent->commodity && $processesContent->commodity->barcodes){
+                    foreach ($processesContent->commodity->barcodes as $barcode){
+                        if (!$barcodes){$barcodes=$barcode->code; continue;}
+                        $barcodes=$barcodes."，".$barcode->code;
+                    }
+                }
                 $w=[
                     'id'=>$process->id,
                     'code'=>$process->code ,
@@ -772,7 +790,7 @@ class ProcessController extends Controller
                     'thisAmount'=>$processesContent->amount,
                     'unit_price'=>$process->unit_price,
                     'created_at'=>$process->created_at ,
-                    'commodity_barcode'=>$processesContent->commodity_barcode ,
+                    'commodity_barcode'=>$barcodes,
                     'commodity_name'=>$processesContent->commodity_name ,
                     'completed_amount'=>$process->completed_amount,
                     'status'=>$process->status,

app/Http/Controllers/TestController.php

@@ -26,9 +26,13 @@ use App\User;
 use App\UserDutyCheck;
 use App\WMSReflectReceive;
 use Carbon\Carbon;
+use Endroid\QrCode\QrCode;
+use Endroid\QrCode\Response\QrCodeResponse;
+use http\Client\Response;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Gate;
 use Zttp\Zttp;
 
@@ -134,27 +138,10 @@ class TestController extends Controller
     }
 
     public function test1(){
-  /*      $a=Package::orderBy('id')->first();
-
-        $date=date("Y-m-d",strtotime("+1 day",strtotime($a->created_at->format('Y-m-d'))));
-        dd($a->created_at->format('Y-m-d'));
-
-        $b=Package::orderBy('id','desc')->first();
-        $sf=$a->created_at->format('Y-m-d');dd((int)$sf);
-        $result=$sf->lte("11:00");
-
-        $c=Carbon::parse("9:10:05");
-        $d=Carbon::parse("18:01:20");
-        $x=($d->diffInSeconds($c))/3600;
-        dd($c,$d,round($x,2)-1);*/
-        $userDutyCheckStart=UserDutyCheck::select('id','checked_at')->where('user_id',1)
-            ->where('checked_at','like','2020-03-13%')->where('type','登入')->orderBy('id')->first();
-        $today=Carbon::now()->format('Y-m-d');
-        $date=date("Y-m-d",strtotime('+'.strval(5)." day",strtotime($today)));
-        $startDate=Carbon::parse("2020-03-31");
-        $diffDay=$startDate->diffInDays($today,true);
-
-        dd($diffDay);
-        $package=Package::orderBy('updated_at','DESC')->get();
+        $processDailiesStatistic=ProcessDaily::where('process_id',6)->get();
+        $a=$processDailiesStatistic->max('output');
+        $b=$processDailiesStatistic->min('output');
+        $c=$processDailiesStatistic->avg('output');
+        dd($a,$b,$c);
     }
 }

app/Http/Controllers/TutorialController.php

@@ -55,8 +55,8 @@ class TutorialController extends Controller
     public function showContent($id){
         if(!Gate::allows('教程-查询')){ return redirect(url('/'));  }
         $tutorial=Tutorial::with('trixRichText')->find($id);
-        if ($tutorial&&$tutorial->trixRichText)return ['success'=>'true','data'=>$tutorial->trixRichText->content];
-        return ['success'=>'false'];
+        if ($tutorial&&$tutorial->trixRichText)return ['success'=>true,'data'=>$tutorial->trixRichText->content];
+        return ['success'=>false];
     }
 
     /**
@@ -120,7 +120,7 @@ class TutorialController extends Controller
         foreach ($attachments as $attachment){
             optional($attachment)->purge();
         }
-        return ['success'=>'true'];
+        return ['success'=>true];
     }
 
     public function validator(Request $request){

app/Http/Controllers/UserDutyCheckController.php

@@ -10,6 +10,7 @@ use Carbon\Carbon;
 use Endroid\QrCode\QrCode;
 use Endroid\QrCode\Response\QrCodeResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Validator;
 use Ramsey\Uuid\Uuid;
 
@@ -20,9 +21,9 @@ class UserDutyCheckController extends Controller
         $qrCode_refresh_everyday=config('hr.qrCode_refresh_everyday');
         if ($qrCode_refresh_everyday){
             $date=md5(date('Y-m-d'));
-            $url="bswas/userDutyCheck/clock?key=".$date;
+            $url=url("userDutyCheck/clock?key=").$date;
         }else{
-            $url="bswas/userDutyCheck/clock";
+            $url=url("userDutyCheck/clock");
         }
         $qrCode=new QrCode($url);
         header('Content-Type: '.$qrCode->getContentType());
@@ -39,10 +40,11 @@ class UserDutyCheckController extends Controller
             $date=md5(date('Y-m-d'));
             if ($key!=$date) return "二维码失效！";
         }
-        $mobile_phone=$request->cookie('mobile_phone');
-        if ($mobile_phone) {
-            $userDetail=UserDetail::where('mobile_phone',$mobile_phone)->first();
-            if (!$userDetail)   return redirect('userDutyCheck/createUserDetail/'.$mobile_phone);
+        $userLaborToken=$request->cookie('userLaborToken');
+        if ($userLaborToken && Cache::has('tokenStr_'.$userLaborToken)) {
+            $user_id=Cache::get('tokenStr_'.$userLaborToken);
+            $userDetail=UserDetail::find($user_id);
+            if (!$userDetail)   return redirect('userDutyCheck/createUserDetail/'.$userDetail->mobile_phone);
             $userDutyCheck=$this->dutyCheck($userDetail->user_id);
             if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
             return response()->view('process/checking-in/success',['full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at]);
@@ -56,10 +58,13 @@ class UserDutyCheckController extends Controller
         $this->validator($request)->validate();
         $userDetail=UserDetail::where('mobile_phone',$mobile_phone)->first();
         if (!$userDetail)   return redirect('userDutyCheck/createUserDetail/'.$mobile_phone);
+        $user=User::find($userDetail->user_id);
+        if (Cache::has('tokenUser_'.$user->id))return "<h1 style='color: red'>请使用原有设备进行打卡,如无法使用原有设备请联系管理人员解绑设备!</h1>";
         $userDutyCheck=$this->dutyCheck($userDetail->user_id);
         if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
+        $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
         return response()->view('process/checking-in/success',['full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at])
-            ->cookie('mobile_phone',$mobile_phone,43200,'/');
+            ->cookie('userLaborToken',$userLaborToken,config('users.token_check_in_expire_minutes'),'/');
     }
     //去往登记资料页面
     public function createUserDetail($mobile_phone){
@@ -91,8 +96,9 @@ class UserDutyCheckController extends Controller
         $userLabor->save();
         $userDutyCheck=$this->dutyCheck($user->id);
         if (!$userDutyCheck)return "<h1 style='color: red'>打卡异常，请联系相关人员!</h1>";
-        return response()->view('process/checking-in/success',['full_name'=>$full_name,'checked_at'=>$userDutyCheck->checked_at])
-            ->cookie('mobile_phone',$mobile_phone,43200,'/');
+        $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
+        return response()->view('process/checking-in/success',['full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at])
+            ->cookie('userLaborToken',$userLaborToken,config('users.token_check_in_expire_minutes'),'/');
     }
 
     //根据用户提交打卡记录

app/Http/Controllers/UserLaborController.php

@@ -9,6 +9,7 @@ use App\UserDutyCheck;
 use App\UserLabor;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
@@ -36,6 +37,14 @@ class UserLaborController extends Controller
         //
     }
 
+    public function relieve(Request $request){
+        $user_id=$request->input('user_id');
+        if (!$user_id) return ['error'=>'传递空值！'];
+        $token=Cache::pull('tokenUser_'.$user_id);
+        if ($token)Cache::pull('tokenStr_'.$token);
+        return ['success'=>true];
+    }
+
     /**
      * Store a newly created resource in storage.
      *
@@ -161,6 +170,6 @@ class UserLaborController extends Controller
         $this->log(__METHOD__,"删除临时工用户".__FUNCTION__,json_encode($user),Auth::user()['id']);
         $userLabor->delete();
         $this->log(__METHOD__,"删除临时工".__FUNCTION__,json_encode($userLabor),Auth::user()['id']);
-        return ['success'=>'true'];
+        return ['success'=>true];
     }
 }

app/ProcessesContent.php

@@ -10,7 +10,7 @@ class ProcessesContent extends Model
         'process_id','bill_type','commodity_id','wms_code','amount'
     ];
     protected $appends=[
-        'commodity_name','commodity_barcode',
+        'commodity_name',
     ];
 
     public function process(){
@@ -24,8 +24,4 @@ class ProcessesContent extends Model
     {
         return $this['commodity']? $this['commodity']['name']:null;
     }
-    public function getCommodityBarcodeAttribute()
-    {
-        return $this['commodity']? $this['commodity']['barcode']:null;
-    }
 }

database/migrations/2020_03_30_103931_create_commodity_barcodes_table.php

@@ -17,7 +17,7 @@ class CreateCommodityBarcodesTable extends Migration
             $table->bigIncrements('id');
             $table->string('code')->index();
             $table->string('commodity_id')->index();
-            $table->timestamp();
+            $table->timestamps();
         });
     }
 

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

@@ -85,6 +85,7 @@
                     <th>电话</th>
                     <th>详情</th>
                     <th>操作</th>
+                    <th>解除绑定设备</th>
                 </tr>
                 <tr v-for="(userLabor,i) in userLabors">
                     <td>@{{ i+1 }}</td>
@@ -95,10 +96,15 @@
                         @can('临时工-编辑')
                             <button class="btn btn-sm btn-outline-primary" @click="edit(userLabor.user_id)">改</button>@endcan
                         @can('临时工-删除')
-                            <button class="btn btn-sm btn-outline-dark" @click="destroy(userLabor)">删</button> @endcan
+                            <button class="btn btn-sm btn-outline-danger" @click="destroy(userLabor)">删</button> @endcan
                             <button class="btn btn-sm btn-outline-dark" @click="workRecord(userLabor.user_id)">劳务记录</button>
                             <button class="btn btn-sm btn-outline-dark" @click="clockRecord(userLabor.user_id)">打卡记录</button>
                     </td>
+                    <td>
+                        @can('临时工')
+                            <button class="btn btn-sm btn-outline-warning" @click="relieve(userLabor.user_id,userLabor.user_detail.full_name)">解</button>
+                        @endcan
+                    </td>
                 </tr>
             </table>
             {{$userLabors->links()}}
@@ -165,7 +171,7 @@
                     let url = "{{url('maintenance/userLabor')}}/"+user_id;
                     axios.delete(url)
                         .then(function (response) {
-                            if(response.data.success=="true"){
+                            if(response.data.success){
                                 _this.userLabors.every(function (userLabor,i) {
                                     if (userLabor.user_id==user_id){
                                         _this.userLabors.splice(i,1);
@@ -185,6 +191,24 @@
                             tempTip.show('删除临时工失败!'+'网络错误：' + err);
                         });
                 },
+                relieve(user_id,full_name){
+                    axios.post('{{url('maintenance/userLabor/relieve')}}',{user_id:user_id})
+                        .then((response)=>{
+                            if (response.data.error){
+                                tempTip.setDuration(3000);
+                                tempTip.show(response.data.error);
+                                return;
+                            }
+                            if (response.data.success){
+                                tempTip.setDuration(3000);
+                                tempTip.showSuccess('已解除“'+full_name+'”的绑定设备！');
+                                return;
+                            }
+                        }).catch((err)=>{
+                            tempTip.setDuration(3000);
+                            tempTip.show('解绑失败！网络错误：' + err);
+                        });
+                }
             }
         });
     </script>

resources/views/process/checking-in/menuChecking-in.blade.php

@@ -4,13 +4,16 @@
             @can('二次加工管理')
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('process/checking-in/createReplenishClock')}}" :class="{active:isActive('createReplenishClock',3)}">录入补卡</a>
-                </li> @endcan
+                </li>
+                <li class="nav-item">
+                    <a target="_blank" class="nav-link text-dark" href="{{url('userDutyCheck/getQRCode')}}" :class="{active:isActive('getQRCode',2)}">获取二维码</a>
+                </li>
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('process/checking-in/clockAudit')}}" :class="{active:isActive('clockAudit',3)}">打卡审核</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('process/checking-in/missionAudit')}}" :class="{active:isActive('missionAudit',3)}">任务审核</a>
-                </li>
+                </li>@endcan
         </ul>
     </div>
 </div>

resources/views/process/index.blade.php

@@ -237,46 +237,6 @@
                 </div><!-- /.modal-content -->
             </div><!-- /.modal -->
         </div>
-        {{--<!-- 临时工详情modal -->
-        <div class="modal fade" id="userDetailModal" tabindex="-1" role="dialog" aria-labelledby="userDetailModal" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close pull-right" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="form-group row">
-                            <label class="col-3" for="full_name">姓名</label>
-                            <b class="col-7" id="full_name">@{{ userDetail.full_name }}</b>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-3" for="gender">性别</label>
-                            <b class="col-7" id="gender">@{{ userDetail.gender }}</b>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-3" for="identity_number">身份证号</label>
-                            <b class="col-7" id="identity_number">@{{ userDetail.identity_number }}</b>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-3" for="mobile_phone">手机号</label>
-                            <b class="col-7" id="mobile_phone">@{{ userDetail.mobile_phone }}</b>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-3" for="default_hour_price">默认计时工资</label>
-                            <b class="col-7" id="default_hour_price">@{{ userDetail.default_hour_price }}</b>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-3" for="company">所属劳务所</label>
-                            <b class="col-7" id="company">@{{ userDetail.company }}</b>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                    </div>
-                </div><!-- /.modal-content -->
-            </div><!-- /.modal -->
-        </div>
-        <div>--}}
             <table class="table table-striped table-sm text-nowrap table-hover">
                 <tr>
                     <th>
@@ -361,7 +321,11 @@
                     <td class="text-muted">@{{ processOne.bill_type }}</td>
                     <td class="text-muted">@{{ processOne.wms_code }}</td>
                     <td class="text-muted">@{{ processOne.thisAmount }}</td>
-                    <td class="text-muted">@{{ processOne.commodity_barcode }}</td>
+                    <td class="text-muted" v-if="processOne.commodity_barcodes">
+                        <ul class="p-0 m-0 list-unstyled list-inline">
+                            <li v-for="barcode in processOne.commodity_barcodes"><small>@{{ barcode.code }}</small></li>
+                        </ul>
+                    </td>
                     <td class="text-muted">@{{ processOne.commodity_name }}</td>
 
 
@@ -507,7 +471,6 @@
                 modalDaily_id:'',
                 processDailyParticipantOne:{id:'',user_id:'',user_detail_full_name:'',started_at:"",ended_at:"",
                                         hour_price:'',unit_price:'',dinner_duration:'',hour_count:'',unit_count:'',remark:''},
-                //userDetail:{full_name:'',gender:'',identity_number:'',mobile_phone:'',default_hour_price:'',company:''},
                 processTutorial:{id:'',tutorials:[],},
             },
             watch:{
@@ -572,7 +535,7 @@
                                 processOne['bill_type'] = processesContent.bill_type;
                                 processOne['wms_code'] = processesContent.wms_code;
                                 processOne['thisAmount']=processesContent.amount;
-                                processOne['commodity_barcode'] = processesContent.commodity_barcode;
+                                processOne['commodity_barcodes'] = processesContent.commodity ? processesContent.commodity.barcodes:'';
                                 processOne['commodity_name'] = processesContent.commodity_name;
                                 _this.processes.push(processOne);
                             }else{
@@ -593,7 +556,7 @@
                                 processOne['bill_type']=processesContent.bill_type;
                                 processOne['wms_code']=processesContent.wms_code;
                                 processOne['thisAmount']=processesContent.amount;
-                                processOne['commodity_barcode']=processesContent.commodity_barcode;
+                                processOne['commodity_barcodes']=processesContent.commodity ? processesContent.commodity.barcodes:'';
                                 processOne['commodity_name']=processesContent.commodity_name;
                                 processOne['count']=process.processesContents.length;
                                 _this.processes.push(processOne);
@@ -612,9 +575,11 @@
                         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);
+                            if (val!=="+"){
+                                $('input[name="'+key+'"]').val(val);
+                                $('select[name="'+key+'"]').val(val);
+                                decodeURI(data.filterData[key]=val);
+                            }
                         });
                     }
                 },
@@ -1170,25 +1135,6 @@
                 //临时工详情
                 showUserDetail(id){
                     window.open("{{url('maintenance/userLabor')}}/"+id);
-                    /*let _this=this;
-                    axios.post("{{--{{url('process/showUserDetail')}}--}}",{user_id:id})
-                        .then(function (response) {
-                            if (response.data.success){
-                                let userDetail=response.data.userDetail;
-                                _this.userDetail['full_name']=userDetail.full_name;
-                                _this.userDetail['gender']=userDetail.gender;
-                                _this.userDetail['identity_number']=userDetail.identity_number;
-                                _this.userDetail['mobile_phone']=userDetail.mobile_phone;
-                                if (userDetail.user_labor) {
-                                    _this.userDetail['default_hour_price']=userDetail.user_labor.default_hour_price;
-                                    _this.userDetail['company']=userDetail.user_labor.company;
-                                }
-                                $("#userDetailModal").modal('show');
-                            }
-                        }).catch(function (err) {
-                            tempTip.setDuration(5000);
-                            tempTip.show('获取临时工详情发生了一些严重错误：'+err);
-                        })*/
                 },
                 //显示教程
                 showTutorial(id) {

resources/views/process/statistic.blade.php

@@ -142,7 +142,7 @@
                         <td v-if="processStatistic.process">@{{ processStatistic.process.process_method_name }}</td>
                         <td>@{{ processStatistic.top_capacity }}</td>
                         <td>@{{ processStatistic.bottom_capacity }}</td>
-                        <td>@{{ processStatistic.average_capactiy }}</td>
+                        <td>@{{ processStatistic.average_capacity }}</td>
                         <td>@{{ processStatistic.total_cost }}</td>
                         <td>@{{ processStatistic.gross_profit }}</td>
                         <td><b v-if="processStatistic.gross_profit_rate">@{{ (processStatistic.gross_profit_rate)*100 | money}}%</b></td>

resources/views/test.blade.php

@@ -1,13 +1,11 @@
 <html>
 <head>
-    @trixassets
 </head>
 
 <body>
-<form method="POST" action="{{url('test/test1')}}">
-    @csrf
-    @trix(\App\Tutorial::class, 'content')
-    <input type="submit">
+<form method="get" action="{{url('test/test1')}}">
+    <input name="test">
+    <button type="submit">提交</button>
 </form>
 </body>
 </html>

routes/web.php

@@ -49,6 +49,8 @@ Route::resource('maintenance/userLabor','UserLaborController');
 Route::post('maintenance/userLabor/getWorkRecord', 'UserLaborController@getWorkRecord');
 //获取打卡记录
 Route::post('maintenance/userLabor/getClockRecord', 'UserLaborController@getClockRecord');
+//解除绑定设备
+Route::post('maintenance/userLabor/relieve', 'UserLaborController@relieve');
 
 Route::get('maintenance/paperBox/index/model', 'PaperBoxController@indexModel');
 Route::get('maintenance/paperBox/index/owner', 'PaperBoxController@indexOwner');