运输管理-懒加载读取BUG

包裹统计-order新增owner_id引起的二义性BUG

app/Services/PackageStatisticsService.php

@@ -20,10 +20,10 @@ Class PackageStatisticsService
     private function conditionQuery(array $params){
         $ownerIds = app('UserService')->getPermittingOwnerIds(auth()->user());
         $query = DB::table('order_packages')->select(DB::raw('COUNT(*) AS count'))
-            ->whereIn('owner_id',$ownerIds)
+            ->whereIn('order_packages.owner_id',$ownerIds)
             ->whereNotNull('logistic_id')
             ->leftJoin('orders','order_packages.order_id','orders.id')
-                ->selectRaw('owner_id,logistic_id');
+                ->selectRaw('orders.owner_id,logistic_id');
 
         $columnQueryRules=[
             'created_at_start' => ['alias' => 'created_at','startDate' => ":00"],
@@ -31,7 +31,7 @@ Class PackageStatisticsService
             'logistic_id' => ['multi' => ','],
             'owner_id' => ['multi' => ','],
         ];
-        $query = $query->groupBy('owner_id','logistic_id');
+        $query = $query->groupBy('order_packages.owner_id','logistic_id');
         return app(QueryService::class)->query($params,$query,$columnQueryRules);
     }
 

app/Services/WaybillService.php

@@ -21,7 +21,7 @@ Class WaybillService
      */
     private function conditionQuery(array $param){
         $waybills = Waybill::filterAuthorities()->with(['owner','logistic','originationCity','destinationCity.province',
-            'uploadFile','amountUnit','warehouseWeightUnit','carrierWeightUnit',
+            'uploadFile','amountUnit','warehouseWeightUnit','carrierWeightUnit','district',
             'warehouseWeightUnitOther','carrierWeightUnitOther','carType','uploadFile','waybillAuditLogs.user'])
             ->selectRaw('waybills.* ,waybill_on_tops.id top_id ,waybill_on_tops.remark,waybill_on_tops.updated_at top_update')
             ->leftJoin('waybill_on_tops','waybill_on_tops.waybill_id','=','waybills.id')

resources/views/waybill/index.blade.php

@@ -123,7 +123,8 @@
                     <td class="td-warm">@{{waybill.other_charge_remark}}</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')}}">
+                            <img v-if="waybill.url" :id="'img_'+waybill.id"  :src="waybill.url+'-thumbnail.'+waybill.suffix"
+                                    {{--:data-src="waybill.url+'-thumbnail.'+waybill.suffix" src="{{url('icon/img404-thumbnail.jpg')}}"--}}>
                             @can('运输管理-图片上传')<div v-if="!waybill.url">
                                 <input class="btn  btn-sm btn-outline-secondary" type="button" @click="certiimg(waybill.waybill_number)" value="上传照片 "/>
                                 <input type="file" @change="submitFile($event,waybill.waybill_number)" :id="waybill.waybill_number"
@@ -134,6 +135,9 @@
                     <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.province}}</td>
+                    <td class="td-cool text-muted">@{{waybill.city}}</td>
+                    <td class="td-cool text-muted">@{{waybill.district}}</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>
@@ -277,12 +281,12 @@
                         source_bill:'{{$waybill->source_bill}}',
                         wms_bill_number:'{{$waybill->wms_bill_number}}',
                         origination:'{{$waybill->origination}}',
-                        destination:'{{$waybill->destination_city_id}}'?
+                        destination:'{{--{{$waybill->destination_city_id}}'?
                             (('{{$waybill->destination}}'.indexOf('{{$waybill->destinationCity ? $waybill->destinationCity->name : ''}}')===-1 &&
                                 '{{$waybill->destination}}'.indexOf('{{$waybill->destinationCity ? ($waybill->destinationCity->province ? $waybill->destinationCity->province->name : '') : ''}}')===-1)?
                                 '{{($waybill->destinationCity ? ($waybill->destinationCity->province ? $waybill->destinationCity->province->name : '') : '').($waybill->destinationCity ? $waybill->destinationCity->name : '').($waybill->destination)}}'
                                 :'{{$waybill->destination}}')
