mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#366) from dev into main

Browse Source 
Reviewed-on: #366
This commit is contained in:
mkm 2024-11-27 14:15:39 +08:00
commit b6271c0f7f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/lists/warehouse_product/WarehouseProductLists.php
View File

@ -73,7 +73,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
} }
} }
return WarehouseProduct::where($this->searchWhere) return WarehouseProduct::where($this->searchWhere)
->field(['id', 'pay_type','oid','admin_id','supplier_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'purchase', 'cost', 'total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time','is_pay']) ->field(['id', 'code','pay_type','oid','admin_id','supplier_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'purchase', 'cost', 'total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time','is_pay'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->withTrashed() ->withTrashed()
@ -185,6 +185,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
'supplier_name' => '供应商', 'supplier_name' => '供应商',
'store_name' => '商品名称', 'store_name' => '商品名称',
'financial_pm_name' => '出入库', 'financial_pm_name' => '出入库',
'code' => '入库单',
'batch' => '批次', 'batch' => '批次',
'nums' => '数量', 'nums' => '数量',
'manufacture' => '生产日期', 'manufacture' => '生产日期',
@ -204,6 +205,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
'store_info' => '规格', 'store_info' => '规格',
'unit_name' => '单位', 'unit_name' => '单位',
'financial_pm_name' => '出入库', 'financial_pm_name' => '出入库',
'code' => '出库单',
'system_store_name' => '门店', 'system_store_name' => '门店',
'nums' => '数量', 'nums' => '数量',
'purchase' => '供货价', 'purchase' => '供货价',