Merge branch 'master' into Haozi

app/Http/Controllers/WaybillsController.php

@@ -109,12 +109,12 @@ class WaybillsController extends Controller
             $waybills = $this->getWaybills();
             $waybills=$this->conditionQuery($request,$waybills);
             $carries = Carrier::get();
-            $owners = Owner::get();
+            $owners = Owner::filterAuthorities()->get();
             return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'']);
         } else {
             $waybills = $this->getWaybills()->paginate(50);
             $carries = Carrier::get();
-            $owners = Owner::get();
+            $owners = Owner::filterAuthorities()->get();
             return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'']);
         }
     }
@@ -128,12 +128,12 @@ class WaybillsController extends Controller
 
             $waybills=$this->conditionQuery($request,$waybills);
             $carries = Carrier::get();
-            $owners = Owner::get();
+            $owners = Owner::filterAuthorities()->get();
             return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'ZF']);
         } else {
             $waybills = $this->getWaybills()->where('type','直发车')->paginate(50);
             $carries = Carrier::get();
-            $owners = Owner::get();
+            $owners = Owner::filterAuthorities()->get();
             return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'ZF']);
 
         }
@@ -147,12 +147,12 @@ class WaybillsController extends Controller
 
             $waybills=$this->conditionQuery($request,$waybills);
             $carries = Carrier::get();
-            $owners = Owner::get();
+            $owners = Owner::filterAuthorities()->get();
             return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'ZX']);
         } else {
             $waybills = $this->getWaybills()->where('type','专线')->paginate(50);
             $carries = Carrier::get();
-            $owners = Owner::get();
+            $owners = Owner::filterAuthorities()->get();
             return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'ZX']);
 
         }

laravel-echo-server.lock

@@ -0,0 +1,3 @@
+{
+	"process": 13028
+}

resources/sass/layout.scss

