修改服务商未装卸队名称

resources/views/maintenance/facilitator/_table.blade.php

@@ -1,7 +1,7 @@
 <table class="table table-sm table-striped table-bordered table-hover card-body p-0 m-0">
     <tr class="text-center">
         <th>序号</th>
-        <th>服务商名称</th>
+        <th>装卸队名称</th>
         <th>创建时间</th>
         <th>操作</th>
     </tr>
@@ -12,11 +12,11 @@
             <td>@{{ facilitator.name }}</td>
             <td>@{{ facilitator.created_at }}</td>
             <td>
-                @can('服务商-编辑')
+                @can('装卸队-编辑')
                 <button class="btn btn-sm btn-outline-primary" @click="showUpDateModal(true,index,facilitator)">编辑
                 @endcan
                 </button>
-                @can('服务商-删除')
+                @can('装卸队-删除')
                 <button class="btn btn-sm btn-outline-danger" @click="destroyFacilitator(facilitator,index)">删除</button>
                 @endcan
             </td>
@@ -26,7 +26,7 @@
         <tr>
             <td colspan="4">
                 <div class="alert alert-info text-lg-center">
-                    服务商数据为空
+                    装卸队数据为空
                 </div>
             </td>
         </tr>

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

@@ -3,7 +3,7 @@
         <th><input type="checkbox" class="form-check" name="selectAll" id="selectAll" @click="checkAll" ></th>
         <th>序号</th>
         <th>日期</th>
-        <th>服务商</th>
+        <th>装卸队</th>
         <th>数量</th>
         <th>单位</th>
         <th>单价</th>
@@ -25,7 +25,7 @@
         <tr>
             <td colspan="8">
                 <div class='alert alert-info text-lg-center' >
-                    服务商对账单数据为空
+                    装卸队对账单数据为空
                 </div>
             </td>
         </tr>

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

@@ -16,7 +16,7 @@
         <th class="td-cool">单位</th>
         <th class="td-cool">收入单价</th>
         <th class="td-cool">收入合计</th>
-        <th>服务商</th>
+        <th>装卸队</th>
         <th>数量</th>
         <th>单位</th>
         <th>支出单价</th>

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

@@ -4,6 +4,7 @@
         <th>序号</th>
         <th>日期</th>
         <th>客户名称</th>
+        <th>仓库</th>
         <th>作业名称</th>
         <th>入库单号</th>
         <th>数量</th>
@@ -20,7 +21,7 @@
             <td>
                 @{{index+1}}
                 <template v-if="dischargeTask.status===0">
-                    <span class="badge badge-pill badge-secondary">未指定服务商</span>
+                    <span class="badge badge-pill badge-secondary">未指定装卸队</span>
                 </template>
                 <template v-else-if="dischargeTask.status===1">
                     <span class="badge badge-pill badge-warning">任务已指定</span>
@@ -35,7 +36,16 @@
             <td>@{{ dischargeTask.created_at }}</td>
             <td>@{{ dischargeTask.owner ? dischargeTask.owner.name : '' }}</td>
             <td>
-                @can('运输管理-卸货-编辑')
+                @can('人事管理-卸货-编辑')
+                    <select :value="dischargeTask.warehouse_id" class="form-control form-control-sm" :disabled="dischargeTask.status>0" @change="updateCurrentTaskColumn(dischargeTask,index,'warehouse_id',$event)">
+                        <option v-for="(type,i) in warehouses" :value="type.id">@{{ type.name }}</option>
+                    </select>
+                @else
+                        @{{ dischargeTask.warehouse ? dischargeTask.warehouse.name : '' }}
+                @endcan
+            </td>
+            <td>
+                @can('人事管理-卸货-编辑')
                     <select :value="dischargeTask.type" class="form-control form-control-sm" :disabled="dischargeTask.status>0" @change="updateCurrentTaskColumn(dischargeTask,index,'type',$event)">
                         <option v-for="(type,i) in taskTypes" :value="type.name">@{{ type.value }}</option>
                     </select>
@@ -44,7 +54,7 @@
                 @endcan
             </td>
             <td>
-                @can('运输管理-卸货-编辑')
+                @can('人事管理-卸货-编辑')
                     <input type="text" :value="dischargeTask.numbers" class="form-control form-control-sm" :disabled="dischargeTask.status>0" @change="updateCurrentTaskColumn(dischargeTask,index,'numbers',$event)">
                 @else
                     @{{ dischargeTask.numbers }}
@@ -52,7 +62,7 @@
             </td>
             <td>@{{ dischargeTask.income_amount }}</td>
             <td>
-                @can('运输管理-卸货-编辑')
+                @can('人事管理-卸货-编辑')
                     <select  :value="dischargeTask.income_unit" class="form-control form-control-sm" :disabled="dischargeTask.status>0" @change="updateCurrentTaskColumn(dischargeTask,index,'income_unit',$event)">
                         <option v-for="(unit,i) in units" :value="unit.name" v-html="unit.value"></option>
                     </select>
@@ -63,7 +73,7 @@
             <td>@{{ dischargeTask.income_unit_price }}</td>
             <td>@{{ dischargeTask.income_total_cost }}</td>
             <td>
-                @can('运输管理-卸货-编辑')
+                @can('人事管理-卸货-编辑')
                     {{--  dischargeTask.status===3 完成时不可编辑状态 --}}
                     <select :value="dischargeTask.status" class="form-control form-control-sm" :disabled="dischargeTask.status===3" @change="updateCurrentTaskColumn(dischargeTask,index,'status',$event)">
                         <option v-for="(type,i) in status" :value="type.name" v-html="type.value" :disabled="dischargeTask.status > type.name"></option>
@@ -73,20 +83,20 @@
                 @endcan
             </td>
             <td>
-                @can('运输管理-卸货-编辑')
+                @can('人事管理-卸货-编辑')
                     <textarea class="form-control" cols="15" rows="2" :value="dischargeTask.income_remark" :disabled="dischargeTask.status>0" @change="updateCurrentTaskColumn(dischargeTask,index,'income_remark',$event)"></textarea>
                 @else
                     @{{ dischargeTask.income_remark }}
                 @endcan
             </td>
             <td>
-                @can('运输管理-卸货-编辑')
+                @can('人事管理-卸货-编辑')
                 <button class="btn btn-sm btn-outline-primary" @click="showExecutingTaskModal(index,true,dischargeTask)" v-show="dischargeTask.status===0">指定服务商</button>
                 @endcan
-                @can('运输管理-卸货-编辑')
+                @can('人事管理-卸货-编辑')
                 <button class="btn btn-sm btn-outline-primary" @click="showUpdateTaskModal(index,true,dischargeTask)" v-show="dischargeTask.status<=1">编辑</button>
                 @endcan
-                @can('运输管理-卸货-删除')
+                @can('人事管理-卸货-删除')
                 <button class="btn btn-sm btn-outline-danger" @click="deleteTask(index,dischargeTask)">删除</button>
                 @endcan
             </td>