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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-06-17 14:28:21 +08:00
commit 5722cf09e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/lists/product/ProductLists.php
View File

@ -113,7 +113,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
if($M_store_id){
$where[]=['store_id','=',$M_store_id];
$data = StoreBranchProduct::where($this->searchWhere)->where($where)
->field(['id', 'product_id','cate_id','store_name','batch', 'cost','store_id','price', 'bar_code','image','sales','store_info','delete_time','unit'])
->field(['id', 'product_id','cate_id','store_name', 'cost','store_id','price', 'bar_code','image','sales','store_info','delete_time','unit','batch'])
->limit($this->limitOffset, $this->limitLength)
->with(['className','unitName'])
->order($this->sortOrder)
@ -122,7 +122,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
}else{
$data = StoreBranchProduct::where($this->searchWhere)->where($where)
->field(['id', 'product_id','cate_id','store_name','batch','cost', 'store_id','price', 'bar_code','image','sales','store_info','delete_time','unit'])
->field(['id', 'product_id','cate_id','store_name','cost', 'store_id','price', 'bar_code','image','sales','store_info','delete_time','unit','batch'])
->limit($this->limitOffset, $this->limitLength)
->with(['className','unitName'])
->order($this->sortOrder)