Merge branch 'master' into work_order_version6.3

app/Http/Controllers/UserDutyCheckController.php

@@ -49,8 +49,8 @@ class UserDutyCheckController extends Controller
         if (!$user_id) app('LogService')->log(__METHOD__, "进出场扫码(未绑定设备)__" . __FUNCTION__, json_encode($importAndExportQRCodeType));
         if ($userLaborToken && $user_id) {
             $userDetail = UserDetail::query()->find($user_id);
-            if ($userDetail->black_status==1)return "<h1 style='color: darkred;text-align:center'>系统识别此用户异常，请联系管理员!</h1>";
             if($userDetail){
+                if ($userDetail->black_status==1)return "<h1 style='color: darkred;text-align:center'>系统识别此用户异常，请联系管理员!</h1>";
                 if($importAndExportQRCodeType=='import') return redirect('personnel/checking-in/userDutyCheck/updateUserLaborCompanies/' . $userDetail->mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);
                 $userDutyCheck = $this->importAndExportDutyCheck($user_id, $importAndExportQRCodeType);
                 $error=$this->hasError($userDutyCheck);
@@ -78,7 +78,7 @@ class UserDutyCheckController extends Controller
         $mobile_phone = $request->input('mobile_phone');
         $this->validatorPhone($request)->validate();
         $userDetail = UserDetail::query()->where('mobile_phone', $mobile_phone)->first();
-        if ($userDetail->black_status==1)return "<h1 style='color: darkred;text-align:center'>系统识别此用户异常，请联系管理员!</h1>";
+        if ($userDetail&&$userDetail->black_status==1)return "<h1 style='color: darkred;text-align:center'>系统识别此用户异常，请联系管理员!</h1>";
         if (!$userDetail) return redirect('personnel/checking-in/userDutyCheck/createUserDetail/' . $mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);
         if (Cache::has('dutyCheckTokenUser_'.$userDetail->user_id)) return "<h1 style='color: red;text-align:center'>请使用原有设备进行打卡,如无法使用原有设备请联系管理人员解绑设备!</h1>";
         if($importAndExportQRCodeType=='import') return redirect('personnel/checking-in/userDutyCheck/updateUserLaborCompanies/' . $userDetail->mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);

resources/sass/reset.css

@@ -68,12 +68,12 @@ a:hover{ text-decoration:none; color:#2871d4}
 .flexbetweenr{-webkit-justify-content:space-between;justify-content:space-between;-moz-box-pack:space-between;-webkit--moz-box-pack:space-betweenr;box-pack:space-between;}
  
 .lgoinbox{ position:fixed; z-index:999; left:0; right:0;top:0; bottom:0;}
-.lgoinbox .swiper-container{ position:absolute; z-index:1; width:50%;top:0; bottom:0;} 
-.lgoinbox .swiper-slide{ background-repeat:no-repeat; background-position:center; background-size:100%;  background-color:#0050b7}
+.lgoinbox .swiper-container{ position:absolute; z-index:1; width:65%;top:0; bottom:0;} 
+.lgoinbox .swiper-slide{ background-repeat:no-repeat; background-position:center; background-size:100%;  background-color:#003690}
 .lgoinbox .swiper-slide a{ display:block; width:100%; height:100%}
 .lgoinbox .swiper-pagination-bullet{ background-color:#fff; width:9px; height:9px}
 .lgoinbox .swiper-pagination{ bottom:9vh}
-.lgoinbox .right{ position:absolute; z-index:2; right:0;top:0; bottom:0; width:50%; background-color:#f7f7f7}
+.lgoinbox .right{ position:absolute; z-index:2; right:0;top:0; bottom:0; width:35%; background-color:#f7f7f7}
 
 .formbox{ max-width:80%; width:418px; margin:0 auto; margin-top:21.3vh}
 .formbox li{ margin-bottom:20px; position:relative}

resources/views/auth/login.blade.php

@@ -25,16 +25,14 @@
 
 <div class="lgoinbox" id="list">
     <div class="left swiper-container">
-        <div class="swiper-wrapper">
-            <div class="swiper-slide" style="background-image: url({{url('images/login/log01.jpg')}});"><a href="#"></a>
-            </div>
-{{--            <div class="swiper-slide" style="background-image: url({{url('images/login/log01.jpg')}});"><a href="#"></a>--}}
-{{--            </div>--}}
-{{--            <div class="swiper-slide" style="background-image: url({{url('images/login/log01.jpg')}});"><a href="#"></a>--}}
-{{--            </div>--}}
+        <div class="swiper-wrapper" id="swiper">
+            <div class="swiper-slide" style="background-image: url('{{url("images/login/log01.jpg")}}');"><a href="#"></a></div>
+            <!-- 将来需要轮播的时候，启用这段代码 -->
+            <!-- <div class="swiper-slide" style="background-image: url(images/log01.jpg);"><a href="#"></a></div>
+            <div class="swiper-slide" style="background-image: url(images/log01.jpg);"><a href="#"></a></div>  -->
         </div>
         <!-- Add Pagination -->
-        <div class="swiper-pagination"></div>
+<!--        <div class="swiper-pagination"></div>-->
     </div>
     <div class="right">
         <div class="formbox">
@@ -56,7 +54,7 @@
 
                 </li>
                 <li>
-                    <input class="input" name="" type="password" placeholder="密码" v-model="inputting.password" @click="errorMessage =null">
+                    <input class="input" name="" type="password" placeholder="密码" v-model="inputting.password" @click="errorMessage =null" @keydown.enter="login">
                     <div class="bar"></div>
                 </li>
                 <li>
@@ -67,7 +65,7 @@
 {{--                <li class="lia"><a href="#" class="a1">立即注册</a><a class="a2" href="#">忘记密码?</a></li>--}}
             </ul>
         </div>
-        <div class="banquan">沪ICP备123456789号-1 Copyright © 2021</div>
+        <div class="banquan">沪ICP备19020374号-1 Copyright © 2021</div>
     </div>
 </div>
 </body>
@@ -89,8 +87,14 @@
                 paginationClickable: true,
                 autoplay: 2500,
                 autoplayDisableOnInteraction: false,
-                loop: true,
+                loop: false,
             });
+            document.onkeydown = (e)=> {
+                var key = window.event.keyCode
+                if (key === 13) {
+                    this.login();
+                }
+            }
         },
         methods: {
             passwordInput: function (e) {

resources/views/layouts/app.blade.php

@@ -17,7 +17,7 @@
     <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm">
         <div class="container-fluid">
             <a class="navbar-brand" href="{{ url('/control/panel/menu') }}" title="宝时 Warehouse Assistance System" style="vertical-align: text-bottom">
-                <img src="{{asset('icon/logo100b.png')}}" alt="宝时 Warehouse Assistance System" height="30" >
+                <img src="{{asset('images/login/loglogo.png')}}" alt="宝时 Warehouse Assistance System" height="30" >
             </a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
                 <span class="navbar-toggler-icon"></span>

resources/views/rejected/create.blade.php

@@ -846,6 +846,8 @@
                         this.itemInputting[key] = '';
                     }
                     this.itemInputting['amount'] = '1';
+                    this.itemInputting['packageImages'] = [];
+                    this.itemInputting['commodityImages'] = [];
                 },
                 cleanError: function () {
                     for (let key in this.errors) {
@@ -984,6 +986,7 @@
                 },
                 checkImageWhetherNeed(item){
                     if (this.billInputting.id_owner==4)return 0;//幼岚非必要上传外箱及产品图
+                    if (this.billInputting.id_owner==10 && item.id_quality_label==3)return 0;
                     if (item.id_quality_label!=1){
                         if (item.commodityImages.length===0){
                             tempTip.setDuration(3000);
@@ -1035,7 +1038,6 @@
                         }
                     }
                     let formData = _this.getDamagedFormData(_this.itemInputting);
-
                     axios.post(url, formData,{'Content-Type':'multipart/form-data'}).then(function (response) {
                         _this.cleanError();
                         if (response.data.success === 'true') {

resources/views/rejected/edit.blade.php

@@ -602,7 +602,7 @@
                         @foreach($qualityLabels as $qualityLabel)
                     {id:'{{$qualityLabel->id}}',name:'{{$qualityLabel->name}}'},
                     @endforeach
-                ]
+                ],
             },
             mounted:function () {
                 let _this=this;
@@ -709,6 +709,8 @@
                         this.itemInputting[key]='';
                     }
                     this.itemInputting['amount']='1';
+                    this.itemInputting['packageImages'] = [];
+                    this.itemInputting['commodityImages'] = [];
                 },
                 cleanError:function(){
                     for(let key in this.errors){
@@ -864,6 +866,7 @@
                 },
                 checkImageWhetherNeed(item){
                     if (this.billInputting.id_owner==4)return 0;//幼岚非必要上传外箱及产品图
+                    if (this.billInputting.id_owner==10 && item.id_quality_label==3)return 0;
                     if (item.id_quality_label!=1){
                         if (item.commodityImages.length===0){
                             tempTip.setDuration(3000);