@@ -46,47 +46,47 @@ table.waybill-table{
         }
     }
     th{
-        &.td-bill{
+        &.td-warm{
             background: #af7651;
         }
-        &.td-transit{
+        &.td-cool{
             background: #aac7ea;
         }
-        &.td-fee{
+        &.td-helpful{
             background: #aaeace;
         }
     }
     td{
-        &.td-bill{
+        &.td-warm{
             background: rgb(246, 238, 232);
         }
-        &.td-transit{
+        &.td-cool{
             background: #e8eef6;
         }
-        &.td-fee{
+        &.td-helpful{
             background: #e7f5ee;
         }
     }
     tr:nth-child(even) td{
-        &.td-bill{
+        &.td-warm{
             background: rgb(248, 244, 241);
         }
-        &.td-transit{
+        &.td-cool{
             background: #edf0f5;
         }
-        &.td-fee{
+        &.td-helpful{
             background:  #ecf3ef;
         }
     }
     tr:hover{
         td{
-            &.td-bill{
+            &.td-warm{
                 background: rgb(246, 233, 220);
             }
-            &.td-transit{
+            &.td-cool{
                 background: #d3e0f1;
             }
-            &.td-fee{
+            &.td-helpful{
                 background: #d7f3e5;
             }
         }

resources/views/personnel/checking-in/missionAudit.blade.php

@@ -8,7 +8,7 @@
 
     <div class="container-fluid card" id="list">
         <div class="card-header">
-            <form method="GET" action="{{url('process/checking-in/missionAudit')}}" id="form">
+            <form method="GET" action="{{url('personnel/checking-in/missionAudit')}}" id="form">
                 <table class="table-sm text-nowrap table-bordered" style="width: 100%">
                     <tbody>
                     <tr v-if="isBeingFilterConditions">
@@ -32,9 +32,9 @@
                     <tr>
                         <td class="col" style="width: 220px">
                             <div class="col p-0">
-                                <input v-model="filterData.start_date" :class="filterData.start_date?'bg-warning':''" name="start_date" type="date" class="form-control-sm m-0 col-8 tooltipTarget" title="选择显示指定日期的开始时间" style="width: 130px">
+                                <input v-model="filterData.start_date" :class="filterData.start_date?'bg-warning':''" name="start_date" type="date" class="form-control-sm m-0 col-8 tooltipTarget" title="选择显示指定日期的开始时间" style="width: 130px" autocomplete="off">
                             </div>
-                            <input v-model="filterData.end_date" :class="filterData.end_date?'bg-warning':''" name="end_date" type="date" class="form-control-sm col-8 offset-md-0 mt-2 tooltipTarget" title="选择显示指定日期的结束时间" style="width: 130px">
+                            <input v-model="filterData.end_date" :class="filterData.end_date?'bg-warning':''" name="end_date" type="date" class="form-control-sm col-8 offset-md-0 mt-2 tooltipTarget" title="选择显示指定日期的结束时间" style="width: 130px" autocomplete="off">
                         </td>
                         <td style="width: 220px">
                             <input v-model="filterData.full_name" :class="filterData.full_name?'bg-warning':''" name="full_name" class="form-control-sm" type="text" placeholder="姓名">

resources/views/process/create.blade.php

@@ -54,7 +54,7 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,false)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,false)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
@@ -131,7 +131,7 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,true)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,true)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
@@ -306,7 +306,7 @@
                         });
                 },
                 //确定新增
-                confirmStore(wms_code,commodity_id,amount,is_full){
+                confirmStore(wms_code,commodity_id,amount,bill_type,is_full){
                     if (!commodity_id) {
                         tempTip.setDuration(2000);
                         tempTip.show("尚未选择商品！");
@@ -334,7 +334,7 @@
                         if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.is_full==!is_full)sign=false;
                     });
 
-                    if (!is_full && sign){
+                    if (bill_type==='入库单' && !is_full && sign){
                         _this.commodityIds.push(processContentTemp.commodity_id+"_"+!is_full);
                         processContentTemp['is_full']=true;
                         _this.processContents.unshift(processContentTemp);

resources/views/process/edit.blade.php

@@ -58,7 +58,7 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,false)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,false)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
@@ -135,7 +135,7 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,true)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,true)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
@@ -302,7 +302,7 @@
                         });
                 },
                 //确定新增
-                confirmStore(wms_code,commodity_id,amount,is_full){
+                confirmStore(wms_code,commodity_id,amount,bill_type,is_full){
                     if (!commodity_id) {
                         tempTip.setDuration(2000);
                         tempTip.show("尚未选择商品！");
@@ -325,8 +325,7 @@
                         }
                         if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.is_full==!is_full)sign=false;
                     });
