菜单样式等修改

app/Http/Controllers/ExitController.php

@@ -26,7 +26,7 @@ class ExitController extends Controller
             $orders=$orders->where('ordertime','<=',$ordertime_end);
         }
         if ($customerid)$orders=$orders->where('customerid',$customerid);
-        if ($soreference1)$orders=$orders->where('soreference1','like',$soreference1."%");
+        if ($soreference1)$orders=$orders->where('orderno','like',$soreference1."%");
         if ($soreference5){
             $arr=array_filter(preg_split('/[,， ]+/is', $soreference5));
             $orders=$orders->whereIn('soreference5',$arr);
@@ -34,7 +34,7 @@ class ExitController extends Controller
         return $orders;
     }
     public function forwarding(Request $request){
-        if(!Gate::allows('出库管理-发运')){ return redirect(url('/'));  }
+        if(!Gate::allows('订单管理-发运')){ return redirect(url('/'));  }
         $orders=OracleDOCOrderHeader::with(['oracleDOCOrderDetails'=>function($query){
             return $query->select('DOC_Order_Details.orderno','DOC_Order_Details.CustomerID',
                 'DOC_Order_Details.SKU','DOC_Order_Details.QtyOrdered','DOC_Order_Details.OrderLineNo',
@@ -64,7 +64,7 @@ class ExitController extends Controller
     }
 
     public function batchComments(Request $request){
-        if(!Gate::allows('出库管理-批量注释')){ return redirect(url('/'));  }
+        if(!Gate::allows('订单管理-批量备注')){ return redirect(url('/'));  }
         $checkData=$request->input('checkData');
         $content=$request->input('content');
         $ordersNotNull=OracleDOCOrderHeader::select('OrderNo','Notes')->whereIn('orderno',$checkData)
@@ -86,7 +86,7 @@ class ExitController extends Controller
     }
 
     function export($orders){
-        if(!Gate::allows('出库管理')){ return redirect(url('/'));  }
+        if(!Gate::allows('订单管理')){ return redirect(url('/'));  }
         ini_set('max_execution_time',3500);
         ini_set('memory_limit','3526M');
         $row=[[

app/Http/Controllers/TestController.php

@@ -44,19 +44,19 @@ class TestController extends Controller
     {
         return call_user_func([$this, $method],$request);
     }
-    function t1(Request $request){ //x        $packagesBatch=Package::where('batch_number',$batch_number)->first();
+    function packageFromLog(Request $request){ //x        $packagesBatch=Package::where('batch_number',$batch_number)->first();
 
         ini_set('max_execution_time',2500);
         ini_set('memory_limit','1526M');
         $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('created_at','>',"2020-06-08 15:46:00")
+            ->where('created_at','<',"2020-06-08 15:47:00")
             ->where('type',"request_new_")
             ->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('created_at','>',"2020-06-08 15:46:00")
+            ->where('created_at','<',"2020-06-08 15:47:00")
             ->where('type',"request_new_")
             ->get();
         $requests->each(function($request)use(&$uploaded){

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

@@ -116,8 +116,8 @@ class WaybillController extends Controller
             'request.*.CarrierID' => ['required', 'string', 'max:191'],
             'request.*.ConsigneeName' => ['nullable', 'string', 'max:191'],
             'request.*.C_Tel1' => ['nullable', 'string', 'max:191'],
-            'request.*.C_Address1' => ['required', 'string', 'max:191'],
-            'request.*.C_Province' => ['required', 'string', 'max:191'],
+            'request.*.C_Address1' => ['nullable', 'string', 'max:191'],
+            'request.*.C_Province' => ['nullable', 'string', 'max:191'],
             'request.*.C_City' => ['nullable', 'string', 'max:191'],
             'request.*.C_District' => ['nullable', 'string', 'max:191'],
             'request.*.order_list' => ['nullable', 'array', 'min:1'],

database/migrations/2020_06_04_162259_add_exit_authority.php

@@ -8,9 +8,9 @@ use Illuminate\Support\Facades\Schema;
 class AddExitAuthority extends Migration
 {
     protected $authNames=[
-        "出库管理",
-        "出库管理-发运",
-        "出库管理-批量注释",
+        "订单管理",
+        "订单管理-发运",
+        "订单管理-批量备注",
     ];
     /**
      * Run the migrations.

package-lock.json

@@ -3735,7 +3735,8 @@
         "font-awesome": {
             "version": "4.7.0",
             "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-            "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
+            "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
+            "dev": true
         },
         "for-in": {
             "version": "1.0.2",

package.json

@@ -13,6 +13,7 @@
     "axios": "^0.19",
     "bootstrap": "^4.1.0",
     "cross-env": "^5.1",
+    "font-awesome": "^4.7.0",
     "jquery": "^3.2",
     "laravel-mix": "^4.0.7",
     "lodash": "^4.17.5",
@@ -24,7 +25,6 @@
     "vue-template-compiler": "^2.6.10"
   },
   "dependencies": {
-    "font-awesome": "^4.7.0",
     "js-cookie": "^2.2.0",
     "laravel-echo": "^1.6.1",
     "pusher-js": "^5.1.1",

resources/sass/app.scss

@@ -1,6 +1,7 @@
 // Variables
 @import 'variables';
 @import 'fonts';
+@import 'text';
 @import 'layout';
 
 // Bootstrap

resources/views/exit/index/forwarding.blade.php

@@ -60,7 +60,7 @@
                                     <a class="dropdown-item" @click="exitExport(2)" href="javascript:">导出所有页</a>
                                 </div>
                         </span>
-                        @can('出库管理-批量注释')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量注释</button>@endcan
+                        @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
                     </td>
                 </tr>
             </table>
@@ -76,7 +76,7 @@
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                        <button type="button" @click="batchComments()" class="btn btn-primary">提交批量注释</button>
+                        <button type="button" @click="batchComments()" class="btn btn-primary">批量备注追加</button>
                     </div>
                 </div><!-- /.modal-content -->
             </div><!-- /.modal -->
@@ -119,7 +119,7 @@
                     <input class="checkItem" type="checkbox" :value="order.orderno" v-model="checkData">
                 </td>
                 <td>@{{ i+1 }}</td>
-                <td class="text-primary">@{{ order.orderno }}</td>
+                <td class="text-dark font-weight-bold">@{{ order.orderno }}</td>
                 <td class="text-muted">@{{ order.oracleBASCode_codename_c }}</td>
                 <td> @{{ order.warehouseid }}</td>
                 <td >@{{ order.oracleBASCustomer_descr_c }}</td>

resources/views/exit/index/menu.blade.php

@@ -4,7 +4,7 @@
     <div class="container-fluid nav3">
         <div class="card menu-third" >
             <ul class="nav nav-pills">
-                @can('出库管理-发运')
+                @can('订单管理-发运')
                     <li class="nav-item">
                         <a class="nav-link text-dark" href="{{url('exit/index/forwarding')}}" :class="{active:isActive('forwarding',3)}">发运</a>
                     </li> @endcan

resources/views/exit/menu.blade.php

@@ -2,7 +2,7 @@
 <div class="container-fluid nav2" id="nav2">
     <div class="card">
         <ul class="nav nav-pills">
-            @can('出库管理-发运')
+            @can('订单管理-发运')
             <li class="nav-item">
                 <a class="nav-link" href="{{url('exit/index/forwarding')}}" :class="{active:isActive('index',2)}">查询</a>
             </li> @endcan

resources/views/layouts/menu.blade.php

@@ -3,31 +3,49 @@
     <ul class="navbar-nav mr-auto nav-tabs nav font-weight-bold" id="nav1">
         @can('退货管理')
             <li class="nav-item"><a href="{{url("rejected/")}}" class="nav-link"
-                                    :class="{active:isActive('rejected',1)}">退货管理</a></li> @endcan
+                                    :class="{active:isActive('rejected',1)}">
+                    <span class="fa fa-recycle" style="color: #721b6e"></span>
+                    退货管理</a></li> @endcan
         @can('入库管理')
             <li class="nav-item"><a href="{{url("store")}}" class="nav-link"
-                                    :class="{active:isActive('store',1)}">入库管理</a></li> @endcan
-        @can('出库管理')
+                                    :class="{active:isActive('store',1)}">
+                    <span class="fa fa-sign-in" style="color: #721b25"></span>
+                    入库管理</a></li> @endcan
+        @can('订单管理')
             <li class="nav-item"><a href="{{url("exit/index/forwarding")}}" class="nav-link"
-                                    :class="{active:isActive('exit',1)}">出库管理</a></li> @endcan
+                                    :class="{active:isActive('exit',1)}">
+                    <span class="fa fa-calendar-check-o" style="color: #1b4b72"></span>
+                    订单管理</a></li> @endcan
         @can('运输管理')
             <li class="nav-item"><a href="{{url("waybill/index")}}" class="nav-link"
-                                    :class="{active:isActive('waybill',1)}">运输管理</a></li> @endcan
+                                    :class="{active:isActive('waybill',1)}">
+                    <span class="fa fa-truck" style="color: #4c2584"></span>
+                    运输管理</a></li> @endcan
         @can('称重管理')
             <li class="nav-item"><a href="{{url("package/")}}" class="nav-link"
-                                    :class="{active:isActive('package',1)}">称重管理</a></li> @endcan
+                                    :class="{active:isActive('package',1)}">
+                    <span class="fa fa-balance-scale" style="color: #1b7234"></span>
+                    称重管理</a></li> @endcan
         @can('库存管理')
             <li class="nav-item"><a href="{{url("inventory/statement/changeInventory")}}" class="nav-link"
-                                    :class="{active:isActive('inventory',1)}">库存管理</a></li> @endcan
+                                    :class="{active:isActive('inventory',1)}">
+                    <span class="fa fa-list-alt" style="color: #32721b"></span>
+                    库存管理</a></li> @endcan
         @can('二次加工管理')
             <li class="nav-item"><a href="{{url("process/")}}" class="nav-link"
-                                    :class="{active:isActive('process',1)}">二次加工管理</a></li> @endcan
+                                    :class="{active:isActive('process',1)}">
+                    <span class="fa fa-hand-scissors-o" style="color: #726e1b"></span>
+                    二次加工管理</a></li> @endcan
         @can('人事管理')
             <li class="nav-item"><a href="{{url("personnel/checking-in/createReplenishClock")}}" class="nav-link"
-                                    :class="{active:isActive('personnel',1)}">人事管理</a></li> @endcan
+                                    :class="{active:isActive('personnel',1)}">
+                    <span class="fa fa-header" style="color: #72441b"></span>
+                    人事管理</a></li> @endcan
         @can('基础设置')
         <li class="nav-item"><a href="{{url("maintenance/")}}" class="nav-link"
-                                :class="{active:isActive('maintenance',1)}">基础设置</a></li> @endcan
+                                :class="{active:isActive('maintenance',1)}">
+                <span class="fa fa-server"></span>
+                基础设置</a></li> @endcan
     </ul>
 
     <!-- Right Side Of Navbar -->

routes/web.php

@@ -226,6 +226,6 @@ Route::group(['prefix'=>'inventory'],function (){
 Route::group(['prefix'=>'exit'],function(){
     //发运
     Route::get('index/forwarding','ExitController@forwarding');
-    //批量注释
+    //批量备注
     Route::post('create/batchComments','ExitController@batchComments');
 });