样式与字样调整，搜索人事分组BUG

app/Console/Commands/InventoryDailyLoggingOwner.php

@@ -48,7 +48,7 @@ class InventoryDailyLoggingOwner extends Command
         if ($let == 0)return;
         //拼接SQL,SELECT仅取指定字段
         $sql = "SELECT INV_LOT.customerid,INV_LOT.sku,INV_LOT.qty,BAS_SKU.skulength,
-                BAS_SKU.skuwidth,BAS_SKU.skuhigh,BAS_SKU.cube,BAS_SKU.descr_c,BAS_SKU.alternate_sku1 
+                BAS_SKU.skuwidth,BAS_SKU.skuhigh,BAS_SKU.cube,BAS_SKU.descr_c,BAS_SKU.alternate_sku1
                 FROM INV_LOT
                 LEFT JOIN BAS_SKU ON INV_LOT.sku = BAS_SKU.sku AND INV_LOT.customerid = BAS_SKU.customerid
                 WHERE INV_LOT.customerid IN (";

app/Console/Kernel.php

@@ -18,6 +18,8 @@ class Kernel extends ConsoleKernel
         \App\Console\Commands\LogExpireDelete::class,
         \App\Console\Commands\MakeServiceCommand::class,
         \App\Console\Commands\FluxOrderFix::class,
+        \App\Console\Commands\InventoryDailyLoggingOwner::class,
+
     ];
 
     /**

app/Services/InventoryService.php

@@ -3,20 +3,9 @@
 
 namespace App\Services;
 
-use App\Commodity;
-use App\Http\Controllers\Controller;
-use App\Inventory;
-use App\inventoryDailyLog;
+use App\InventoryDailyLog;
 use App\InventoryDailyLoggingOwner;
-use App\InventoryMission;
-use App\OraccleBasCustomer;
-use App\OracleActTransactionLog;
-use App\Owner;
 use App\Services\common\QueryService;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Gate;
 
 class InventoryService
 {

app/Services/common/QueryService.php

@@ -23,7 +23,7 @@ Class QueryService
         if ($tableName) $tableName .= ".";
         foreach ($params as $param => $value){
             if ($param === 'paginate' || $param === 'page')continue;
-            if (!$value || $columnQueryRules[$param] ?? false)continue;
+            if (!$value || ($columnQueryRules[$param] ?? false))continue;
             $query = $query->where($tableName.$param,$value);
         }
         //rules: alias timeLimit startDate endDate like multi

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;
 
 /**
@@ -61991,4 +61991,4 @@ module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sa
 
 /***/ })
 
-/******/ });
+/******/ });

resources/views/inventory/statement/dailyLog.blade.php

@@ -37,7 +37,7 @@
                     <a class="dropdown-item" @click="dailyLogExport(true)" href="javascript:">导出所有页</a>
                 </div>
             </span>
-            @can('库存管理-库存体积-管理监听货主')<button class="btn btn-outline-info btn-sm tooltipTarget" @click="openModal()">添加监听货主</button>@endcan
+            @can('库存管理-库存体积-管理监听货主')<button class="btn btn-outline-info btn-sm tooltipTarget mt-1" @click="openModal()">管理监听货主</button>@endcan
         </div>
         <div class="card-body pt-1">
             <label for="all" class="d-none" id="cloneCheckAll">

resources/views/order/issue/index.blade.php

@@ -595,7 +595,7 @@
                         data: this.orderIssueType
                     },
                     {name: 'logistic_indemnity_money', type: 'input', tip: '承运商赔偿金额', placeholder: '承运商赔偿金额'},
-                    {name: 'is_handle', type: 'checkbox', tip: '是否已处理', data: [{name: 'ture', value: '已处理'}]},
+                    {name: 'is_handle', type: 'checkbox', tip: '是否已处理', data: [{name: 'ture', value: '已解决'}]},
                 ], [
                     {name: 'created_at_end', type: 'dateTime', tip: '订单结束日期'},
                     {name: 'consignee_name', type: 'input', tip: '收货人名称', placeholder: '收货人名称'},

routes/web.php

@@ -318,7 +318,7 @@ Route::group(['prefix'=>'inventory'],function (){
     //复盘查询盘点记录
     Route::post('searchStockInventoryRecord','InventoryAccountController@searchStockInventoryRecord');
 
-
+    Route::post('statement/dailyLog/addLoggingOwner','InventoryController@addLoggingOwner');
 });
 
 /**