切换导航条
此项目
正在载入...
登录
李忠强
/
temporaryfood
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
何书鹏
3 years ago
提交
187f08bd1f51cdef577869cec8dfdf191b1856f7
1 个父辈
a66bfb5f
商品管理显示库存
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
5 行增加
和
2 行删除
application/admin/controller/litestore/Litestoregoods.php
public/assets/js/backend/litestore/litestoregoods.js
public/assets/js/backend/litestore/litestoreorder.js
application/admin/controller/litestore/Litestoregoods.php
查看文件 @
187f08b
...
...
@@ -2,6 +2,7 @@
namespace
app\admin\controller\litestore
;
use
app\admin\model\litestore\Litestoregoodsspec
;
use
app\common\controller\Backend
;
use
app\admin\model\litestore\Litestorespec
as
SpecModel
;
use
app\admin\model\litestore\Litestorespecvalue
as
SpecValueModel
;
...
...
@@ -82,6 +83,7 @@ class Litestoregoods extends Backend
$row
->
getRelation
(
'category'
)
->
visible
([
'name'
]);
$row
->
getRelation
(
'activity'
)
->
visible
([
'name'
]);
// $row->getRelation('freight')->visible(['name']);
$row
->
stock_num
=
Litestoregoodsspec
::
where
(
'goods_id'
,
$row
[
'goods_id'
])
->
sum
(
'stock_num'
);
}
$list
=
collection
(
$list
)
->
toArray
();
$result
=
array
(
"total"
=>
$total
,
"rows"
=>
$list
);
...
...
public/assets/js/backend/litestore/litestoregoods.js
查看文件 @
187f08b
...
...
@@ -36,7 +36,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','template','litestoreg
{
field
:
'image'
,
title
:
__
(
'Image'
),
formatter
:
Table
.
api
.
formatter
.
image
},
{
field
:
'images'
,
title
:
__
(
'Images'
),
formatter
:
Table
.
api
.
formatter
.
images
},
{
field
:
'spec_type'
,
title
:
__
(
'Spec_type'
),
searchList
:
{
"10"
:
__
(
'Spec_type 10'
),
"20"
:
__
(
'Spec_type 20'
)},
formatter
:
Table
.
api
.
formatter
.
normal
},
{
field
:
'deduct_stock_type'
,
title
:
__
(
'Deduct_stock_type'
),
searchList
:
{
"10"
:
__
(
'Deduct_stock_type 10'
),
"20"
:
__
(
'Deduct_stock_type 20'
)},
formatter
:
Table
.
api
.
formatter
.
normal
},
{
field
:
'stock_num'
,
title
:
__
(
'库存'
),
operate
:
false
},
// {field: 'deduct_stock_type', title: __('Deduct_stock_type'), searchList: {"10":__('Deduct_stock_type 10'),"20":__('Deduct_stock_type 20')}, formatter: Table.api.formatter.normal},
// {field: 'freight.name', title: __('Freight.name')},
// {field: 'sales_initial', title: __('Sales_initial')},
{
field
:
'sales_actual'
,
title
:
__
(
'Sales_actual'
)},
...
...
public/assets/js/backend/litestore/litestoreorder.js
查看文件 @
187f08b
...
...
@@ -38,7 +38,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{
field
:
'order_status'
,
title
:
__
(
'Order_status'
),
searchList
:
{
"10"
:
__
(
'Order_status 10'
),
"20"
:
__
(
'Order_status 20'
),
"30"
:
__
(
'Order_status 30'
)},
formatter
:
Controller
.
api
.
status_formatter
},
{
field
:
'updatetime'
,
title
:
__
(
'Updatetime'
),
operate
:
false
,
addclass
:
'datetimerange'
,
formatter
:
Table
.
api
.
formatter
.
datetime
},
{
field
:
'address.name'
,
title
:
__
(
'Address.name'
),
operate
:
false
},
{
field
:
'address.name'
,
title
:
__
(
'Address.name'
),
operate
:
'LIKE'
},
{
field
:
'rider.nickname'
,
title
:
__
(
'选择配送骑手'
),
...
...
请
注册
或
登录
后发表评论