退货管理-筛选条件可以加一个快递名称的筛选（name）

订单管理-快递获取标记的显示与搜索
基础设置-角色用户的权限角色选择框放大

app/Http/Controllers/OrderController.php

@@ -29,6 +29,7 @@ class OrderController extends Controller
         $notes=$request->input('notes');
         $addtime=$request->input('addtime');
         $waveno=$request->input('waveno');
+        $edisendflag2=$request->edisendflag2;
         if ($orderdate_start){
             $sql.=" and ordertime>='".$orderdate_start;
             if ($ordertime_start)$sql.=" ".$ordertime_start.":00'";
@@ -77,6 +78,9 @@ class OrderController extends Controller
                 $sql.=")";
             }
         }
+        if ($edisendflag2){
+            $sql.=" and edisendflag2 = '".$edisendflag2."'";
+        }
         return $sql;
     }
 

app/Http/Controllers/RejectedController.php

@@ -49,8 +49,8 @@ class RejectedController extends Controller
         $rejectedBills=$rejectedQuery->paginate($paginate, ['*'], 'page', $page);
         $owners = Owner::filterAuthorities()->get();
         $qualityLabels = QualityLabel::all();
-
-        return view('rejected.search.general',compact('rejectedBills','owners',
+        $logistics=Logistic::get();
+        return view('rejected.search.general',compact('rejectedBills','owners','logistics',
             'paginateParams','qualityLabels'));
     }
     public function recycle(Request $request)
@@ -95,6 +95,7 @@ class RejectedController extends Controller
             'barcode_goods'=> $request->input('barcode_goods'),
             'logistic_number_return'=> $request->input('logistic_number_return'),
             'logistic_number'=> $request->input('logistic_number'),
+            'id_logistic_return'=> $request->id_logistic_return,
         ];
 
         if(Session::get('rejected.index.isFromEditPage')){
@@ -117,6 +118,7 @@ class RejectedController extends Controller
         $barcode_goods = $params['barcode_goods'];
         $logistic_number_return = $params['logistic_number_return'];
         $logistic_number = $params['logistic_number'];
+        $id_logistic_return= $params['id_logistic_return'];
         $rejectedBillsQuery=RejectedBill::with(['owner','logistic','items',]);
         if($created_at_start&&!$created_at_end){
             $created_at_end = $created_at_start;
@@ -217,6 +219,9 @@ class RejectedController extends Controller
                 $rejectedBillsQuery=$rejectedBillsQueryTem;
             }
         }
+        if ($id_logistic_return){
+            $rejectedBillsQuery=$rejectedBillsQuery->where('id_logistic_return',$id_logistic_return);
+        }
         return $rejectedBillsQuery;
     }
 

database/migrations/2020_07_10_145923_change_rejected_bills_column_id_logistic_return.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeRejectedBillsColumnIdLogisticReturn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('rejected_bills', function (Blueprint $table) {
+            $table->bigInteger('id_logistic_return')->index()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('rejected_bills', function (Blueprint $table) {
+            $table->dropIndex('rejected_bills_id_logistic_return_index');
+        });
+    }
+}

resources/js/singles/rejectedIndex.js

