Merge branch 'zhouzhendong' of ssh://was.baoshi56.com:10022/var/git/bswas into zhouzhendong

 Conflicts:

	app/Http/Controllers/PackageController.php

app/Http/Controllers/PackageController.php

@@ -19,12 +19,6 @@ use Illuminate\Support\Facades\Validator;
 
 class PackageController extends Controller
 {
-
-    public function __construct()
-    {
-        app()->singleton('PackageService',PackageService::class);
-    }
-
     public function index(Request $request,OwnerService $ownerService)
     {
         if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }

app/Providers/AppServiceProvider.php

@@ -32,6 +32,7 @@ use App\Services\OrderPackageCommoditiesService;
 use App\Services\OrderTrackingService;
 use App\Services\OwnerReportService;
 use App\Services\OwnerService;
+use App\Services\PackageService;
 use App\Services\PackageStatisticsService;
 use App\Services\ProcessesContentService;
 use App\Services\ProcessMethodService;
@@ -135,6 +136,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('StoreService',StoreService::class);
         app()->singleton('WarehouseService',WarehouseService::class);
         app()->singleton('StoreItemService',StoreItemService::class);
+        app()->singleton('PackageService',PackageService::class);
 
         $this->loadingOrderModuleService();
         $this->loadingBasedModuleService();

app/Services/InventoryDailyLogService.php

@@ -26,7 +26,7 @@ Class InventoryDailyLogService
     }
 
     public function getSql(array $params){
-        return $this->conditionQuery($params)->selectRaw("inventory_daily_logs.created_at,inventory_daily_logs.amount,inventory_daily_logs.volumn_occupied,inventory_daily_logs.gross_weight")
+        return $this->conditionQuery($params)->selectRaw("inventory_daily_logs.id,inventory_daily_logs.created_at,inventory_daily_logs.amount,inventory_daily_logs.volumn_occupied,inventory_daily_logs.gross_weight")
             ->leftJoin('owners','inventory_daily_logs.owner_id','owners.id')
                 ->selectRaw('owners.name owner_name')
             ->leftJoin('depositories','inventory_daily_logs.depository_id','depositories.id')
@@ -34,7 +34,8 @@ Class InventoryDailyLogService
             ->leftJoin('commodities','inventory_daily_logs.commodity_id','commodities.id')
                 ->selectRaw('commodities.name commodity_name,commodities.sku commodity_sku,commodities.length commodity_length,commodities.width commodity_width,commodities.height commodity_height,commodities.volumn commodity_volumn')
             ->leftJoin('commodity_barcodes','commodity_barcodes.commodity_id','commodities.id')
-                ->selectRaw('commodity_barcodes.code commodity_barcode_code')
+                ->selectRaw("GROUP_CONCAT(commodity_barcodes.code) commodity_barcode_code")
+            ->groupBy('id')
             ->sql();
     }
 

app/Services/PackageService.php

@@ -21,8 +21,11 @@ Class PackageService
             });
             unset($params['owner_id']);
         }
+        if ($params['logistic_number'] ?? false){
+            $packages->whereIn('logistic_number',array_values(array_filter(preg_split('/[,， ]+/is', $params['logistic_number']))));
+            unset($params["logistic_number"]);
+        }
         $columnQueryRules=[
-            'logistic_number' => ['like' => ''],
             'batch_number' => ['like' => ''],
             'created_at_start' => ['alias' => 'created_at','startDate' => " 00:00:00"],
             'created_at_end' => ['alias' => 'created_at','endDate' => " 23:59:59"],

public/js/app.js

@@ -2330,7 +2330,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
   false;
 
 /**
@@ -86472,8 +86472,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),
@@ -86489,4 +86489,4 @@ module.exports = __webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\sas
 
 /***/ })
 
-/******/ });
+/******/ });

resources/js/queryForm/queryForm.js

