角色，用户名的搜索

by 'zengjun'

app/Http/Controllers/OrderIssueController.php

@@ -419,6 +419,9 @@ class OrderIssueController extends Controller
         $rejectedService = app('rejectedService');
         if ($request->input('type') == 'WMSOrderNo') {
             $order = $orderService->createOrderByWMSOrderNo($request->input('id'));
+            if(!$order){
+                return ['success' => false, 'fail_info' => '没有对应的WMS订单号'];
+            }
             $bool = OrderIssue::where('order_id', $order['id'])->count() > 0;
             if ($bool) {
                 return ['success' => false, 'fail_info' => '该订单号已有问题订单件'];

app/Http/Controllers/RoleController.php

@@ -18,10 +18,20 @@ class RoleController extends Controller
      *
      * @return Response
      */
-    public function index()
+    public function index(Request $request)
     {
         if(!Gate::allows('角色-查询')){ return redirect(url('/'));  }
-        $roles=Role::with('authorities')->orderBy('id','desc')->paginate(35);
+        $query = Role::with('authorities');
+/*        if($request->has('user')){
+            $user = $request->input('user');
+            $query->whereHas('users',function($query) use ($user){
+                $query->where('name','like',$user);
+            });
+        }*/
+        if($request->has('role')){
+            $query->where('name','like',$request->input('role'));
+        }
+        $roles= $query->orderBy('id','desc')->paginate(35);
         return view('maintenance.role.index',['roles'=>$roles]);
     }
 

app/Http/Controllers/UserController.php

@@ -26,16 +26,15 @@ class UserController extends Controller
     {
         if(!Gate::allows('用户-查询')){ return redirect(url('/'));  }
         $query = User::with(['roles','carriers','userWorkgroups']);
-        if($request->has('name')){
-           $query->where('name','like',$request->input('name'));
+        if($request->has('user')){
+           $query->where('name','like',$request->input('user'));
         }
         if($request->has('role')){
             $role = $request->input('role');
             $query->whereHas('roles',function($query) use ($role){
-                return $query->where('name','like',$role);
+                 $query->where('name','like',$role);
             });
         }
-
 //        $users=User::with(['roles','carriers','userWorkgroups'])->orderBy('id','desc')->paginate(35);
         $users = $query->orderBy('id','desc')->paginate(35);
         $users->each(function (User $user){

app/Services/OrderIssueService.php

@@ -45,7 +45,7 @@ class OrderIssueService
             $query->whereHas('owner', function ($query) use ($owner_ids) {
                 return $query->whereIn('id', $owner_ids);
             });
-        })->get();
+        });
 
         $orders = Order::select('id')->whereIn('owner_id', $owner_ids)->get();
         foreach ($orders as $order) {
@@ -121,7 +121,7 @@ class OrderIssueService
 
     public function paginate(array $arr)
     {
-        return $this->getConditionQuery($arr)->paginate(isset($arr['paginate'])??50);
+        return $this->getConditionQuery($arr)->paginate($arr['paginate']??50);
     }
 
     public function orderIssueTag(array $arr)

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

@@ -8,6 +8,7 @@
     </span>
     <div class="container-fluid">
         <div class="card">
+            <div id="form_div"></div>
             <div class="card-body" id="list">
                 @if(Session::has('successTip'))
                     <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
@@ -49,6 +50,7 @@
 @endsection
 
 @section('lastScript')
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         new Vue({
@@ -61,11 +63,19 @@
                     },
                     @endforeach
                 ],
+                form:'',
             },
             mounted:function(){
+                let data = [[
+                    {name:'role',type:'input',tip:'角色名：可在两侧添加百分号(%)进行模糊搜索',placeholder:'角色名'}]];
+                this.form = new query({
+                    el: '#form_div',
+                    condition: data,
+                })
+                this.form.init();
                 let column = [
                     {name:'id',value: 'ID'},
-                    {name:'name',value: '用户名'},
+                    {name:'name',value: '角色'},
                     {name:'alias_name',value: '允许权限', neglect: true},
                     {name:'alias_name_false',value: '禁止权限', neglect: true},
                     {name:'created_at',value: '创建时间'},

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

@@ -66,7 +66,7 @@
                 form:'',
             },
             mounted:function(){
-                let data = [[{name:'name',type:'input',tip:'用户名：可在两侧添加百分号(%)进行模糊搜索',placeholder:'用户名'},
+                let data = [[{name:'user',type:'input',tip:'用户名：可在两侧添加百分号(%)进行模糊搜索',placeholder:'用户名'},
                     {name:'role',type:'input',tip:'角色名：可在两侧添加百分号(%)进行模糊搜索',placeholder:'角色名'}]];
                 this.form = new query({
                     el: '#form_div',

resources/views/order/issue/create.blade.php

@@ -68,13 +68,13 @@
                                         <th>商品名</th>
                                         <th>数量</th>
                                     </tr>
-                                    <tr v-for="packages in order.packages">
-                                        <template v-for="items in packages.commodities">
+                                    <template v-for="packages in order.packages" >
+                                        <tr v-for="items in packages.commodities">
                                             <td>@{{ items.commodity.sku }}</td>
                                             <td>@{{ items.commodity.name }}</td>
                                             <td>@{{ items.amount }}</td>
-                                        </template>
-                                    </tr>
+                                        </tr>
+                                    </template>
                                 </table>
                             </div>
                         </div>