Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit f5a552b9 by mushishixian
Options

fix

parent 53652d51
Inline Side-by-side
Showing with 23 additions and 19 deletions
app/Http/Transformers/SupplierTransformer.php
......@@ -125,7 +125,7 @@ class SupplierTransformer
$supplier['last_update_name'] = $log['admin_name'] ?: '无';
$supplier['last_update_time'] = empty($supplier['last_update_time']) ? date('Y-m-d H:i:s',
$log['add_time']) : '无';
$supplier['has_certification'] = array_get(config('fixed.CertificationStatus'),
$supplier['has_certification_name'] = array_get(config('fixed.CertificationStatus'),
$supplier['has_certification'], '');
$supplier['sku_tag_name'] = array_get(config('field.SkuTag'), $supplier['sku_tag'], '无');
$supplier['sku_mode_name'] = array_get(config('field.SkuMode'), $supplier['sku_mode'], '无');
......
resources/views/web/SupplierDetail.blade.php
......@@ -41,9 +41,9 @@
</div>
<div class="layui-col-md2">
合作类型 ：
@if (mb_strlen($supplier['stockup_type_name'])>15)
@if (mb_strlen($supplier['stockup_type_name'])>12)
<span title="{{$supplier['stockup_type_name']}}">
{{mb_substr($supplier['stockup_type_name'],0,15)}}...
{{mb_substr($supplier['stockup_type_name'],0,12)}}...
</span>
@else
{{$supplier['stockup_type_name']}}
......@@ -236,7 +236,7 @@
等级 ：{{$supplier['level']?:'无'}}
</div>
<div class="layui-col-md3">
认证 ：{{$supplier['has_certification']?:'无'}}
认证 ：{{$supplier['has_certification_name']?:'未设置'}}
</div>
</div>
<div class="layui-row">
......@@ -300,7 +300,7 @@
<div class="layui-col-md2">
最近修改人 ：{{$supplier['last_update_name']}}
</div>
<div class="layui-col-md2">
<div class="layui-col-md3">
最近修改时间 ：{{$supplier['last_update_time']}}
</div>
</div>
......
resources/views/web/UpdateSupplier.blade.php
......@@ -50,9 +50,9 @@
</div>
<div class="layui-col-md2">
合作类型 ：
@if (mb_strlen($supplier['stockup_type_name'])>15)
@if (mb_strlen($supplier['stockup_type_name'])>12)
<span title="{{$supplier['stockup_type_name']}}">
{{mb_substr($supplier['stockup_type_name'],0,15)}}...
{{mb_substr($supplier['stockup_type_name'],0,12)}}...
</span>
@else
{{$supplier['stockup_type_name']}}
......@@ -128,24 +128,28 @@
<blockquote class="layui-elem-quote layui-text">
<b>系统设置</b>
</blockquote>
<div class="layui-row" style="margin-bottom: 10px">
<div class="layui-col-md2">
供应商编码 ：{{$supplier['supplier_code']}}
<div class="layui-row" style="margin-bottom: 10px;margin-left: 30px;">
<div class="layui-col-md3">
<div class="layui-inline">
供应商编码 ：&nbsp;{{$supplier['supplier_code']}}
</div>
</div>
<div class="layui-col-md3" style="margin-left: 18px">
供应商ID ：{{$supplier['supplier_id']}}
<div class="layui-col-md3" style="margin-left: 15px;">
<div class="layui-inline">
供应商ID ：&nbsp;&nbsp;{{$supplier['supplier_id']}}
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-md3">
<div class="layui-inline" style="margin-left: -40px">
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('trading_method','交易方式 : ',
isset($supplier)?$supplier['trading_method']:'',config('fixed.TradingMethod'),['required'=>false]) !!}
</div>
</div>
<div class="layui-col-md3">
<div class="layui-inline" style="margin-left: -150px">
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('pay_type','付款方式 : ',
isset($supplier)?$supplier['pay_type']:'',config('fixed.SupplierPayType'),['required'=>false]) !!}
......@@ -211,7 +215,7 @@
<div class="layui-col-md2">
最近修改人：{{$supplier['last_update_name']}}
</div>
<div class="layui-col-md2">
<div class="layui-col-md3">
最近修改时间：{{$supplier['last_update_time']}}
</div>
</div>
......@@ -232,11 +236,11 @@
</div>
</div>
<div class="layui-tab-item" @if(request()->get('tab')=='sku_ruler') layui-show @endif">
@include('web.supplier.SkuRuler')
</div>
<div class="layui-tab-item">内容5</div>
@include('web.supplier.SkuRuler')
</div>
<div class="layui-tab-item">内容5</div>
</div>
</div>
</form>
</div>
</form>
</div>
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