修改权限 修改服务商为卸货队

resources/views/transport/discharge/facilitator/index.blade.php → resources/views/personnel/discharge/facilitator/index.blade.php

@@ -1,12 +1,12 @@
 @extends('layouts.app')
 
-@section('title','卸货服务商')
+@section('title','装卸队')
 
 @section('content')
     <div id="nav2">
-        @component('transport.menu')@endcomponent
-        @component('transport.discharge.menu')@endcomponent
-        @component('transport.discharge.facilitator.menu')@endcomponent
+        @component('personnel.menu')@endcomponent
+        @component('personnel.discharge.menu')@endcomponent
+        @component('personnel.discharge.facilitator.menu')@endcomponent
     </div>
     <div id="list" class="d-none container-fluid">
         <div id="form_div"  style="min-width: 2250px"></div>
@@ -21,7 +21,7 @@
                     <a class="dropdown-item" @click="Export(true)" href="javascript:">导出所有页</a>
                 </div>
             </span>
-            @include('transport.discharge.facilitator._table')
+            @include('personnel.discharge.facilitator._table')
         </div>
     </div>
 @endsection
@@ -70,8 +70,8 @@
                 $(".tooltipTarget").tooltip({'trigger': 'hover'});
                 let data = [[
                     {
-                        name: 'facilitator_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的服务商'],
-                        placeholder: ['服务商', '服务商'],
+                        name: 'facilitator_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的装卸队'],
+                        placeholder: ['装卸队', '装卸队'],
                         data: _this.facilitators
                     },
                     {name: 'created_at_start', type: 'dateTime', tip: '创建开始日期'},
@@ -95,7 +95,7 @@
                     }
                 },
                 Export(isExportAll) {
-                    let url = '{{url('transport/discharge/facilitator/export')}}';
+                    let url = '{{url('personnel/discharge/facilitator/export')}}';
                     let token = '{{ csrf_token() }}';
                     excelExport(isExportAll, this.checkData, url, this.sum, token);
                 },

resources/views/transport/discharge/statement/index.blade.php → resources/views/personnel/discharge/statement/index.blade.php

@@ -75,8 +75,8 @@
                     {name: 'status', type: 'select', tip: '状态', data: status, placeholder: '状态'},
                 ], [
                     {
-                        name: 'facilitator_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的服务商'],
-                        placeholder: ['服务商', '定位或多选服务商'],
+                        name: 'facilitator_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的装卸队'],
+                        placeholder: ['装卸队', '定位或多选装卸队'],
                         data: _this.facilitators
                     },
                     {name: 'income_remark', type: 'input', tip: '备注', data: _this.status, placeholder: '支出备注'},
@@ -100,7 +100,7 @@
                     }
                 },
                 StatementsExport(isExportAll) {
-                    let url = '{{url('transport/discharge/statement/export')}}';
+                    let url = '{{url('personnel/discharge/statement/export')}}';
                     let token = '{{ csrf_token() }}';
                     excelExport(isExportAll, this.checkData, url, this.sum, token);
                 }

resources/views/transport/discharge/task/index.blade.php → resources/views/personnel/discharge/task/index.blade.php

@@ -4,9 +4,9 @@
 
 @section('content')
     <div id="nav2">
-        @component('transport.menu')@endcomponent
-        @component('transport.discharge.menu')@endcomponent
-        @component('transport.discharge.task.menu')@endcomponent
+        @component('personnel.menu')@endcomponent
+        @component('personnel.discharge.menu')@endcomponent
+        @component('personnel.discharge.task.menu')@endcomponent
     </div>
     <div id="list" class="d-none container-fluid">
         <div id="form_div"  style="min-width: 2250px"></div>
@@ -23,17 +23,17 @@
                 </div>
             </span>
             <span class="ml-1">
-                @can('运输管理-卸货-创建')
+                @can('人事管理-卸货-创建')
                 <button type="button" class="btn btn-outline-dark btn-sm form-control-sm tooltipTarget" @click="showCreateTaskModal(true)" style="background: #dad7e8;">创建任务</button>
                 @endcan
             </span>
         </div>
-        @include('transport.discharge.task._table')
-        @can('运输管理-卸货-创建')
-        @include('transport.discharge.task._createTask')
+        @include('personnel.discharge.task._table')
+        @can('人事管理-卸货-创建')
+        @include('personnel.discharge.task._createTask')
         @endcan
-        @can('运输管理-卸货-编辑')
-        @include('transport.discharge.task._executeTask')
+        @can('人事管理-卸货-编辑')
+        @include('personnel.discharge.task._executeTask')
         @endcan
     </div>
 @endsection
@@ -49,6 +49,7 @@
                 owners:{!! $owners !!},
                 ownerFilter: [],
                 facilitators:{!! $facilitators !!},
+                warehouses:{!! $warehouses !!},
                 facilitatorsFilter: [],
                 addTask: {income_at:null},
                 executingTack: {},
