实时收货看板添加权限限制,以及推单页面修改

app/Http/Controllers/RejectedPushTaskController.php

@@ -12,7 +12,7 @@ class RejectedPushTaskController extends Controller
     {
         $ownerIds = app('OwnerService')->getIdArr();
         $owners = Owner::query()->whereIn('id', $ownerIds)->get();
-        $ownerIds = $owners->pluck('id');
+        $ownerIds=collect($ownerIds);
         return view('rejected.rejectedPushTask.index', compact('owners', 'ownerIds'));
     }
 }

resources/views/rejected/rejectedPushTask/index.blade.php

@@ -19,9 +19,13 @@
                 </select>
             </div>
 
-            <div class="form-group m-2">
-                <select class="form-control selectpicker" title="货主" v-model="tableData.secondData.search.ownerId">
-                    <option v-for="item of selectData.owners" :value="item.id">@{{ item.name }}</option>
+            <div class="form-group m-2" style="max-width: 200px !important;">
+                <select v-model="tableData.secondData.search.ownerId" class="selectpicker form-control" title="选择货主"
+                        data-actions-box="true"
+                        data-live-search="true"
+                        data-live-search-placeholder="搜索"
+                >
+                    <option v-for="(v,k) of selectData.owners" :value="v.id" :key="v.id">@{{ v.name }}</option>
                 </select>
             </div>
 
@@ -51,6 +55,12 @@
             <div class="form-group m-2">
                 <button class="form-control btn btn-sm btn-info" @click="searchData()">查询</button>
             </div>
+
+        </div>
+        <div class="form-group m-3">
+            <button class="btn btn-success btn-sm" >
+                货主开启攒单
+            </button>
         </div>
         <!--表格-->
         <!--创建-->
@@ -335,6 +345,7 @@
                         search: {
                             ownerId: null,
                             type: null,
+                            taskNum: null,
                             status: '创建',
                             ownerIdList: {!! $ownerIds !!}
                         }
@@ -475,14 +486,23 @@
                 }).init();
             },
             methods: {
+                setFirstDataSearach(){
+                    this.tableData.firstData.search.ownerId=this.tableData.secondData.search.ownerId;
+                    this.tableData.firstData.search.type= this.tableData.secondData.search.type;
+                    this.tableData.firstData.search.taskNum=this.tableData.secondData.search.taskNum;
+                    if (this.tableData.secondData.search.status!=null){
+                        this.tableData.firstData.search.status=this.tableData.secondData.search.status;
+                    }
+                },
                 //初始化页面数据
                 initData() {
-                    //加载firstTable
-                    let firstDataUrl = this.getBaseUrl() + `/api/wms/rejectedPushTask/list?size=${this.tableData.firstData.size}&current=${this.tableData.firstData.current}`;
-                    this.fetch(firstDataUrl, this.tableData.firstData, this.tableData.firstData.search);
                     //加载secondTable
                     let secondDataUrl = this.getBaseUrl() + `/api/wms/rejectedPushTask/list?size=${this.tableData.secondData.size}&current=${this.tableData.secondData.current}`;
                     this.fetch(secondDataUrl, this.tableData.secondData, this.tableData.secondData.search);
+                    //加载firstTable
+                    this.setFirstDataSearach();
+                    let firstDataUrl = this.getBaseUrl() + `/api/wms/rejectedPushTask/list?size=${this.tableData.firstData.size}&current=${this.tableData.firstData.current}`;
+                    this.fetch(firstDataUrl, this.tableData.firstData, this.tableData.firstData.search);
                 },
                 //发送请求并给对应数据赋值
                 fetch(url, data, search) {
@@ -612,7 +632,7 @@
                     let url = null;
                     let env = "{{ config('app.env') }}";
                     if (env === 'local') {
-                        url = 'http://127.0.0.1:8118'
+                        url = 'http://127.0.0.1:8112'
                     } else if (env === 'production') {
                         url = 'https://swms.baoshi56.com'
                     }
@@ -625,8 +645,13 @@
                     } else if (flag === 'next' && this.tableData.secondData.current < this.tableData.secondData.pages) {
                         this.tableData.secondData.current++;
                     }
-                    let url = this.getBaseUrl() + `/api/wms/rejectedPushTask/list?size=${this.tableData.secondData.size}&current=${this.tableData.secondData.current}`;
-                    this.fetch(url, this.tableData.secondData, this.tableData.secondData.search);
+                    //加载secondTable
+                    let secondDataUrl = this.getBaseUrl() + `/api/wms/rejectedPushTask/list?size=${this.tableData.secondData.size}&current=${this.tableData.secondData.current}`;
+                    this.fetch(secondDataUrl, this.tableData.secondData, this.tableData.secondData.search);
+                    //加载firstTable
+                    this.setFirstDataSearach();
+                    let firstDataUrl = this.getBaseUrl() + `/api/wms/rejectedPushTask/list?size=${this.tableData.firstData.size}&current=${this.tableData.firstData.current}`;
+                    this.fetch(firstDataUrl, this.tableData.firstData, this.tableData.firstData.search);
                 },
                 //下载excel
                 downExcel(item) {

resources/views/store/index.blade.php

@@ -2,7 +2,5 @@
 @section('title')入库管理@endsection
 
 @section('content')
-    <span id="nav2">
-        @component('store.menu')@endcomponent
-    </span>
+
 @endsection

resources/views/store/receivingDashboard/punctualityProgress/index.blade.php

@@ -195,11 +195,17 @@
                     createSingleEndTime: null,
                     workGroupId: null,
                     sign: null,
+                    ownerIdList:[
+                            @foreach($owners as $owner)
+                        {{$owner->id}},
+                        @endforeach
+                    ],
                 },
                 size: 50,
                 current: 1,
             },
             created() {
+                console.log(this.search.ownerIdList)
                 let url = this.getBaseUrl() + `/api/receiveBoard/agingScheduleList?size=${this.size}&current=${this.current}`
                 this.initSearchDate();
                 this.getPageResult(url);

resources/views/store/receivingDashboard/receivingTableList/index.blade.php

@@ -215,6 +215,11 @@
                     createSingleStartTime: null,
                     createSingleEndTime: null,
                     sign: null,
+                    ownerIdList:[
+                        @foreach($owners as $owner)
+                            {{$owner->id}},
+                        @endforeach
+                    ],
                 },
                 closeAsnParam:{
                     asnType:null,