规格价格隐藏

app/Http/Controllers/Admin/GoodsController.php

@@ -532,20 +532,20 @@ class GoodsController extends Controller
     {
         $this->validate($request, [
             'propsName' => 'required',
-            'price' => 'required',
+            //'price' => 'required',
         ], [
             'propsName.required' => '规格不能为空',
-            'price.required' => '价格不能为空',
+            //'price.required' => '价格不能为空',
         ]);
         $id = (int)$request->input('id');
         $goods_id = (int)$request->input('goods_id');
         $data = array();
         $data['propsName'] = $request->input('propsName');
-        $data['price'] = $request->input('price');
-        $data['tagPrice'] = $request->input('tagPrice');
-        $data['referenceCost'] = $request->input('referenceCost');       
+        if($request->input('price') > 0) $data['price'] = $request->input('price');
+        if($request->input('tagPrice') > 0) $data['tagPrice'] = $request->input('tagPrice');
+        if($request->input('referenceCost') > 0) $data['referenceCost'] = $request->input('referenceCost');       
         $data['is_weigh'] = (int)$request->input('is_weigh');
-        $data['outPrice'] = $request->input('outPrice');
+        if($request->input('outPrice') > 0) $data['outPrice'] = $request->input('outPrice');
        
         DB::beginTransaction();
         try{
@@ -558,14 +558,14 @@ class GoodsController extends Controller
                 $erpArr['skuId'] = $sku->erpSkuId;               
                 if($data['is_weigh'] == 1){
                     $erpArr['propsName'] = str_replace('【按半斤称重】', '', $sku->propsName).'【按半斤称重】';
-                    $erpArr['price'] = round( $sku->price/2, 2 );
-                    $erpArr['tagPrice'] = round( $sku->tagPrice/2, 2 );
-                    $erpArr['referenceCost'] = round( $sku->referenceCost/2, 2 );
+                    if($request->input('price') > 0) $erpArr['price'] = round( $sku->price/2, 2 );
+                    if($request->input('tagPrice') > 0) $erpArr['tagPrice'] = round( $sku->tagPrice/2, 2 );
+                    if($request->input('referenceCost') > 0) $erpArr['referenceCost'] = round( $sku->referenceCost/2, 2 );
                 }else{
                     $erpArr['propsName'] = str_replace('【按半斤称重】', '', $sku->propsName);
-                    $erpArr['price'] = $sku->price;
-                    $erpArr['tagPrice'] = $sku->tagPrice;
-                    $erpArr['referenceCost'] = $sku->referenceCost;
+                    if($request->input('price') > 0) $erpArr['price'] = $sku->price;
+                    if($request->input('tagPrice') > 0) $erpArr['tagPrice'] = $sku->tagPrice;
+                    if($request->input('referenceCost') > 0) $erpArr['referenceCost'] = $sku->referenceCost;
                 }
                 
                 $erp_up = Order::mjErpSkuUpdate($erpArr);
@@ -579,7 +579,7 @@ class GoodsController extends Controller
                 $shopArr['goodsCode'] = $sku->goodsCode;
                 $shopArr['outerCode'] = $sku->id;
                 $shopArr['propsName'] = $sku->propsName;
-                $shopArr['price'] = $erpArr['price'];
+                if($request->input('price') > 0) $shopArr['price'] = $erpArr['price'];
 
                 $sku_up = Order::mjSkuUpdate($shopArr);
                 if( $sku_up == false ){

resources/views/goods/edit.blade.php

@@ -55,7 +55,7 @@
                     已有规格：</label>
                     <div id = 'goods_o' class="formControls col-xs-6 col-sm-6">
                         @foreach( $sku_list as $sku )
-                        <p id='sku{{$sku["id"]}}'><font style='font-weight:bold;'>规格:</font>{{$sku['propsName']}} &nbsp;<font style='font-weight:bold;'>售价:</font>{{$sku['price']}}; </p>
+                        <p id='sku{{$sku["id"]}}'><font style='font-weight:bold;'>规格:</font>{{$sku['propsName']}}; &nbsp; </p>
                         @endforeach
                     </div>
 

resources/views/goods/index.blade.php

@@ -50,14 +50,14 @@
                         <td class="text-c">{{$a['productCode']}}</td>
                         <td class="text-c">
                             @foreach($a['sku_list'] as $item)
-                                规格:{{$item['propsName']}}&nbsp;&nbsp; @if($item['is_weigh']==1)【称重商品】 @endif <br>
+                                规格:{{$item['propsName']}}&nbsp;&nbsp;  库存:{{$item['quantity']}}  @if($item['is_weigh']==1)【称重商品】 @endif <br>
                             @endforeach
                         </td>
                         <td class="text-c">{{$a['description']}}</td>
                         <td class="text-c">@if($a['is_del']==1) 已下架 @else 已上架 @endif</td>
                         <td class="text-c">{{$a['createTime']}}</td>
                         <td class="f-14 product-brand-manage">
-                            <!--a style="text-decoration:none" onClick='admin_edit("编辑","{{$a['id']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a-->
+                            <a style="text-decoration:none" onClick='admin_edit("编辑","{{$a['id']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a>
                             <a style="text-decoration:none" onClick='sku_edit("规格管理","{{$a['id']}}")' href="javascript:;" title="规格管理"><span class="btn btn-primary radius">规格管理</span></a>
                              
                              @if($a['is_del']==0)

resources/views/goods/skuedit.blade.php

@@ -24,28 +24,28 @@
                 <label class="form-label col-xs-4 col-sm-2">
                     售价：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <input type="text" class="input-text" value="{{$sku['price']}}" placeholder="" name="price">
+                    <input type="text" class="input-text" value="" placeholder="" name="price">
                 </div>
             </div>
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
                     吊牌价：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <input type="text" class="input-text" value="{{$sku['tagPrice']}}" placeholder="" name="tagPrice">
+                    <input type="text" class="input-text" value="" placeholder="" name="tagPrice">
                 </div>
             </div>
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
                     分销商价格：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <input type="text" class="input-text" value="{{$sku['outPrice']}}" placeholder="" name="outPrice">
+                    <input type="text" class="input-text" value="" placeholder="" name="outPrice">
                 </div>
             </div>
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
                     参考成本：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <input type="text" class="input-text" value="{{$sku['referenceCost']}}" placeholder="" name="referenceCost">
+                    <input type="text" class="input-text" value="" placeholder="" name="referenceCost">
                 </div>
             </div>
             <div class="row cl">

resources/views/goods/skulist.blade.php

@@ -41,7 +41,7 @@
                         <td class="text-c">{{$a['quantity']}}</td>
                         <td class="text-c">@if($a['is_del']==1) 已禁用 @else 已启用 @endif</td>
                         <td class="text-c">{{$a['createTime']}}</td>
-                        <td class="f-14 product-brand-manage"><!--a style="text-decoration:none" onClick='admin_edit("编辑","{{$a['id']}}","{{$a['goodsCode']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a-->
+                        <td class="f-14 product-brand-manage"><a style="text-decoration:none" onClick='admin_edit("编辑","{{$a['id']}}","{{$a['goodsCode']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a>
                          @if($a['is_del']==0)
                          <a style="text-decoration:none" class="ml-5" onClick="admin_del(this, '{{$a['id']}}')" href="javascript:;" title="禁用"><span class="btn btn-danger radius">禁用</span></a>
                          @elseif($a['is_del']==1)