@@ -56,6 +57,8 @@
                 taskTypes: [
                     {name: 0, value: "装车"},
                     {name: 1, value: "卸车"},
+                    {name: 2, value: "翻托"},
+                    {name: 3, value: "包膜"},
                 ],
                 units: [
                     {name: 0, value: 'm3'},
@@ -152,6 +155,7 @@
                 },
                 // 创建任务 modals
                 showCreateTaskModal(isDisplay) {
+                    $('owner-name-filter').val('');
                     if (isDisplay){
                         if(!this.isUpdate)this.addTask.income_at = moment().format('YYYY-MM-DD');
                         $("#createdModal").modal('show');
@@ -162,6 +166,7 @@
                 },
                 // 执行任务 modal
                 showExecutingTaskModal(index, isDisplay, task) {
+                    $('owner-name-filter').val('');
                     this.executingTack = JSON.parse(JSON.stringify(task));
                     this.selectIndex = index;
                     if (isDisplay) {
@@ -189,7 +194,7 @@
                     }
                     this.addTask['income_total_cost'] = Number(this.addTask['income_unit_price']) * Number(this.addTask.income_amount);
                     this.addTask['status'] = 0;
-                    let url = '{{url('apiLocal/transport/discharge/task/store')}}';
+                    let url = '{{url('apiLocal/personnel/discharge/task/store')}}';
                     tempTip.setDuration(2000);
                     tempTip.setIndex(999);
                     axios.post(url, this.addTask).then(res => {
@@ -211,7 +216,7 @@
                 },
                 // 执行任务
                 executedTask(dischargeTask, index) {
-                    let url = '{{url('apiLocal/transport/discharge/task/updateFacilitator')}}';
+                    let url = '{{url('apiLocal/personnel/discharge/task/updateFacilitator')}}';
                     tempTip.setDuration(2000);
                     tempTip.setIndex(9999);
                     dischargeTask['income_total_cost'] = Number(dischargeTask['income_unit_price']) * (dischargeTask['income_amount']);
@@ -237,7 +242,7 @@
                 // 编辑当前任务
                 updateCurrentTask(addTask,index) {
                     // 更新
-                    let url = '{{url('apiLocal/transport/discharge/task/update')}}';
+                    let url = '{{url('apiLocal/personnel/discharge/task/update')}}';
                     tempTip.setDuration(2000);
                     tempTip.setIndex(2000);
                     axios.put(url, addTask).then(res => {
@@ -256,7 +261,7 @@
                     this.selectIndex = null;
                 },
                 updateCurrentTaskColumn(task,index,column,$e){
-                    let url = '{{url('apiLocal/transport/discharge/task/updateColumn')}}';
+                    let url = '{{url('apiLocal/personnel/discharge/task/updateColumn')}}';
                     tempTip.setDuration(2000);
                     tempTip.setIndex(99);
                     let value = $($e.target).val();
@@ -285,7 +290,7 @@
                     if (!confirm("是否删除当前任务")) {
                         return
                     }
-                    let url = '{{url('apiLocal/transport/discharge/task/delete/?id=')}}'+dischargeTask['id'];
+                    let url = '{{url('apiLocal/personnel/discharge/task/delete/?id=')}}'+dischargeTask['id'];
                     tempTip.setDuration(2000);
                     tempTip.setIndex(99);
                     axios.delete(url).then(res => {
@@ -301,28 +306,38 @@
                 },
                 // 下载
                 dischargeTaskExport(isExportAll) {
-                    let url = '{{url('transport/discharge/task/export')}}';
+                    let url = '{{url('personnel/discharge/task/export')}}';
                     let token = '{{ csrf_token() }}';
                     excelExport(isExportAll, this.checkData, url, this.sum, token);
                 },
                 // 筛选货主
                 filterOwner(e) {
                     let value = $(e.target).val();
-                    if (value === '') this.ownerFilter = JSON.parse(JSON.stringify(this.owners));
+                    if (value === '') {
+                        this.ownerFilter = JSON.parse(JSON.stringify(this.owners));
+                        this.addTask.owner_id = null;
+                    }
                     else {
                         this.ownerFilter = this.owners.filter(function (owner) {
-                            return owner.name.indexOf(value) !== -1;
+                            return owner.value.indexOf(value) !== -1;
                         });
+                        if(this.ownerFilter.length > 0)this.addTask.owner_id =this.ownerFilter[0]['name'];
+                        else this.addTask.owner_id = null;
+
                     }
                 },
-                // 筛选服务商
+                // 筛选装卸队
                 filterProviders(e) {
                     let value = $(e.target).val();
                     if (value === '') this.facilitatorsFilter = JSON.parse(JSON.stringify(this.facilitators));
                     else {
-                        this.facilitatorsFilter = this.facilitators.filter(function (providers) {
-                            return providers.name.indexOf(value) !== -1;
+                        let facilitators = JSON.parse(JSON.stringify(this.facilitators));
+                        this.facilitatorsFilter = facilitators.filter(function (item) {
+                            return item.name.indexOf(value) !== -1;
                         });
+                        if(this.facilitatorsFilter.length > 0){
+                            this.executingTack.facilitator_id =this.facilitatorsFilter[0]['id'];
+                        }
                     }
                 }