Commit fed3ad90 by 杨树贤

页面修改优化

parent 6d44f15a
...@@ -156,6 +156,7 @@ class SupplierController extends Controller ...@@ -156,6 +156,7 @@ class SupplierController extends Controller
'value' => $key, 'value' => $key,
]; ];
} }
$this->data['nation'] = NationModel::where('nation_id', $supplier['nation_id'])->first();
$this->data['sku_optional_batch_for_xm_select'] = $skuOptionalBatchXmSelect; $this->data['sku_optional_batch_for_xm_select'] = $skuOptionalBatchXmSelect;
return $this->view('供应商详情'); return $this->view('供应商详情');
......
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="layui-form-item" id="receipt_nation_id_div"> <div class="layui-form-item" id="receipt_nation_id_div">
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('receipt_nation_id','国家/地区 : ',0, {!! $statusPresenter->render('receipt_nation_id','国家/地区 : ',36,
$nationList,['required'=>true]) !!} $nationList,['required'=>true]) !!}
</div> </div>
</div> </div>
......
...@@ -161,10 +161,13 @@ ...@@ -161,10 +161,13 @@
<div class="layui-col-md2"> <div class="layui-col-md2">
<span class="required_field">*</span> 所在区域 :{{$supplier['region_name']}} <span class="required_field">*</span> 所在区域 :{{$supplier['region_name']}}
</div> </div>
<div class="layui-col-md3"> @if ($supplier['region']==2)
@if ($supplier['region']==2) <div class="layui-col-md3">
所属省市 :{{$province_city}} 所属省市 :{{$province_city}}
@endif </div>
@endif
<div class="layui-col-md3">
所在国家/地区 :{{!empty($nation['name_cn'])?$nation['name_cn'].'('.$nation['international_code'].')':'未设置'}}
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
...@@ -509,13 +512,13 @@ ...@@ -509,13 +512,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-inline"> <div style="display: flex;align-items: center;">
<label class="layui-form-label">SKU上架有效期 : </label> <div style="width: 130px">
<div class="layui-input-inline"> <label class="layui-form-label">SKU上架有效期 : </label>
现货 : {{$supplier['cp_time_day'] == -1 ? '无限制' : $supplier['cp_time_day']}}天
</div> </div>
<div class="layui-input-inline"> <div style="display: flex;flex-direction: column;">
期货 : {{$supplier['futures_cp_time_day'] == -1 ? '无限制' : $supplier['futures_cp_time_day']}}天 <div>现货 : {{$supplier['cp_time_day'] == -1 ? '无限制' : $supplier['cp_time_day']}}天</div>
<div>期货 : {{$supplier['futures_cp_time_day'] == -1 ? '无限制' : $supplier['futures_cp_time_day']}}天</div>
</div> </div>
</div> </div>
<br> <br>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment