商品

application/approve/controller/Goods.php

@@ -61,7 +61,15 @@ class Goods extends Controller
             ->when($goods_name,function ($query) use($goods_name){
                 $query->where('goods_name','like','%'.$goods_name.'%');
             })
-            ->with(['goodsStock'])
+            ->with([
+                'goodsCategoryOne'=>function($query){
+                    $query->field('id,name');
+                },
+                'goodsCategory'=>function($query){
+                    $query->field('id,name');
+                },
+                'goodsStock'
+            ])
             ->order('sort desc,id asc');
         self::init($data);
     }

application/approve/view/goods/index.html

@@ -40,13 +40,14 @@
             <td class='list-table-check-td think-checkbox'>
                 <input class="list-check-box" value='{$vo.id}' type='checkbox'>
             </td>
-            <td class='text-left nowrap'>{$vo.goods_category_first|default='--'} - {$vo.goods_category_id|default='--'}</td>
+            <td class='text-left nowrap'>{$vo.goods_category_one.name|default='--'} -
+                {$vo.goods_category.name|default='--'}</td>
             <td class='text-left nowrap'>{$vo.goods_no|default='--'}</td>
             <td class='text-left nowrap'>{$vo.goods_name|default='--'}</td>
             <td class='text-left nowrap'>{$vo.goods_brand|default='--'}</td>
             <td class='text-left nowrap'>
                 {foreach $vo.goods_stock as $k=>$v}
-                <p><span class="color-desc">{$v.name}</span><span>库存：{$v.stock}</span></p>
+                <p><span class="color-desc">{$v.name}</span><span> 库存：{$v.stock}</span></p>
                 {/foreach}
             </td>
             <td class='list-table-sort-td'>

application/approve/view/goods_category/form.html

@@ -12,7 +12,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label color-green font-w7">上级分类</label>
                 <div class="layui-input-block">
-                    <select class="layui-select" name="pid" required>
+                    <select class="layui-select" name="" disabled>
                         {foreach $cate_list as $k=>$v}
                         {eq name='vo.pid' value='$v.id.""'}
                         <option selected value="{$v.id}">{$v.name}</option>

application/common/model/Goods.php

@@ -2,6 +2,7 @@
 
 namespace app\common\model;
 
+use app\common\constant\CommonConstant;
 use think\Model;
 
 /**
@@ -24,6 +25,16 @@ class Goods extends Model
         return $this->hasMany(GoodsStock::class, 'goods_id', 'id');
     }
 
+    // 关联商品分类一级
+    public function goodsCategoryOne(){
+        return $this->belongsTo(GoodsCategory::class, 'goods_category_first', 'id')->where('is_deleted',CommonConstant::IS_DELETED_0);
+    }
+
+    // 关联商品分类
+    public function goodsCategory(){
+        return $this->belongsTo(GoodsCategory::class, 'goods_category_id', 'id')->where('is_deleted',CommonConstant::IS_DELETED_0);
+    }
+
 //    // 关联商品规格项 (商品列表)
 //    public function goodsSku()
 //    {