-                            :'{{$waybill->destination}}',
+                            :'{{$waybill->destination}}--}}{{$waybill->destination}}',
                         recipient:'{{$waybill->recipient}}',
                         recipient_mobile:'{{$waybill->recipient_mobile}}',
                         charge:'{{$waybill->charge}}',
@@ -313,7 +317,9 @@
                         waybillAuditLogs:{!! $waybill->waybillAuditLogs !!},
                         btn_refresh_weight:'zoomIn',
                         remark:'{{$waybill->remark ?? ''}}',
-                        test:{!! $waybill !!}
+                        province:'{{$waybill->destinationCity->province->name ?? ''}}',
+                        city:'{{$waybill->destinationCity->name ?? ''}}',
+                        district:'{{$waybill->district->name ?? ''}}',
                     },
                     @endforeach
                 ],
@@ -347,6 +353,7 @@
                 count : Number('{{$waybills->count()}}'),
                 images:[],
                 batchUploadError:[],
+                size:0,
             },
             watch:{
                 checkData:{
@@ -368,11 +375,11 @@
                 $('#list').removeClass('d-none');
                 let waybill =  $('.table-header-layer-1')[1];
                 $('.top').css('min-width', waybill.scrollWidth);
-                this.imgs=Array.from(document.getElementById('list').querySelectorAll('img'));
+                /*this.imgs=Array.from(document.getElementById('list').querySelectorAll('img'));
                 this.lazy();
                 if (this.imgs&&this.imgs.length>0){
                     window.addEventListener('scroll',this.lazy)
-                }
+                }*/
                 let data=[
                     [
                         {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
@@ -422,6 +429,9 @@
                     {name:'recipient',value: '收件人', class:"td-cool"},
                     {name:'recipient_mobile',value: '收件人电话', class:"td-cool"},
                     {name:'origination',value: '始发地', class:"td-cool"},
+                    {name:'province',value: '省', class:"td-cool"},
+                    {name:'city',value: '市', class:"td-cool"},
+                    {name:'district',value: '区', class:"td-cool"},
                     {name:'destination',value: '目的地', class:"td-cool"},
                     {name:'carrier',value: '承运商', class:"td-cool"},
                     {name:'carrier_bill',value: '单号/车型', neglect: true, class:"td-cool"},
@@ -460,12 +470,12 @@
                 btnRefreshWeightZoomOut(waybill){
                     waybill.btn_refresh_weight='zoomOut'
                 },
-                lazy(){
+                /*lazy(){
                     //高度
                     let h=(window.innerWidth)+(document.documentElement.scrollTop || document.body.scrollTop);
                     this.imgs.forEach((img,i)=>{
                         let src = img.getAttribute('data-src');
-                        if ((h>this.getElementToPageTop(img)) && src){
+                        if ((h>this.getElementToPageTop(img)-500) && src){
                             let t = new Image();
                             t.src = src;
                             if (t.complete) {
@@ -485,7 +495,7 @@
                         return this.getElementToPageTop(el.parentElement) + el.offsetTop
                     }
                     return el.offsetTop
-                },
+                },*/
                 waybillAudit(id,waybill_number){
                     if(!confirm('确定要通过“'+waybill_number+'”的审核吗？')){return};
                     let _this=this;
@@ -980,6 +990,7 @@
                     for(let i=0;i<images.length;i++){
                         images[i]['src'] = window.URL.createObjectURL(images[i]);
                         this.images.push(images[i]);
+                        this.size += images[i].size;
                     }
                 },
                 //删除图片
@@ -988,11 +999,15 @@
                 },
                 //上传图片
                 batchUploadImages(){
+                    window.tempTip.setDuration(3000);
                     if (this.images.length<1){
-                        window.tempTip.setDuration(3000);
                         window.tempTip.show("未选择图片");
                         return;
                     }
+                    if (this.size > 10485760){
+                        window.tempTip.show("上传图片超出10MB，请分开上传");
+                        return;
+                    }
                     let formData = new FormData();
                     this.images.forEach(image=>{
                         formData.append("images[]",image);
@@ -1019,6 +1034,7 @@
                                         return true;
                                     }
                                 });
+                                this.size = 0;
                             });
                             this.$forceUpdate();
                             window.tempTip.cancelWaitingTip();