hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修正表单远程关联字段显示

Browse Source 
修正发货单物流信息无法填写
修正发货单直营物流信息无法填写
去掉没有使用的字段类型
This commit is contained in:
hawind
2021-02-25 02:26:58 +08:00
parent 1c5cfaf2b9
commit 98af69e9e4
18 changed files with 1419 additions and 1556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Product/Controllers/ProductController.php
+10 -8
View File
@@ -163,11 +163,12 @@ class ProductController extends DefaultController
$header['select'][] = 'product.weight';
$model->select($header['select']);
$q = $query['q'];
if ($q) {
$model->whereRaw("(product.code like '%$q%' or product.name like '%$q%' or product.spec like '%$q%' or product.barcode like '%$q%')");
}
if ($query['suggest']) {
if ($query['q']) {
$q = $query['q'];
$model->whereRaw("(product.code like '%$q%' or product.name like '%$q%' or product.spec like '%$q%' or product.barcode like '%$q%')");
}
$rows = $model->limit(15)->get();
$data = Grid::dataFilters($rows, $header, function($item) {
return $item;
@@ -245,11 +246,12 @@ class ProductController extends DefaultController
$model->select($header['select']);
$q = $query['q'];
if ($q) {
$model->whereRaw("(product.code like '%$q%' or product.name like '%$q%' or product.spec like '%$q%' or product.barcode like '%$q%')");
}
if ($query['suggest']) {
if ($query['q']) {
$q = $query['q'];
$model->whereRaw("(product.code like '%$q%' or product.name like '%$q%' or product.spec like '%$q%' or product.barcode like '%$q%')");
}
$rows = $model->limit(15)->get();
$data = Grid::dataFilters($rows, $header, function($item) {
return $item;