sunhao 5 years ago
parent
commit
d5643c64c6

+ 1 - 1
app/Http/Controllers/Admin/GoodsController.php

@@ -380,7 +380,7 @@ class GoodsController extends Controller
380 380
      */
381 381
     public function searchSkus(Request $request){
382 382
         $name = trim($request->input('name'));
383
-        $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price', 'gs.is_weigh')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('goods.name', 'like', '%'.$name.'%')->where('goods.is_del', 0)->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
383
+        $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price', 'gs.is_weigh', 'gs.quantity', 'gs.is_white')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('goods.name', 'like', '%'.$name.'%')->where('goods.is_del', 0)->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
384 384
         $result = json_decode(json_encode($result), true);
385 385
 
386 386
         if(empty($result)) exit('0');

+ 6 - 1
resources/views/order/ordercreate.blade.php

@@ -567,7 +567,12 @@
567 567
                             if(item.is_weigh==1){
568 568
                                 weigh_t = '【按半斤称重】';
569 569
                             }
570
-                            str += '<li onclick=\'add_goods('+item.goods_id+','+item.sku_id+',"'+item.name+'","'+item.propsName+'",'+item.price+','+item.is_weigh+');\'>'+ item.name+'【    规格:'+item.propsName+'&nbsp;&nbsp; 价格:¥'+item.price +' 】'+weigh_t+'<\/li>' 
570
+                            if(item.is_white == 0 && item.quantity <= 0){
571
+                                weigh_t += '<font color="red">【库存不足】<\/font>';
572
+                                str += '<li>'+ item.name+'【    规格:'+item.propsName+'&nbsp;&nbsp; 价格:¥'+item.price +' 】'+weigh_t+'<\/li>'
573
+                            }else{
574
+                                str += '<li onclick=\'add_goods('+item.goods_id+','+item.sku_id+',"'+item.name+'","'+item.propsName+'",'+item.price+','+item.is_weigh+');\'>'+ item.name+'【    规格:'+item.propsName+'&nbsp;&nbsp; 价格:¥'+item.price +' 】'+weigh_t+'<\/li>' 
575
+                            }
571 576
                             // '<p onclick=\'add_goods('+item.goods_id+','+item.sku_id+',"'+item.name+'","'+item.propsName+'",'+item.price+');\'>'+ item.name+' '+item.propsName+' ¥'+item.price +'<\/p>';
572 577
                         }
573 578
                         document.getElementById('good_sku').innerHTML = str;