Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit d065baa4 by mushishixian
Options

等级和认证

parent 1baeece6
Inline Side-by-side
Showing with 77 additions and 38 deletions
app/Http/Controllers/Api/SupplierApiController.php
...@@ -70,6 +70,9 @@ class SupplierApiController extends Controller ...@@ -70,6 +70,9 @@ class SupplierApiController extends Controller
'system_tags', 'system_tags',
'customer_tags', 'customer_tags',
'level',
'has_certification',
]; ];
public function Entrance(Request $request, $id) public function Entrance(Request $request, $id)
......
app/Http/Controllers/SupplierController.php
...@@ -5,10 +5,8 @@ namespace App\Http\Controllers; ...@@ -5,10 +5,8 @@ namespace App\Http\Controllers;
use App\Http\Services\LogService; use App\Http\Services\LogService;
use App\Http\Services\RegionService; use App\Http\Services\RegionService;
use App\Http\Services\SupplierAttachmentService; use App\Http\Services\SupplierAttachmentService;
use App\Http\Services\SupplierAuditService;
use App\Http\Services\SupplierService; use App\Http\Services\SupplierService;
use App\Http\Services\SupplierStatisticsService; use App\Http\Services\SupplierStatisticsService;
use App\Http\Services\SupplierTagService;
use App\Http\Transformers\LogTransformer; use App\Http\Transformers\LogTransformer;
use App\Http\Transformers\SupplierTransformer; use App\Http\Transformers\SupplierTransformer;
use App\Model\IntracodeModel; use App\Model\IntracodeModel;
......
app/Http/Services/SupplierTagService.php
...@@ -49,6 +49,9 @@ class SupplierTagService ...@@ -49,6 +49,9 @@ class SupplierTagService
//新增/修改标签和供应商id对应关系到标签系统 //新增/修改标签和供应商id对应关系到标签系统
public function saveTags($supplierId, $tagUse, $newTags, $oldTags) public function saveTags($supplierId, $tagUse, $newTags, $oldTags)
{ {
if ((!$newTags) && (!$oldTags)) {
return true;
}
$newTags = explode(',', $newTags); $newTags = explode(',', $newTags);
$oldTags = explode(',', $oldTags); $oldTags = explode(',', $oldTags);
//先区分哪些需要删除,哪些需要修改 //先区分哪些需要删除,哪些需要修改
...@@ -94,6 +97,10 @@ class SupplierTagService ...@@ -94,6 +97,10 @@ class SupplierTagService
] ]
]; ];
} }
//没有参数就直接跳过吧
if (empty($params)) {
return true;
}
$response = $this->client->post('/update', [ $response = $this->client->post('/update', [
RequestOptions::JSON => $params, RequestOptions::JSON => $params,
]); ]);
......
app/Http/Transformers/SupplierTransformer.php
...@@ -36,7 +36,7 @@ class SupplierTransformer ...@@ -36,7 +36,7 @@ class SupplierTransformer
$supplier['channel_username'] = $this->getChannelUserNames($supplier['channel_uid']); $supplier['channel_username'] = $this->getChannelUserNames($supplier['channel_uid']);
$supplier['purchase_username'] = array_get($users, $supplier['purchase_uid']); $supplier['purchase_username'] = array_get($users, $supplier['purchase_uid']);
$supplier['status_name'] = array_get(config('fixed.SupplierStatus'), $supplier['status']); $supplier['status_name'] = array_get(config('fixed.SupplierStatus'), $supplier['status']);
$supplier['region_name'] = array_get(config('fixed.Region'), $supplier['region'],'暂无'); $supplier['region_name'] = array_get(config('fixed.Region'), $supplier['region'], '暂无');
$supplier['contact_num'] = $this->getContactNum($supplier['supplier_id']); $supplier['contact_num'] = $this->getContactNum($supplier['supplier_id']);
$supplier['has_sku'] = $supplier['sku_num'] ? '是' : '否'; $supplier['has_sku'] = $supplier['sku_num'] ? '是' : '否';
$supplier['is_own'] = $supplier['create_uid'] == request()->user->userId ? "创建" : "指派"; $supplier['is_own'] = $supplier['create_uid'] == request()->user->userId ? "创建" : "指派";
...@@ -125,6 +125,8 @@ class SupplierTransformer ...@@ -125,6 +125,8 @@ class SupplierTransformer
$supplier['last_update_name'] = $log['admin_name'] ?: '无'; $supplier['last_update_name'] = $log['admin_name'] ?: '无';
$supplier['last_update_time'] = empty($supplier['last_update_time']) ? date('Y-m-d H:i:s', $supplier['last_update_time'] = empty($supplier['last_update_time']) ? date('Y-m-d H:i:s',
$log['add_time']) : '无'; $log['add_time']) : '无';
$supplier['has_certification'] = array_get(config('fixed.CertificationStatus'), $supplier['has_certification'],
'');
return $supplier; return $supplier;
} }
...@@ -235,7 +237,7 @@ class SupplierTransformer ...@@ -235,7 +237,7 @@ class SupplierTransformer
$attachment = []; $attachment = [];
$attachmentFields = config('field.AttachmentFields'); $attachmentFields = config('field.AttachmentFields');
foreach ($channel as $key=>$field) { foreach ($channel as $key => $field) {
if (in_array($key, $attachmentFields)) { if (in_array($key, $attachmentFields)) {
$attachment[$key] = $field; $attachment[$key] = $field;
unset($channel[$key]); unset($channel[$key]);
......
config/fixed.php
...@@ -229,4 +229,9 @@ return [ ...@@ -229,4 +229,9 @@ return [
'expire' => '七天后过期', 'expire' => '七天后过期',
'off_shelf' => '下架', 'off_shelf' => '下架',
], ],
'CertificationStatus' => [
-1 => '非认证',
1 => '认证',
]
]; ];
config/validate.php
...@@ -46,5 +46,7 @@ return [ ...@@ -46,5 +46,7 @@ return [
'return_consignee' => '退货收货人', 'return_consignee' => '退货收货人',
'system_tags' => '系统标签', 'system_tags' => '系统标签',
'customer_tags' => '自定义标签', 'customer_tags' => '自定义标签',
'level' => '等级',
'has_certification' => '认证',
] ]
]; ];
\ No newline at end of file
resources/views/web/SupplierDetail.blade.php
...@@ -155,7 +155,8 @@ ...@@ -155,7 +155,8 @@
<div class="layui-col-md12"> <div class="layui-col-md12">
{{array_get(config('fixed.FileNameMapping'),$key)}} : {{array_get(config('fixed.FileNameMapping'),$key)}} :
@foreach($item as $k=>$v) @foreach($item as $k=>$v)
<a href="{{$v['url']}}" style="color: dodgerblue" target="_blank">{{$v['file_name']}}</a> | <a href="{{$v['url']}}" style="color: dodgerblue"
target="_blank">{{$v['file_name']}}</a> |
@endforeach @endforeach
</div> </div>
@endif @endif
...@@ -188,6 +189,15 @@ ...@@ -188,6 +189,15 @@
<b>供应商标签</b> <b>供应商标签</b>
</blockquote> </blockquote>
<div class="layui-row"> <div class="layui-row">
<div class="layui-col-md2">
等级 ：{{$supplier['level']}}
</div>
<div class="layui-col-md3">
认证 ：{{$supplier['has_certification']}}
</div>
</div>
<div class="layui-row">
<div class="layui-col-md6"></div>
<div class="layui-col-md12"> <div class="layui-col-md12">
系统标签 ： 系统标签 ：
@foreach (explode(',',$supplier['system_tags']) as $tag) @foreach (explode(',',$supplier['system_tags']) as $tag)
......
resources/views/web/supplier/SupplierBase.blade.php
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
config('fixed.Region'),['required'=>true,'width'=>'150px']) !!} config('fixed.Region'),['required'=>true,'width'=>'150px']) !!}
</div> </div>
<div class="layui-col-md8"> <div class="layui-col-md8">
<div class="city-div" style="display: none"> <div class="city-div" style="display: none">
<label class="layui-form-label">选择省市 : </label> <label class="layui-form-label">选择省市 : </label>
<div class="city-selector" id="city-selector"></div> <div class="city-selector" id="city-selector"></div>
</div> </div>
...@@ -161,6 +161,18 @@ ...@@ -161,6 +161,18 @@
<b>供应商标签 : </b> <b>供应商标签 : </b>
</blockquote> </blockquote>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-col-md3">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('level','等级',!empty($supplier)?$supplier['level']:'',['A'=>'A','B'=>'B','C'=>'C','D'=>'D','E'=>'E'],['width'=>'150px']) !!}
</div>
<div class="layui-col-md3">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('has_certification','认证',!empty($supplier)?$supplier['has_certification']:'',[1=>'认证',-1=>'非认证'],['width'=>'150px']) !!}
</div>
<div class="layui-col-md6">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"> <label class="layui-form-label">
系统标签 : </label> 系统标签 : </label>
<div class="layui-input-block" style="margin-top: 15px"> <div class="layui-input-block" style="margin-top: 15px">
...@@ -174,7 +186,7 @@ ...@@ -174,7 +186,7 @@
<label class="layui-form-label"> <label class="layui-form-label">
自定义标签 : </label> 自定义标签 : </label>
<div class="layui-input-block" style="margin-top: 15px"> <div class="layui-input-block" style="margin-top: 15px">
<input name="customer_tags" id="customer_tags" value="{{$supplier['customer_tags'] or ''}}"> <input name="customer_tags" id="customer_tags" value="{{$supplier['customer_tags'] or ''}}">
</div> </div>
</div> </div>
@endif @endif
...@@ -209,7 +221,7 @@ ...@@ -209,7 +221,7 @@
</div> </div>
<div class="layui-col-md2"> <div class="layui-col-md2">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-col-md5"> <div class="layui-col-md5">
<label class="layui-form-label"><span class="require">*</span>邮箱</label> <label class="layui-form-label"><span class="require">*</span>邮箱</label>
...@@ -267,36 +279,36 @@ ...@@ -267,36 +279,36 @@
@endif @endif
@include('script.supplier.SupplierBaseScript') @include('script.supplier.SupplierBaseScript')
@if($operate=='add') @if($operate=='add')
<div style="height: 100px"></div> <div style="height: 100px"></div>
<div class="fix-button"> <div class="fix-button">
<div class="layui-row" style="width: 90%;"> <div class="layui-row" style="width: 90%;">
<hr> <hr>
<div class="layui-col-md8"> <div class="layui-col-md8">
<p> <p>
<b>特别说明:</b> <b>特别说明:</b>
</p> </p>
<p> <p>
1.在创建新的供应商前，请先查询该供应商是否已经存在。如果供应商已存在，则不允许新增。 1.在创建新的供应商前，请先查询该供应商是否已经存在。如果供应商已存在，则不允许新增。
</p> </p>
<p> <p>
2.附件上传支持小于20M的PDF/ZIP/JPG/PNG/BMP格式,每个类型最多支持上传一个文件 2.附件上传支持小于20M的PDF/ZIP/JPG/PNG/BMP格式,每个类型最多支持上传一个文件
</p> </p>
<P> <P>
3.此处新增供应商基本信息以及配置跟进人,其他信息补全必须进入编辑页面 3.此处新增供应商基本信息以及配置跟进人,其他信息补全必须进入编辑页面
</P> </P>
</div> </div>
<div class="layui-col-md4" style="margin-top: 30px"> <div class="layui-col-md4" style="margin-top: 30px">
<div class="layui-row" style="text-align: right"> <div class="layui-row" style="text-align: right">
<button type="button" class="layui-btn layui-btn submit-loading" lay-submit <button type="button" class="layui-btn layui-btn submit-loading" lay-submit
lay-filter="addSupplier">确认 lay-filter="addSupplier">确认
</button> </button>
<button lay-filter="cancelAddSupplier" <button lay-filter="cancelAddSupplier"
type="button" lay-submit type="button" lay-submit
class="layui-btn layui-btn-primary">取消 class="layui-btn layui-btn-primary">取消
</button> </button>
</div>
</div>
</div> </div>
</div> </div>
</div>
</div>
</form> </form>
@endif @endif
\ No newline at end of file
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