-
-                    if (!is_full && sign){
+                    if (bill_type==='入库单' && !is_full && sign){
                         _this.commodityIds.push(processContentTemp.commodity_id+"_"+!is_full);
                         processContentTemp['is_full']=true;
                         _this.processContents.unshift(processContentTemp);

resources/views/waybill/index.blade.php

@@ -137,9 +137,9 @@
             <table class="table table-striped table-sm table-bordered table-hover text-nowrap waybill-table" style="background: #fff;">
                 <tr>
                     <th class="table-header-layer-1" :colspan="elementCount('th.td-operation')"></th>
-                    <th class="table-header-layer-1" :colspan="elementCount('th.td-bill')"><span class="fa fa-file-text-o"></span> 运单信息</th>
-                    <th class="table-header-layer-1" :colspan="elementCount('th.td-transit')"><span class="fa fa-truck"></span> 运输信息</th>
-                    <th class="table-header-layer-1" :colspan="elementCount('th.td-fee')"><span class="fa fa-rmb"></span> 费用信息
+                    <th class="table-header-layer-1" :colspan="elementCount('th.td-warm')"><span class="fa fa-file-text-o"></span> 运单信息</th>
+                    <th class="table-header-layer-1" :colspan="elementCount('th.td-cool')"><span class="fa fa-truck"></span> 运输信息</th>
+                    <th class="table-header-layer-1" :colspan="elementCount('th.td-helpful')"><span class="fa fa-rmb"></span> 费用信息
                     @can('运输管理-删除')
                     <th class="table-header-layer-1" :colspan="elementCount('th.td-delete')"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
                     @endcan
@@ -155,32 +155,32 @@
                     @endcan
                     <th class="td-operation">置顶</th>
                     <th class="td-operation">状态</th>
-                    <th class="td-bill">ID</th>
-                    <th class="td-bill">创建时间</th>
-                    <th class="td-bill">运单类型</th>
-                    <th class="td-bill">货主</th>
-                    <th class="td-bill">上游单号</th>
-                    <th class="td-bill">WMS订单号</th>
-                    <th class="td-bill">运单号</th>
-                    @can('运输管理-图片上传')<th class="td-bill">照片</th>@endcan
-                    <th class="td-transit">收件人</th>
-                    <th class="td-transit">收件人电话</th>
-                    <th class="td-transit">始发地</th>
-                    <th class="td-transit">目的地</th>
-                    <th class="td-transit">承运商</th>
-                    <th class="td-transit">单号/车型</th>
-                    <th class="td-transit">仓库计抛</th>
-                    <th class="td-transit">承运商计抛</th>
-                    <th class="td-transit">仓库计重</th>
-                    <th class="td-transit">承运商计重</th>
-                    <th class="td-transit">计数</th>
-                    <th class="td-transit">里程</th>
+                    <th class="td-warm">ID</th>
+                    <th class="td-warm">创建时间</th>
+                    <th class="td-warm">运单类型</th>
+                    <th class="td-warm">货主</th>
+                    <th class="td-warm">上游单号</th>
+                    <th class="td-warm">WMS订单号</th>
+                    <th class="td-warm">运单号</th>
+                    @can('运输管理-图片上传')<th class="td-warm">照片</th>@endcan
+                    <th class="td-cool">收件人</th>
+                    <th class="td-cool">收件人电话</th>
+                    <th class="td-cool">始发地</th>
+                    <th class="td-cool">目的地</th>
+                    <th class="td-cool">承运商</th>
+                    <th class="td-cool">单号/车型</th>
+                    <th class="td-cool">仓库计抛</th>
+                    <th class="td-cool">承运商计抛</th>
+                    <th class="td-cool">仓库计重</th>
+                    <th class="td-cool">承运商计重</th>
+                    <th class="td-cool">计数</th>
+                    <th class="td-cool">里程</th>
                     @can('运输管理-运费')
-                    <th class="td-fee">运费</th>
+                    <th class="td-helpful">运费</th>
                     @endcan
-                    <th class="td-fee">提货费</th>
-                    <th class="td-fee">其他费用</th>
-                    <th class="td-fee">调度备注</th>
+                    <th class="td-helpful">提货费</th>
+                    <th class="td-helpful">其他费用</th>
+                    <th class="td-helpful">调度备注</th>
                     @can('运输管理-删除')
                         <th class="td-delete">操作</th>
                     @endcan
@@ -228,7 +228,7 @@
                         </span>
                     </td>
                     @can('运输管理-置顶')
-                    <td class="td-bill text-muted" v-if="waybill.remark" style="height: 55px">
+                    <td class="td-warm text-muted" v-if="waybill.remark" style="height: 55px">
                         <button type="button" class="btn btn-sm btn-outline-danger " @click="cancelOnTop($event)" :data_id="waybill.id"  style="opacity: 0.75">取消</button>
                     </td>
                     <td v-else>
@@ -236,17 +236,17 @@
                     </td>
                     @endcan
                     <td :class="[waybill.status=='已审核'?'text-success':'']">@{{waybill.status}}</td>
-                    <td class="td-bill text-muted toptd" >
+                    <td class="td-warm text-muted toptd" >
                         <div v-if="waybill.remark" class="bg-light-yellow  text-danger top"  data-toggle="tooltip" style="opacity: 0.1;position: absolute;z-index: 1"
                         >置顶备注：@{{  waybill.remark }}</div>
                         @{{waybill.id}}</td>
-                    <td class="td-bill text-muted">@{{waybill.created_at}}</td>
-                    <td class="td-bill">@{{waybill.type}} <span class="badge badge-sm bg-warning" v-if="waybill.collect_fee">到付</span></td>
-                    <td class="td-bill">@{{waybill.owner}}</td>
-                    <td class="td-bill toptd" :title="waybill.remark? '置顶备注：'+waybill.remark :''">@{{waybill.source_bill}}</td>
-                    <td class="td-bill" >@{{waybill.wms_bill_number}}</td>
-                    <td class="td-bill">@{{waybill.waybill_number}}</td>
-                    <td class="td-bill">
+                    <td class="td-warm text-muted">@{{waybill.created_at}}</td>
+                    <td class="td-warm">@{{waybill.type}} <span class="badge badge-sm bg-warning" v-if="waybill.collect_fee">到付</span></td>
+                    <td class="td-warm">@{{waybill.owner}}</td>
+                    <td class="td-warm toptd" :title="waybill.remark? '置顶备注：'+waybill.remark :''">@{{waybill.source_bill}}</td>
+                    <td class="td-warm" >@{{waybill.wms_bill_number}}</td>
+                    <td class="td-warm">@{{waybill.waybill_number}}</td>
+                    <td class="td-warm">
                         <div align="center" @mouseleave="removeCommonImg('common_img_'+waybill.id)" @mouseenter="commonImg('img_'+waybill.id,waybill.url,waybill.suffix)">
                             <img v-if="waybill.url" :id="'img_'+waybill.id"  :data-src="waybill.url+'-thumbnail.'+waybill.suffix" src="{{url('icon/img404-thumbnail.jpg')}}">
                             @can('运输管理-图片上传')<div v-if="!waybill.url">
@@ -256,46 +256,46 @@
                             </div>@endcan
                         </div>
                     </td>
-                    <td class="td-transit">@{{waybill.recipient}}</td>
-                    <td class="td-transit">@{{waybill.recipient_mobile}}</td>
-                    <td class="td-transit text-muted">@{{waybill.origination}}</td>
-                    <td class="td-transit text-muted">@{{waybill.destination}}</td>
-                    <td class="td-transit">@{{waybill.carrier}}</td>
-                    <td class="td-transit"><span v-if="waybill.type==='专线'">@{{waybill.carrier_bill}}</span>
+                    <td class="td-cool">@{{waybill.recipient}}</td>
+                    <td class="td-cool">@{{waybill.recipient_mobile}}</td>
+                    <td class="td-cool text-muted">@{{waybill.origination}}</td>
+                    <td class="td-cool text-muted">@{{waybill.destination}}</td>
+                    <td class="td-cool">@{{waybill.carrier}}</td>
+                    <td class="td-cool"><span v-if="waybill.type==='专线'">@{{waybill.carrier_bill}}</span>
                         <span v-if="waybill.type==='直发车'">
                             <span v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span></span></td>
-                    <td class="td-transit"><span v-if="waybill.warehouse_weight">@{{waybill.warehouse_weight|filterZero}}  @{{waybill.warehouse_weight_unit}}</span></td>
-                    <td class="td-transit"><span v-if="waybill.carrier_weight">@{{waybill.carrier_weight|filterZero}}  @{{waybill.carrier_weight_unit}}</span></td>
-                    <td class="td-transit"><span v-if="waybill.warehouse_weight_other">@{{waybill.warehouse_weight_other|filterZero}}  @{{waybill.warehouse_weight_unit_other}}</span></td>
-                    <td class="td-transit"><span v-if="waybill.carrier_weight_other">@{{waybill.carrier_weight_other|filterZero}}  @{{waybill.carrier_weight_unit_other}}</span></td>
-                    <td class="td-transit"><span v-if="waybill.amount">@{{waybill.amount}} @{{waybill.amount_unit_name }}</span></td>
-                    <td class="td-transit">@{{waybill.mileage|km}} </td>
+                    <td class="td-cool"><span v-if="waybill.warehouse_weight">@{{waybill.warehouse_weight|filterZero}}  @{{waybill.warehouse_weight_unit}}</span></td>
+                    <td class="td-cool"><span v-if="waybill.carrier_weight">@{{waybill.carrier_weight|filterZero}}  @{{waybill.carrier_weight_unit}}</span></td>
+                    <td class="td-cool"><span v-if="waybill.warehouse_weight_other">@{{waybill.warehouse_weight_other|filterZero}}  @{{waybill.warehouse_weight_unit_other}}</span></td>
+                    <td class="td-cool"><span v-if="waybill.carrier_weight_other">@{{waybill.carrier_weight_other|filterZero}}  @{{waybill.carrier_weight_unit_other}}</span></td>
+                    <td class="td-cool"><span v-if="waybill.amount">@{{waybill.amount}} @{{waybill.amount_unit_name }}</span></td>
+                    <td class="td-cool">@{{waybill.mileage|km}} </td>
                     @can('运输管理-可见费用项')
                         {{--zengjun start--}}
                         @can('运输管理-运费')
-{{--                            <td class="td-fee" v-if="waybill.type==='专线'">--}}
+{{--                            <td class="td-helpful" v-if="waybill.type==='专线'">--}}
 
 {{--                            </td>--}}
-{{--                            <td class="td-fee" v-else-if="waybill.type==='直发车'">--}}
+{{--                            <td class="td-helpful" v-else-if="waybill.type==='直发车'">--}}
 {{--                                <span v-if="waybill.fee" class="btn-sm btn-outline-secondary btn" @click="waybillFeeCheck($event)" :data_id="waybill.id">@{{waybill.fee}}</span>--}}
 {{--                                <input type="number" class="form-control form-control-sm"  @blur="updateWaybillFee($event)" v-model="waybill.fee" :data_id="waybill.id" style="min-width:85px;display: none">--}}
 {{--                                <input v-else type="number" class="form-control form-control-sm">--}}
 {{--                            </td>--}}
-                            <td class="td-fee" v-if="waybill.fee">
+                            <td class="td-helpful" v-if="waybill.fee">
                                 <span v-if="waybill.type==='专线'"></span>
                                 <span v-else-if="waybill.fee" class="btn-sm btn-outline-secondary btn" @click="waybillFeeCheck($event)" :data_id="waybill.id">@{{waybill.fee|money}}</span>
                                 <input type="number" class="form-control form-control-sm"  @blur="updateWaybillFee($event)" :value="waybill.fee" :data_id="waybill.id" style="min-width:85px;display: none">
                             </td>
-                            <td class="td-fee" v-else>
+                            <td class="td-helpful" v-else>
                                 <span v-if="waybill.type==='专线'"></span>
                                 <input v-else type="number" class="form-control form-control-sm" @blur="addWaybillFee($event)" onfocus="$(this).css('width','85px')" :value="waybill.fee" :data_id="waybill.id" >
                             </td>
                         @endcan
                         {{--zengjun end--}}
-                        <td class="td-fee">@{{waybill.pick_up_fee}}</td>
-                        <td class="td-fee">@{{waybill.other_fee}}</td>
+                        <td class="td-helpful">@{{waybill.pick_up_fee}}</td>
+                        <td class="td-helpful">@{{waybill.other_fee}}</td>
                     @endcan
-                    <td class="td-fee">@{{waybill.dispatch_remark}}</td>
+                    <td class="td-helpful">@{{waybill.dispatch_remark}}</td>
                     @can('运输管理-删除')
                         <td class="td-operation">
                             <button type="button" class="btn btn-outline-danger btn-sm" @click="waybillDestroy(waybill.id,waybill.waybill_number)">删</button>