盘点任务页面添加筛选项

app/Services/InventoryAccountService.php

@@ -44,6 +44,7 @@ class InventoryAccountService
         $inventories=InventoryAccount::query()->with(['owner','creator'])->orderBy('id','desc')->whereIn('owner_id',$ownerIds);
         $columnQueryRules=[
             'owner_id' => ['multi' => ','],
+            'type' => ['multi' => ','],
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'date_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
         ];

resources/views/inventory/stockInventory/mission.blade.php

@@ -7,13 +7,14 @@
     <div class="text-center h5 mt-2" id="loadingPage">
         载入中……
     </div>
-    <div id="list" class="container-fluid d-none" style="min-width: 1500px">
-        <form class="form-inline mt-2">
+    <div id="list" class="container-fluid d-none" {{--style="min-width: 1500px"--}}>
+            <div class="card-header alert-info">
+        <form class="form-inline">
             <span class="form-inline ml-5">
                  <span class="btn btn-sm btn-outline-secondary tooltipTarget" @click="syncOwners">同步货主</span>
                 <select class="form-control form-control-sm tooltipTarget" name="owner_id" id="owner_id" style="width: 150px;position: relative" title="选择指定货主" v-model="owner_id">
                                         <option value="">货主</option>
-                                        <option v-for="owner in owners" :value="owner.id">@{{ owner.name }}</option>
+                                        <option v-for="owner in owners" :value="owner.name">@{{ owner.value }}</option>
                                     </select>
                 <input placeholder="定位货主" id="ownerName" autocomplete="off" @input="定位货主($event)" class="form-control form-control-sm tooltipTarget" style="width: 100px" title="输入关键字定位货主" >
             </span>
@@ -31,11 +32,24 @@
                 @endcan
             </span>
         </form>
-
-        <div class="card-header pt-0">
-            <div id="form"></div>
         </div>
-        <div class="card-body pt-1">
+        <div id="form_div" class="mt-2"></div>
+
+{{--        <div class="card-header pt-0">--}}
+{{--            <div id="form"></div>--}}
+{{--            <span class="dropdown">--}}
+{{--        <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"--}}
+{{--                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">--}}
+{{--            导出Excel--}}
+{{--        </button>--}}
+{{--        <div class="dropdown-menu">--}}
+{{--            <a class="dropdown-item" @click="inventoryExport(false)" href="javascript:">导出勾选内容</a>--}}
+{{--            <a class="dropdown-item" @click="inventoryExport(true)" href="javascript:">导出所有页</a>--}}
+{{--        </div>--}}
+{{--        </span>--}}
+{{--        </div>--}}
+
+        <div class=" pt-1">
             <label for="all" class="d-none" id="cloneCheckAll">
                 <input id="all" type="checkbox" @click="checkAll($event)">全选
             </label>
@@ -91,16 +105,6 @@
             <div class="text-info h5 btn btn">{{$inventoryAccounts->count()}}/@{{ sum }}</div>
             <div>{{$inventoryAccounts->appends($paginateParams)->links()}}</div>
         </div>
-        <span class="dropdown">
-        <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
-            导出Excel
-        </button>
-        <div class="dropdown-menu">
-            <a class="dropdown-item" @click="inventoryExport(false)" href="javascript:">导出勾选内容</a>
-            <a class="dropdown-item" @click="inventoryExport(true)" href="javascript:">导出所有页</a>
-        </div>
-        </span>
     </div>
 
 @endsection
@@ -127,7 +131,12 @@
                     },
                     @endforeach
                 ],
-                owners:{!! $owners !!},
+                owners:[
+                        @foreach($owners as $owner)
+                    {name:'{{$owner->id}}',value:'{{$owner->name}}'},
+                    @endforeach
+                ],
+                {{--owners:{!! $owners !!},--}}
                 checkData: [],
                 selectedStyle:'',
                 sum:{!! $inventoryAccounts->total() !!},
@@ -143,6 +152,21 @@
                     $('#list').removeClass('d-none');
                 })()
                 this.fakeOwners=this.owners;
+                $('#list').removeClass('d-none');
+                let data=[
+                    [
+                        {name:'date_start',type:'dateTime',tip:'选择显示指定日期的起始时间'},
+                        {name:'date_end',type:'dateTime',tip:'选择显示指定日期的结束时间'},
+                         {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的货主'],
+                             placeholder:['货主','定位或多选货主'],data:this.owners},
+                        {name:'type',type:'select',placeholder: '任务类型',data:[{name:'全盘',value:'全盘'},{name:'动盘',value:'动盘'}, {name:'局部盘点',value:'局部盘点'}]},
+                    ],
+                ];
+                this.form = new query({
+                    el:"#form_div",
+                    condition:data,
+                });
+                this.form.init();
                 let _this = this;
                 let column = [
                     {name:'cloneCheckAll',customization:true,type:'checkAll',column:'id',
@@ -179,21 +203,6 @@
                     });
                     header.init();
                 },0);
-                // let data=[
-                //     [
-                //         {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
-                //             placeholder:['货主','定位或多选货主'],data:this.owners},
-                //         {name:'date_start',type:'dateTime',tip:'选择创建日期的开始时间',},
-                //         {name:'date_end',type:'dateTime',tip:'选择创建日期的结束时间',},
-                //     ],
-                // ];
-                // this.form = new query({
-                //     el:'#form_div',
-                //     condition:data,
-                // });
-                // this.form.init();
-                // let obj=this.form.getSearchData();
-                // this.formData=obj;
             },
             methods:{
                 selectedColor(id){
@@ -350,8 +359,8 @@
                 },
                 定位货主(e){
                     this.owners.some(owner => {
-                        if (owner.name.indexOf(e.target.value) !== -1){
-                            this.owner_id = owner.id;
+                        if (owner.value.indexOf(e.target.value) !== -1){
+                            this.owner_id = owner.name;
                             return true;
                         }
                     });