一些小页面需求改进

app/Http/Controllers/DeliveryAppointmentController.php

@@ -10,7 +10,6 @@ use App\Events\DeliveryAppointmentEvent;
 use App\Imports\AppointmentDetail;
 use App\Jobs\DeliveryAppointmentCheck;
 use App\Logistic;
-use App\Services\common\ExportService;
 use App\Store;
 use App\Warehouse;
 use Carbon\Carbon;

app/Services/DeliveryAppointmentService.php

@@ -29,7 +29,14 @@ class DeliveryAppointmentService
     public function query(array $params)
     {
         $owners = app("UserService")->getPermittingOwnerIds(Auth::user());
-        return app(QueryService::class)->query($params,DeliveryAppointment::query(),[
+        $query = DeliveryAppointment::query();
+        if ($params["appointment_number"] ?? false){
+            $query->whereHas("cars",function ($query)use($params){
+                $query->where("appointment_number",'like',$params["appointment_number"]."%");
+            });
+            unset($params["appointment_number"]);
+        }
+        return app(QueryService::class)->query($params,$query,[
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'appointment_date_start' => ['alias' => 'appointment_date' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],

app/Services/OrderService.php

@@ -283,7 +283,7 @@ SQL;
                 $sql .= ")";
             }
         }
-        if ($edisendflag2) $sql .= " and edisendflag2 like '" . $edisendflag2 . "%'";
+        if ($edisendflag2) $sql .= " AND (edisendflag2 = '" . $edisendflag2 . "' OR edisendflag3 = '".$edisendflag2."')";
         if ($edisendflag) $sql .= " and edisendflag like '" . $edisendflag . "%'";
         if ($manualflag) $sql .= " and manualflag = '" . $manualflag . "'";
         if ($soreference1) {

resources/views/rejected/search/general.blade.php

@@ -88,14 +88,14 @@
                         @can('退货管理-查询-客户定义-爱奇艺')<td class="text-muted"><span>@{{rejectedBill.common_01}}</span></td>@endcan
                         @cannot('退货管理-客户不可见')<td class="text-muted">@{{rejectedBill.common_02}}</td>@endcannot
                         <td class="text-muted"><span>@{{rejectedBill.goods_amount}}</span></td>
-                        <td style="min-width: 1000px">
-                            <div class="w-100 " :class="rejectedBill.items.length>1 ? 'up' : ''" :id="'rejected-'+rejectedBill.id" >
-                                <div class="row" v-for="(item,i) in rejectedBill.items">
+                        <td style="min-width: 1500px">
+                            <div class="w-100 p-0" :class="rejectedBill.items.length>1 ? 'up' : ''" :id="'rejected-'+rejectedBill.id" >
+                                <div class="row m-0 p-0" v-for="(item,i) in rejectedBill.items">
                                     @if($ownerSign)
                                     <div class="col-1 border border-1" style="overflow-x: hidden">
                                         <div class="w-100 text-overflow-warp-200 warp-min-200">@{{ (item.barcode && item.barcode.commodity) ? item.barcode.commodity.sku : '' }}</div>
                                     </div>@endif
-                                        <div title="双击展开全部" @dblclick="barcodeGoodsLength(item)"  class="border border-1" :class="item.barcode_goods_show_long ? 'col-auto' : 'col-1'" style="overflow-x: hidden">
+                                        <div title="双击展开全部" @dblclick="barcodeGoodsLength(item)"  class="border border-1" :class="item.barcode_goods_show_long ? 'col-auto' : '@if($ownerSign)col-2 @else col-3 @endif'" style="overflow-x: hidden">
                                             <div class="w-100 text-overflow-warp-200 warp-min-200">@{{item.barcode_goods}}</div>
                                         </div>
                                     <div title="双击展开全部" @dblclick="goodsNameLength(item)"  class="border border-1" :class="item.name_goods_show_long ? 'col-auto' : 'col-1'" style="overflow-x: hidden">
@@ -106,7 +106,7 @@
                                     <div class="col-1 border border-1">@{{item.batch_number}}</div>
                                     <div class="col-1 border border-1">@{{item.made_at}}</div>
                                     <div class="col-1 border border-1">@{{item.validity_at}}</div>
-                                    <div class="col-2 border border-1">
+                                    <div class="col-1 border border-1">
                                         <div align="center" @mouseleave="removeCommonImg('common_img_'+item.id)" @mouseenter="commonImg('img_'+item.id,item.upload_files)">
                                             <div :id="'img_'+item.id">
                                                 <img v-for="uploadFile in item.upload_files"  :src="imgPrefix+uploadFile.url+'-thumbnail.'+uploadFile.type">
@@ -260,14 +260,15 @@
                         @cannot('退货管理-客户不可见'){name:'common_02',value: '重量'},@endcannot
                     {name:'goods_amount',value: '商品总数'},
                     {name:"goods",type:"multi",title:"商品信息",rows:[
-                            {value:"商品条码",col:"2"},
+                            @if($ownerSign){value:"商品SKU",col:"1"},{value:"商品条码",col:"2"},
+                                @else{value:"商品条码",col:"3"},@endif
                             {value:"商品名称",col:"1"},
                             {value:"数量",col:"1"},
                             {value:"质量",col:"1"},
                             {value:"批次号",col:"1"},
                             {value:"产期",col:"1"},
                             {value:"效期",col:"1"},
-                            {value:"照片",col:"2"},
+                            {value:"照片",col:"1"},
                             {value:"备注",col:"2"},
                         ]},
                     {name:'remark',value: '退单备注'},

resources/views/store/deliveryAppointment/list.blade.php

@@ -227,6 +227,7 @@
                             {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                                 placeholder:['货主','定位或多选货主'],data:this.owners},
                             {name:'status',type:'select',placeholder: '状态',data:this.status},
+                            {name:'appointment_number',type:'input',tip:'预约号，模糊搜索可在左侧增加百分号(%)进行',placeholder:'预约号'},
                         ],
                         [
                             {name:'created_at_end',type:'dateTime',tip:"选择显示创建日期的结束时间"},