goods

application/admin/controller/Goods.php

@@ -63,8 +63,7 @@ class Goods extends Backend
                     ->paginate($limit);
 
             foreach ($list as $row) {
-                $row->visible(['id','name','brand','amount','amount_kill','is_hot','is_kill','is_down','num_sell','num_stock','create_time','update_time']);
-                
+
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());
@@ -86,7 +85,7 @@ class Goods extends Backend
     public function edit($ids = null)
     {
         if($this->request->isGet()){
-            $row=$this->model->findOrFail($ids);
+            $row=$this->model->with(['sku'=>function($q){}])->findOrFail($ids);
             $this->assign('row',$row);
             return $this->fetch('add');
         }else{

application/admin/view/goods/index.html

@@ -8,7 +8,7 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" data-area='["100%","100%"]' class="btn btn-success btn-add {:$auth->check('goods/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('goods/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('goods/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('goods/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
 
                         <div class="dropdown btn-group {:$auth->check('goods/multi')?'':'hide'}">
@@ -17,7 +17,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>
@@ -32,3 +32,6 @@
         </div>
     </div>
 </div>
+<script>
+    var goodsStatus={:json_encode($status)};
+</script>

application/common/model/Goods.php

@@ -19,7 +19,7 @@ class Goods Extends Model
     protected $autoWriteTimestamp = true;
 
     public function sku(){
-        return $this->hasMany(GoodsSku::class);
+        return $this->hasMany(GoodsSku::class)->where('is_del',0);
     }
     public function detail(){
         return $this->hasMany(GoodsDetail::class);

application/common/model/GoodsSku.php

@@ -2,6 +2,7 @@
 
 namespace app\common\model;
 
+use think\db\Query;
 use think\Model;
 
 /**
@@ -9,4 +10,7 @@ use think\Model;
  */
 class GoodsSku Extends Model
 {
+    public function scopeShow(Query $query){
+        $query->where('is_del',0);
+    }
 }

public/assets/js/backend/goods.js

@@ -22,24 +22,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                searchFormVisible:true,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'name', title: __('Name')},
                         {field: 'brand', title: __('Brand')},
-                        {field: 'amount', title: __('Amount'), operate:'BETWEEN'},
-                        {field: 'amount_kill', title: __('Amount_kill'), operate: 'LIKE'},
-                        {field: 'is_hot', title: __('Is_hot')},
-                        {field: 'is_kill', title: __('Is_kill')},
-                        {field: 'is_down', title: __('Is_down')},
+                        {field: 'amount', title: __('售价'), operate:'BETWEEN'},
+                        {field: 'amount_kill', title: __('Amount_kill'), operate:'BETWEEN'},
+                        {field: 'is_hot', title: __('Is_hot'),formatter:Table.api.formatter.label,searchList:{0:'否',1:'是'}},
+                        {field: 'is_kill', title: __('Is_kill'),formatter:Table.api.formatter.label,searchList:{0:'否',1:'是'}},
+                        {field: 'status', title: __('状态'),formatter:Table.api.formatter.label,searchList:goodsStatus},
                         {field: 'num_sell', title: __('Num_sell')},
-                        {field: 'num_stock', title: __('Num_stock')},
-                        {field: 'create_time', title: __('Create_time')},
-                        {field: 'update_time', title: __('Update_time')},
+                        {field: 'create_time', title: __('Create_time'),formatter: Table.api.formatter.datetime,addClass:'datetimerange'},
+                        {field: 'update_time', title: __('Update_time'),formatter: Table.api.formatter.datetime,addClass:'datetimerange'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
-                ]
+                ],
+                onLoadSuccess(){
+                    setTimeout(()=>{
+                        $('.btn-editone').attr('data-area','["100%","100%"]')
+                    },1000)
+                }
             });
 
             // 为表格绑定事件