@@ -2,12 +2,13 @@
 let vueList=new Vue({
     el:"#list",
     data:{
-        filterParams:{created_at:'',owner_id:'',order_number:'',logistic_number_return:'',mobile_sender:'',barcode_goods:'',
+        filterParams:{created_at:'',owner_id:'',order_number:'',logistic_number_return:'',mobile_sender:'',barcode_goods:'',id_logistic_return:'',
             is_checked:'',created_at_start:'',created_at_end:'',id_quality_label:'',is_loaded:'',checked_numbers:'',paginate:'50'},
         checkBoxAll:[],
         rejectedBills:rejectedBills,
         rejectedBills_checkBoxes:[],
         owners:owners,
+        logistics:logistics,
         qualityLabels:qualityLabels,
     },
     mounted:function(){
@@ -54,6 +55,10 @@ let vueList=new Vue({
             this.filterParams.is_loaded=e.target.value;
             this.filterRun();
         },
+        id_logistic_return_change:function(e){
+            this.filterParams.id_logistic_return=e.target.value;
+            this.filterRun();
+        },
         initInputs:function(){
             let data=this;
             // let uriParts = decodeURI(location.href).split("?");

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

@@ -36,7 +36,7 @@
                         <label class="col-2"></label>
                         <div class="col-5">
                             <input name="authority" hidden   v-model="authorities" >
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
+                            <div class="input-group" style="max-height: 245px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
                                 <ul class="list-group tooltipTarget" style="width: 100%"  onselectstart="return false;">
                                     <li  :data-original-title="authority.style ? '双击删除权限' :'双击添加权限'"    v-for="authority in authoritiesAll" v-if="authority.permission=='允许'" :id="authority.name" class="tooltipTarget list-group-item list-group-item-action pt-0 pb-0"
                                          @dblclick="selectedAuthority(authority)" :class="authority.style ? 'active' :''"><span style="cursor: default;" > @{{ authority.name }}  </span></li>
@@ -49,7 +49,7 @@
                             @enderror
                         </div>
                         <div class="col-3" v-if="authoritiesList.length>0">
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                            <div class="input-group" style="max-height: 245px; overflow-y: scroll;border-radius:5px;text-align: center;">
                                 <ul class="list-group tooltipTarget" style="width: 100%"  onselectstart="return false;">
                                     <li  title="双击删除权限"    v-for="authority in authoritiesList"  v-if="authority.permission=='允许'" class=" list-group-item list-group-item-action pt-0 pb-0"
                                          @dblclick="selectedAuthority(authority)"><span style="cursor: default;"> @{{ authority.name }}  </span></li>

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

@@ -42,7 +42,7 @@
                         <label class="col-2"></label>
                         <div class="col-5">
                             <input name="authority" hidden   v-model="authorities" >
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
+                            <div class="input-group" style="max-height: 245px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
                                 <ul class="list-group" style="width: 100%" onselectstart="return false;">
                                     <li  :data-original-title="authority.style ? '双击删除权限' :'双击添加权限'"    v-for="authority in authoritiesFilterAll" v-if="authority.permission=='允许'" :id="authority.name" class="list-group-item list-group-item-action pt-0 pb-0"
                                          @dblclick="selectedAuthority(authority)" :class="authority.style ? 'active' :''"><span style="cursor: default;" :id="authority.name"> @{{ authority.name }} </span></li>
@@ -55,7 +55,7 @@
                             @enderror
                         </div>
                         <div class="col-3" v-if="authoritiesList.length>0">
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                            <div class="input-group" style="max-height: 245px; overflow-y: scroll;border-radius:5px;text-align: center;">
                                 <ul class="list-group tooltipTarget" style="width: 100%"  onselectstart="return false;">
                                     <li  title="双击删除权限"    v-for="authority in authoritiesList" v-if="authority.permission=='允许'" class=" list-group-item list-group-item-action pt-0 pb-0"
                                          @dblclick="selectedAuthority(authority)"><span style="cursor: default;"> @{{ authority.name }}  </span></li>

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

@@ -97,7 +97,7 @@
                                 <div class="col-md-4">
                                     <input name="role" hidden v-model="roles">
                                     <div class="input-group"
-                                         style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
+                                         style="max-height: 190px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
                                         <ul class="list-group tooltipTarget" style="width: 100%"
                                             onselectstart="return false;">
                                             <li :data-original-title="role.style ? '双击删除角色' : '双击添加角色'"
@@ -110,7 +110,7 @@
                                 </div>
                                 <div class="col-md-3">
                                     <div class="input-group"
-                                         style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                                         style="max-height: 190px; overflow-y: scroll;border-radius:5px;text-align: center;">
                                         <ul class="list-group" style="width: 100%" onselectstart="return false;">
                                             <li title="双击删除角色" v-for="role in rolesList" :id="role.name"
                                                 class="list-group-item list-group-item-action pt-0 pb-0"

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

@@ -62,7 +62,7 @@
                         <label class="col-md-3"></label>
                         <div class="col-md-4">
                             <input name="role" hidden    v-model="roles" >
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
+                            <div class="input-group" style="max-height: 190px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
                                 <ul class="list-group tooltipTarget" style="width: 100%" onselectstart="return false;">
                                     <li  :data-original-title="role.style ? '双击删除角色' :'双击添加角色'"    v-for="role in rolesFilter" :id="role.name" class="list-group-item list-group-item-action pt-0 pb-0"
                                          @dblclick="selectedRole(role)" :class="role.style ? 'active' :''"><span style="cursor: default;" :id="role.name"> @{{ role.name }}  </span></li>
@@ -70,7 +70,7 @@
                             </div>
                         </div>
                         <div class="col-md-3">
-                            <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
+                            <div class="input-group" style="max-height: 190px; overflow-y: scroll;border-radius:5px;text-align: center;">
                                 <ul class="list-group" style="width: 100%" onselectstart="return false;">
                                     <li  title="双击删除角色"    v-for="role in rolesList" :id="role.name" class="list-group-item list-group-item-action pt-0 pb-0"
                                          @dblclick="selectedRole(role)" ><span style="cursor: default;" > @{{ role.name }}  </span></li>

resources/views/order/index/delivering.blade.php

@@ -56,7 +56,13 @@
                             <td style="width: 300px">
                                 <input style="max-width: 200px" name="issuepartyname" v-model="filterData.issuepartyname" class="form-control form-control-sm tooltipTarget" placeholder="店铺名称" :class="filterData.issuepartyname?'bg-warning':''">
                             </td>
-                            <td colspan="4"></td>
+                            <td colspan="4">
+                                <select name="edisendflag2" class="form-control form-control-sm tooltipTarget" style="max-width: 150px" title="快递获取标记" @change="submit">
+                                    <option value="">快递获取标记</option>
+                                    <option value="Y">是</option>
+                                    <option value="N">否</option>
+                                </select>
+                            </td>
                         </tr>
                         <tr>
                             <td >
@@ -183,7 +189,7 @@
                         <td class="text-muted">@{{ order.c_address1 }}</td>
                         <td class="text-nowrap">@{{ order.waveno }}</td>
                         <td class="text-nowrap"> @{{ order.warehouseid }}</td>
-                        <td class="text-nowrap">@{{ order.edisendflag2 }}</td>
+                        <td class="text-nowrap"><span v-if="order.edisendflag2=='Y'">是</span><span v-else>否</span></td>
                         <td class="text-nowrap">@{{ order.edisendtime2 }}</td>
                         <td colspan="5" class="text-center">
                             <table v-if="commodities[order.orderno]&&commodities[order.orderno].length==1 || isBtn[order.orderno]" class="table text-nowrap table-sm">
@@ -235,7 +241,7 @@
             data:{
                 filterData:{
                     paginate:50,ordertime_start:'',orderdate_start:'',orderdate_end:'',ordertime_end:'',customerid:'',orderno:'',soreference5:'',codename_c:'',
-                    carriername:'',issuepartyname:'',soreference1:'',notes:'',addtime:'31',alternate_sku1:'',waveno:'',
+                    carriername:'',issuepartyname:'',soreference1:'',notes:'',addtime:'31',alternate_sku1:'',waveno:'',edisendflag2:'',
                 },
                 page:Number('{{$page}}'),
                 maxPage:1,
@@ -339,6 +345,7 @@
                     if (this.filterData.addtime)url+="&&addtime="+this.filterData.addtime;
                     if (this.filterData.alternate_sku1)url+="&&alternate_sku1="+this.filterData.alternate_sku1;
                     if (this.filterData.waveno)url+="&&waveno="+this.filterData.waveno;
+                    if (this.filterData.edisendflag2) url+="&&edisendflag2="+this.filterData.edisendflag2;
                     window.location.href=url;
                 },
                 //提交表单
@@ -395,7 +402,8 @@
                         +"&&soreference5="+this.filterData.soreference5+"&&export="+true+"&&codename_c="+this.filterData.codename_c
                         +"&&issuepartyname="+this.filterData.issuepartyname+"&&customerid="+this.filterData.customerid
                         +"&&soreference1="+this.filterData.soreference1+"&&notes="+this.filterData.notes
-                        +"&&addtime="+this.filterData.addtime+"&&alternate_sku1="+this.filterData.alternate_sku1+"&&waveno="+this.filterData.waveno);
+                        +"&&addtime="+this.filterData.addtime+"&&alternate_sku1="+this.filterData.alternate_sku1+"&&waveno="+this.filterData.waveno
+                        +"&&edisendflag2="+this.filterData.edisendflag2);
                 },
                 modal(){
                     $("#myModal").modal('show');

resources/views/rejected/search/general.blade.php

@@ -76,7 +76,12 @@
                                         <option value="0">未审核</option>
                                     </select>
                                 </td>
-                                <td width="36%"></td>
+                                <td width="36%">
+                                    <select style="max-width: 120px" name="id_logistic_return" class="form-control form-control-sm tooltipTarget" @change="id_logistic_return_change" title="快递名称" :class="filterParams.id_logistic_true?'bg-warning':''">
+                                        <option value="">快递名称</option>
+                                        <option v-for="logistic in logistics" :value="logistic.id">@{{ logistic.name }}</option>
+                                    </select>
+                                </td>
                             </tr>
                             <tr>
                                 <td colspan="2">
@@ -241,9 +246,9 @@
                             <span v-else>@{{rejectedBill.is_loaded | yesNoIsLoaded}}</span>
                         </td>
                         <td class="text-muted">@{{rejectedBill.created_at}}</td>
-                        <td>@{{rejectedBill.owner.name}}</td>
+                        <td><span v-if="rejectedBill.owner">@{{rejectedBill.owner.name}}</span></td>
                         <td>@{{rejectedBill.logistic_number_return}}</td>
-                        <td class="text-muted">@{{rejectedBill.logistic.name}}</td>
+                        <td class="text-muted"><span v-if="rejectedBill.logistic">@{{rejectedBill.logistic.name}}</span></td>
                         <td>@{{rejectedBill.order_number}}</td>
                         <td class="text-muted">@{{rejectedBill.sender}}</td>
                         <td class="text-muted">@{{rejectedBill.mobile_sender}}</td>
@@ -309,6 +314,11 @@
             {id:'{{$owner->id}}',name:'{{$owner->name}}'},
             @endforeach
         ];
+        let logistics=[
+            @foreach($logistics as $logistic)
+            {!! $logistic !!},
+            @endforeach
+        ];
         let qualityLabels=[
                 @foreach($qualityLabels as $qualityLabel)
             {id:'{{$qualityLabel->id}}',name:'{{$qualityLabel->name}}'},
@@ -328,5 +338,5 @@
         let exportExcelOnFilterParamsURL='{{url("rejected/exportExcelOnFilterParams")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/singles/rejectedIndex200513.js')}}"></script>
+    <script src="{{asset('js/singles/rejectedIndex200710.js')}}"></script>
 @endsection

webpack.mix.js

@@ -13,7 +13,7 @@ const mix = require('laravel-mix');
 
 mix.js('resources/js/app.js', 'public/js')
     .sass('resources/sass/app.scss', 'public/css/app200708.css');
-mix.js('resources/js/singles/rejectedIndex.js', 'public/js/singles/rejectedIndex200513.js');
+mix.js('resources/js/singles/rejectedIndex.js', 'public/js/singles/rejectedIndex200710.js');
 mix.js('resources/js/singles/searchAnalyze.js', 'public/js/singles/searchAnalyze200513.js');
 
 mix.copy('resources/sass/fonts/','public/fonts');