Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit e93195ff by mushishixian
Options

详情标准必填

parent efbb8d39
Expand all
Inline Side-by-side
Showing with 186 additions and 106 deletions
app/Http/Controllers/Api/SupplierApiController.php
......@@ -69,10 +69,13 @@ class SupplierApiController extends Controller
//标签
'system_tags',
'customer_tags',
'level',
'has_certification',
'sku_mode',
'sku_tag',
'main_customers',
'ticket_time',
'billing_period_detail',
];
public function Entrance(Request $request, $id)
......
app/Http/Services/SupplierService.php
......@@ -53,7 +53,7 @@ class SupplierService
{
$supplierTransformer = new SupplierTransformer();
//先处理下数据
$channel = $supplierTransformer->transformFormData($channel);
$channel = $supplierTransformer->transformPostData($channel);
$logService = new LogService();
$model = new SupplierChannelModel();
//获取未修改前的供应商,做数据比较存储
......
app/Http/Transformers/SupplierTransformer.php
......@@ -125,8 +125,10 @@ 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'],
'');
$supplier['has_certification'] = 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'], '无');
return $supplier;
}
......@@ -187,7 +189,7 @@ class SupplierTransformer
}
//转换表单数据
public function transformFormData($channel)
public function transformPostData($channel)
{
if (!empty($channel['stockup_type'])) {
$stockupType = array_keys($channel['stockup_type']);
......
app/Http/Validators/SupplierValidator.php
......@@ -21,15 +21,18 @@ class SupplierValidator
'legal_representative' => 'required',
'stockup_type' => 'required',
'main_brands' => 'required',
'main_customers' => 'max:100',
'ticket_time' => 'max:20',
// 'supplier_address' => 'required',
'region' => 'required',
'cn_delivery_time' => 'regex:/^\d+\-\d$/',
'us_delivery_time' => 'regex:/^\d+\-\d$/',
'shipping_address' => 'max:100',
'shipping_address' => 'required|max:100',
'return_address' => 'max:100',
'return_consignee' => 'max:50',
'return_phone' => 'max:50',
'business_license' => 'required',
'established_time' => 'required',
'cn_ratio' => 'min:1',
'us_ratio' => 'min:1',
];
......@@ -69,7 +72,7 @@ class SupplierValidator
if (empty($request->get('supplier_id'))) {
$count = $supplierModel->where('supplier_name', $request->get('supplier_name'))->count();
$companyNameCount = $supplierModel->where('register_company_name',
$request->get('register_company_name'))->where('register_company_name','!=','')->count();
$request->get('register_company_name'))->where('register_company_name', '!=', '')->count();
} else {
$count = $supplierModel->where('supplier_name', $request->get('supplier_name'))
->where('supplier_id', '!=', $request->get('supplier_id'))->count();
......@@ -101,6 +104,7 @@ class SupplierValidator
'purchase_uid.required' => '渠道开发员不能为空',
'cn_ratio.min' => '人民币系数必须是大于1的浮点数',
'business_license.required' => '营业执照不能为空',
'established_time.required' => '成立时间不能为空',
'us_ratio.min' => '美金系数必须是大于1的浮点数',
'us_delivery_time.regex' => '香港货期格式不正确',
'cn_delivery_time.regex' => '大陆货期格式不正确',
......@@ -115,11 +119,16 @@ class SupplierValidator
'supplier_email.required' => '联系方式的邮箱不能为空',
'supplier_email.email' => '联系方式的邮箱格式不对',
'can_check_uids.required' => '联系方式对应的采购员不能为空',
'shipping_address.required' => '发货地址不能为空',
'shipping_address.max' => '发货地址不能超过100个字符',
'return_address.max' => '退货地址不能超过100个字符',
'return_consignee.max' => '退货收货人不能超过50个字符',
'return_phone.max' => '退货收货人电话不能超过50个字符',
'main_brands.require' => '主营品牌不能为空',
'main_customers.max' => '3-5家客户描述不能超过100个字符',
'ticket_time.max' => '到票时间不能超过20个字符',
'billing_period_detail.require' => '账期详情不能为空',
'billing_period_detail.max' => '账期详情不能超过100个字符',
];
}
......
config/fixed.php
......@@ -66,11 +66,13 @@ return [
],
'StockupType' => [
1 => '联营',
2 => '自营',
3 => '代购',
4 => '寄售',
5 => '云芯',
1 => '联营-现货',
6 => '联营-期货',
3 => '联营-代购',
7 => '联营-原厂直供',
2 => '自营-自采',
4 => '自营-寄售',
5 => '联营-云芯商家',
],
'SupplierPayType' => [
......
config/validate.php
......@@ -48,5 +48,10 @@ return [
'customer_tags' => '自定义标签',
'level' => '等级',
'has_certification' => '认证',
'sku_mode_name' => 'SKU 模式',
'sku_tag_name' => 'SKU 标签',
'main_customers' => '3-5家客户',
'ticket_time' => '到票时间',
'billing_period_detail' => '账期详情',
]
];
\ No newline at end of file
resources/views/script/supplier/SkuRulerScript.blade.php 0 → 100644
<script>
layui.use(['table', 'form', 'element', 'layer', 'admin', 'laydate', 'xmSelect'], function () {
let form = layui.form;
if ({{$supplier['sku_audit_ruler']['skip']}}){
$(function () {
$('.audit_ruler_item').attr('disabled', true);
form.render()
})
}
//点击无需审核,所有选项变灰
form.on('radio(is_skip)', function(data){
if (data.value === '1') {
$('.audit_ruler_item').attr('disabled', true);
form.render()
}else{
$('.audit_ruler_item').attr('disabled', false);
form.render()
}
console.log(data.elem); //得到radio原始DOM对象
console.log(data.value); //被点击的radio的value值
});
});
</script>
\ No newline at end of file
resources/views/script/supplier/SupplierRulerScript.blade.php
......@@ -16,26 +16,5 @@
$('#hk_max').val(9999999);
}
});
if ({{$supplier['sku_audit_ruler']['skip']}}){
$(function () {
$('.audit_ruler_item').attr('disabled', true);
form.render()
})
}
//点击无需审核,所有选项变灰
form.on('radio(is_skip)', function(data){
if (data.value === '1') {
$('.audit_ruler_item').attr('disabled', true);
form.render()
}else{
$('.audit_ruler_item').attr('disabled', false);
form.render()
}
console.log(data.elem); //得到radio原始DOM对象
console.log(data.value); //被点击的radio的value值
});
});
</script>
\ No newline at end of file
resources/views/web/PrintSupplier.blade.php
......@@ -79,11 +79,11 @@
</tr>
<tr>
<td width="20%" colspan="1">付款币别</td>
<td width="80%" colspan="5" style="text-align: left;padding-left: 20px">{{$printData['currency_name']?:''}}</td>
<td width="80%" colspan="5" style="text-align: left;padding-left: 20px">{{$printData['currency_name'] or ''}}</td>
</tr>
<tr>
<td width="20%" colspan="1">供应商付款方式</td>
<td width="80%" colspan="5" style="text-align: left;padding-left: 20px">{{$printData['pay_type_name']?:''}}</td>
<td width="80%" colspan="5" style="text-align: left;padding-left: 20px">{{$printData['pay_type_name'] or ''}}</td>
</tr>
<tr>
<td width="20%" colspan="1">付款时间</td>
......@@ -91,11 +91,11 @@
</tr>
<tr>
<td width="20%" colspan="1">供应商到票时间*</td>
<td width="80%" colspan="5" style="text-align: left;padding-left: 20px">???</td>
<td width="80%" colspan="5" style="text-align: left;padding-left: 20px">{{$printData['ticket_time'] or ''}}</td>
</tr>
<tr>
<td width="20%" colspan="1">账期详情*</td>
<td width="80%" colspan="5" style="text-align: left;padding-left: 20px">???</td>
<td width="80%" colspan="5" style="text-align: left;padding-left: 20px">{{$printData['billing_period_detail'] or ''}}</td>
</tr>
<tr>
<td width="20%" colspan="1">业务负责人</td>
......
resources/views/web/UpdateSupplier.blade.php
......@@ -103,6 +103,12 @@
@endif
id="ruler">特殊规则
</li>
<li
@if(request()->get('tab')=='sku_ruler')
class="layui-this"
@endif
id="sku_ruler">SKU概况
</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item @if(request()->get('tab')=='base_info'||empty(request()->get('tab'))) layui-show @endif">
......@@ -218,7 +224,9 @@
@include('web.supplier.SupplierRuler')
</div>
</div>
<div class="layui-tab-item">内容4</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>
</div>
</div>
......
resources/views/web/supplier/SkuRuler.blade.php 0 → 100644
<blockquote class="layui-elem-quote layui-text">
<b>SKU配置</b>
</blockquote>
<div class="layui-form-item">
<div class="layui-col-md3">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('sku_tag','SKU 标签',!empty($supplier)?$supplier['sku_tag']:'',config('field.SkuTag'),['width'=>'150px']) !!}
</div>
<div class="layui-col-md3">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('sku_mode','SKU 模式',!empty($supplier)?$supplier['sku_mode']:'',config('field.SkuMode'),['width'=>'150px']) !!}
</div>
<div class="layui-col-md6">
</div>
</div>
<blockquote class="layui-elem-quote layui-text">
<b>SKU相关设置 - 联营库存数据</b>
</blockquote>
<div class="layui-form-item">
<div class="layui-inline" style="width: 100%">
<label class="layui-form-label">数据新增规则 : </label>
<div class="layui-input-inline" style="width: 380px">
@if(!empty($supplier['sku_upload_ruler']))
@foreach($supplier['sku_upload_ruler'] as $key=>$flag)
@if(!empty(array_get(config('fixed.SkuUploadRuler'),$key)))
<input type="checkbox" name="sku_upload_ruler[{{$key}}]"
lay-skin="primary"
@if($flag)
checked
@endif
title="{{array_get(config('fixed.SkuUploadRuler'),$key)}}">
@endif
@endforeach
@else
@foreach(config('fixed.SkuUploadRuler') as $key=>$flag)
<input type="checkbox" name="sku_upload_ruler[{{$key}}]"
lay-skin="primary"
title="{{$flag}}">
@endforeach
@endif
</div>
<div class="layui-form-mid layui-word-aux">
SKU数据导入条件勾选后只要满足该条件，就可以导入数据；默认导入条件是有库存、价格、起订量且起订量>库存
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline" style="width: 100%">
<label class="layui-form-label">审核内容配置 : </label>
<div class="layui-input-inline" style="width: 205px">
<input type="radio" name="sku_audit_ruler[skip]" lay-filter="is_skip" @if($supplier['sku_audit_ruler']['skip']==1) checked @endif value="1" title="无需审核">
<input type="radio" name="sku_audit_ruler[skip]" lay-filter="is_skip" @if($supplier['sku_audit_ruler']['skip']==0) checked @endif value="0" title="需要审核内容">
</div>
<div class="layui-input-inline" style="width: 700px">
@if(!empty($supplier['sku_audit_ruler']))
@foreach($supplier['sku_audit_ruler']['audit_ruler'] as $key=>$flag)
@if(!empty(array_get(config('fixed.SkuAuditRuler.audit_ruler'),$key)))
<input type="checkbox" name="sku_audit_ruler[{{$key}}]"
lay-skin="primary"
class="audit_ruler_item"
@if($flag)
checked
@endif
title="{{array_get(config('fixed.SkuAuditRuler.name_map'),$key)}}">
@endif
@endforeach
@else
@foreach(config('fixed.SkuAuditRuler.audit_ruler') as $key=>$flag)
<input type="checkbox" name="sku_audit_ruler[{{$key}}]"
lay-skin="primary" checked class="audit_ruler_item"
title="{{array_get(config('fixed.SkuAuditRuler.name_map'),$key)}}">
@endforeach
@endif
</div>
</div>
</div>
@include('script.supplier.SkuRulerScript')
\ No newline at end of file
resources/views/web/supplier/SupplierBase.blade.php
......@@ -111,6 +111,15 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">3-5家客户 :
</label>
<div class="layui-input-block">
<input type="text" name="main_customers" id="main_customers"
placeholder="请输入3-5家客户" class="layui-input"
value="{{$supplier['main_customers'] or ''}}">
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="require">*</span>合作类型</label>
<div class="layui-input-block">
......@@ -132,7 +141,7 @@
<div class="layui-col-md4">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('supplier_group','公司性质',!empty($supplier)?array_get($supplier,'supplier_group',null):'',
config('fixed.SupplierGroup'),['required'=>true,'width'=>'150px']) !!}
config('fixed.SupplierGroup'),['required'=>true]) !!}
</div>
</div>
</div>
......@@ -154,6 +163,27 @@
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">到票时间 :
</label>
<div class="layui-input-block">
<input type="text" style="width: 170px" name="ticket_time" id="ticket_time"
placeholder="请输入到票时间" class="layui-input"
value="{{$supplier['ticket_time'] or ''}}">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"><span class="require">*</span>账期详情</label>
<div class="layui-input-block">
<input type="text" name="billing_period_detail" style="width: 470px" placeholder="请输入账期详情"
class="layui-input"
value="{{$supplier['billing_period_detail'] or ''}}">
</div>
</div>
</div>
@include('web.supplier.SupplierFile')
@if($operate!='add')
......
resources/views/web/supplier/SupplierRuler.blade.php
......@@ -99,68 +99,4 @@
</div>
</div>
<blockquote class="layui-elem-quote layui-text">
<b>SKU相关设置 - 联营库存数据</b>
</blockquote>
<div class="layui-form-item">
<div class="layui-inline" style="width: 100%">
<label class="layui-form-label">数据新增规则 : </label>
<div class="layui-input-inline" style="width: 380px">
@if(!empty($supplier['sku_upload_ruler']))
@foreach($supplier['sku_upload_ruler'] as $key=>$flag)
@if(!empty(array_get(config('fixed.SkuUploadRuler'),$key)))
<input type="checkbox" name="sku_upload_ruler[{{$key}}]"
lay-skin="primary"
@if($flag)
checked
@endif
title="{{array_get(config('fixed.SkuUploadRuler'),$key)}}">
@endif
@endforeach
@else
@foreach(config('fixed.SkuUploadRuler') as $key=>$flag)
<input type="checkbox" name="sku_upload_ruler[{{$key}}]"
lay-skin="primary"
title="{{$flag}}">
@endforeach
@endif
</div>
<div class="layui-form-mid layui-word-aux">
SKU数据导入条件勾选后只要满足该条件，就可以导入数据；默认导入条件是有库存、价格、起订量且起订量>库存
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline" style="width: 100%">
<label class="layui-form-label">审核内容配置 : </label>
<div class="layui-input-inline" style="width: 205px">
<input type="radio" name="sku_audit_ruler[skip]" lay-filter="is_skip" @if($supplier['sku_audit_ruler']['skip']==1) checked @endif value="1" title="无需审核">
<input type="radio" name="sku_audit_ruler[skip]" lay-filter="is_skip" @if($supplier['sku_audit_ruler']['skip']==0) checked @endif value="0" title="需要审核内容">
</div>
<div class="layui-input-inline" style="width: 700px">
@if(!empty($supplier['sku_audit_ruler']))
@foreach($supplier['sku_audit_ruler']['audit_ruler'] as $key=>$flag)
@if(!empty(array_get(config('fixed.SkuAuditRuler.audit_ruler'),$key)))
<input type="checkbox" name="sku_audit_ruler[{{$key}}]"
lay-skin="primary"
class="audit_ruler_item"
@if($flag)
checked
@endif
title="{{array_get(config('fixed.SkuAuditRuler.name_map'),$key)}}">
@endif
@endforeach
@else
@foreach(config('fixed.SkuAuditRuler.audit_ruler') as $key=>$flag)
<input type="checkbox" name="sku_audit_ruler[{{$key}}]"
lay-skin="primary" checked class="audit_ruler_item"
title="{{array_get(config('fixed.SkuAuditRuler.name_map'),$key)}}">
@endforeach
@endif
</div>
</div>
</div>
@include('script.supplier.SupplierRulerScript')
\ 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