客服系统 bug修改 [退货管理不存在的退回单号不能录入] by 'zengjun'

app/Http/Controllers/OrderIssueController.php

@@ -10,6 +10,7 @@ use App\Order;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
 use App\OrderIssueType;
+use App\OrderPackage;
 use App\Owner;
 use App\RejectedBill;
 use App\Services\OrderIssueService;
@@ -429,7 +430,7 @@ class OrderIssueController extends Controller
         } else if ($request->input('type') == 'RejectedBill') {
             $rejectedBill = RejectedBill::where('logistic_number_return',$request->input('id'))->first();
             if(!$rejectedBill){
-                return  ['success' => false, 'fail_info' => '没有对应的问题单号'];
+                return ['success'=>true,'fail_info' => '没有对应的退回单号将但仍可以创建订单问题件'];
             }
             $bool = OrderIssue::where('rejected_bill_id',$rejectedBill['id'] )->count() > 0;
             if ($bool) {

app/Http/Controllers/UserController.php

@@ -22,10 +22,22 @@ class UserController extends Controller
      *
      * @return Response
      */
-    public function index()
+    public function index(Request $request)
     {
         if(!Gate::allows('用户-查询')){ return redirect(url('/'));  }
-        $users=User::with(['roles','carriers','userWorkgroups'])->orderBy('id','desc')->paginate(35);
+        $query = User::with(['roles','carriers','userWorkgroups']);
+        if($request->has('name')){
+           $query->where('name','like',$request->input('name'));
+        }
+        if($request->has('role')){
+            $role = $request->input('role');
+            $query->whereHas('roles',function($query) use ($role){
+                return $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){
             $user['isSuperAdmin']=$user->isSuperAdmin();
         });

resources/js/queryForm/queryForm.js

@@ -672,7 +672,7 @@ const query = function getQueryForm(data) {
             label.show();
         }
     }
-    
+
     // modify _data
     function modifyData(dom) {
         _data[dom.name].mold = dom.mold;
@@ -762,7 +762,7 @@ const query = function getQueryForm(data) {
         endDate = new Date(endDate);
         return Math.floor((endDate.getTime() - startDate.getTime())/(24*3600*1000));
     }
-    
+
     function getSubDate(date,value) {
         date = new Date(date);
         date.setDate(date.getDate() - value);

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

@@ -8,6 +8,7 @@
     </span>
     <div class="container-fluid">
         <div class="card">
+            <div id="form_div"></div>
             <div class="card-body">
                 @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,8 +63,16 @@
                         roles:{!! $user->roles !!},carriers:{!! $user->carriers !!},workgroup:{!! $user->userWorkgroups !!},created_at:'{{$user->created_at}}'},
                     @endforeach
                 ],
+                form:'',
             },
             mounted:function(){
+                let data = [[{name:'name',type:'input',tip:'用户名：可在两侧添加百分号(%)进行模糊搜索',placeholder:'用户名'},
+                    {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: '用户名'},

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

@@ -422,11 +422,17 @@
                     let data = {type: 'RejectedBill', id: this.logistic_number_return};
                     axios.post("{{url('apiLocal/order/issue/orderIssueHasCreate')}}", data).then(function (res) {
                         if (res.data.success) {
-                            if (res.data.data.order) {
-                                _this.order = res.data.data.order;
+                            if(res.data.data){
+                                if (res.data.data.order) {
+                                    _this.order = res.data.data.order;
+                                }
+                                if (res.data.data.rejectedBill) {
+                                    _this.rejectedBill = res.data.data.rejectedBill;
+                                }
                             }
-                            if (res.data.data.rejectedBill) {
-                                _this.rejectedBill = res.data.data.rejectedBill;
+                            if(res.data.fail_info){
+                                tempTip.setDuration(3000);
+                                tempTip.showSuccess(res.data.fail_info);
                             }
                             _this.isSubmit = true;
                         } else {
@@ -439,7 +445,6 @@
                         tempTip.setDuration(5000);
                         tempTip.show('网络链接失败：' + err);
                         _this.isSubmit = false;
-
                     });
                 },
                 checkWMSOrderNo() {