@@ -563,12 +563,41 @@ const query = function getQueryForm(data) {
 
         let ul_div = $("<div class='pl-0 tooltipTarget' style='position: absolute;left: 100px;top:25px; max-height: 150px; overflow-y: scroll; border: 1px solid rgb(221, 221, 221); border-radius: 5px; text-align: center; transform: scale(0.9);z-index:1' tabindex='1'></div>");
         let ul = $("<ul name='" + condition.name + "' class='list-group pl-0 m-0 p-0 bg-white' style='list-style-type: none;width: 150px;top:35px; z-index: 100' ></ul>");
+        let check = $("<input type = 'checkbox' style='z-index:101;position:fixed;top:0;right: 0;border:1px green' >");
+        let isMouseenterCheckBox = false;
 
-        select_div.append(input).append(ul_div.append(ul));
+        select_div.append(input).append(ul_div.append(ul).append(check));
         div.append(select).append(label).append(select_div);
 
         fillMultipleSelectOption(ul, condition.data, condition.name);
 
+        check.click(function () {
+            _data[condition.name].value = [];
+            _data[condition.name].select = [];
+            if (check[0].checked === true){
+                condition.data.forEach(function (data) {
+                    _data[condition.name].value.push(data.name);
+                    if (_data[condition.name].select) _data[condition.name].select.push(data.name);
+                    else _data[condition.name].select = [data.name];
+                });
+            }else{
+                let dom = {
+                    name: condition.name,
+                    type: 'select_multiple_select',
+                    value: [],
+                    select:[],
+                };
+                modifyData(dom);
+            }
+            redenerUl(ul);
+        });
+        check.mouseleave(()=>{
+            isMouseenterCheckBox = false;
+        });
+        check.mouseenter(()=>{
+            isMouseenterCheckBox = true;
+        });
+
         input.bind('input propertychange', function () {
             let value = this.value;
             if (value === '') {
@@ -586,7 +615,7 @@ const query = function getQueryForm(data) {
 
             fillMultipleSelectOption(ul, select_data, condition.name);
             redenerUl(ul);
-        })
+        });
 
         select.change(function () {
             let dom = {
@@ -602,7 +631,7 @@ const query = function getQueryForm(data) {
         })
         input.blur(function () {
             setTimeout(function () {
-                if (!ul_div.is(':focus')) {
+                if (!ul_div.is(':focus') && !check.is(':focus')) {
                     ul_div.hide();
                 }
             }, 100);
@@ -614,7 +643,9 @@ const query = function getQueryForm(data) {
             ul_div.hide();
         })
         ul_div.blur(function () {
-            ul_div.hide();
+            if (!isMouseenterCheckBox){
+                ul_div.hide();
+            }
         })
         ul_div.hide();
         ul_div.mouseleave(function () {
@@ -624,10 +655,12 @@ const query = function getQueryForm(data) {
             }
         });
         ul_div.mouseenter(function () {
-            setTimeout(function () {
-                ul_div.attr("title","移出多选区域即可自动提交");
-                ul_div.tooltip('show');
-            },1000);
+            if(_data[condition.name].value.length>0){
+                setTimeout(()=> {
+                    ul_div.attr("title","移出多选区域即可自动提交");
+                    ul_div.tooltip('show');
+                },1000);
+            }
         });
         return div;
     }

resources/views/weight/package/index.blade.php

@@ -101,7 +101,7 @@
                     {name:'weighed_at_start',type:'dateTime',tip:'选择显示称重日期的起始时间'},
                     {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                         placeholder:['货主','定位或多选货主'],data:_this.owners},
-                    {name:'logistic_number',type:'input',tip:'快递单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'快递单号'},
+                    {name:'logistic_number',type:'input',tip:'可支持多快递单号，糊模查找需要在左边打上%符号',placeholder:'快递单号'},
                 ],[
                     {name:'created_at_end',type:'dateTime',tip:'选择显示创建日期的结束时间'},
                     {name:'weighed_at_end',type:'dateTime',tip:'选择显示称重日期的结束时间'},