byzhenyu 1 年之前
父節點
當前提交
3b4d8838d7

+ 1 - 2
application/approve/controller/GoodsStockLog.php

@@ -51,8 +51,7 @@ class GoodsStockLog extends Controller
         $this->goods_id = $goods_id = input('goods_id') ?:0;
         $this->title = '商品入库记录';
 
-        $data = model::field('goods_id', true)
-            ->where('goods_id',$goods_id)
+        $data = model::where('goods_id',$goods_id)
             ->order('id desc');
         self::_init($data);
     }

+ 1 - 2
application/approve/controller/GoodsUseLog.php

@@ -51,8 +51,7 @@ class GoodsUseLog extends Controller
         $this->goods_id = $goods_id = input('goods_id') ?:0;
         $this->title = '商品出库记录';
 
-        $data = model::field('goods_id', true)
-            ->where('goods_id',$goods_id)
+        $data = model::where('goods_id',$goods_id)
             ->order('id desc');
         self::_init($data);
     }

+ 3 - 2
application/approve/view/goods/index.html

@@ -48,8 +48,9 @@
             <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></p>
-                <p><span>库存:{$v.stock} </span><span> 冻结库存:{$v.freeze_stock}</span></p>
+                <p>规格ID:{$v.id|default='--'}</p>
+                <p class="color-desc">规格名称:{$v.name}</p>
+                <p class="color-desc"><span>库存:{$v.stock} </span><span> 冻结库存:{$v.freeze_stock}</span></p>
                 {/foreach}
             </td>
             <td class='list-table-sort-td'>

+ 1 - 1
application/approve/view/goods_stock_log/index.html

@@ -25,7 +25,7 @@
         <tr>
             <td class='text-left nowrap'>
                 <p>规格ID:{$vo.stock_id|default='--'}</p>
-                <p class="color-desc">规格名称: {$vo.name|default='--'}</p>
+                <p class="color-desc">规格名称:{$vo.name|default='--'}</p>
             </td>
             <td class='text-left nowrap'>
                 {$vo.price|default='--'}

+ 0 - 8
public/.htaccess

@@ -1,8 +0,0 @@
-<IfModule mod_rewrite.c>
-  Options +FollowSymlinks -Multiviews
-  RewriteEngine On
-
-  RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L]
-</IfModule>