Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 1de5f431 by 杨树贤
Options

查漏补缺页面

parent 944c38a1
Expand all
Inline Side-by-side
Showing with 153 additions and 105 deletions
app/Http/Controllers/Api/SupplierApiController.php
......@@ -131,7 +131,9 @@ class SupplierApiController extends Controller
//先去表单验证
$validator = new SupplierValidator();
$data = $request->all();
$validateResult = $validator->checkSave($data, false);
$isAudit = (bool)$request->input('is_audit');
$supplierId = $request->input('supplier_id');
$validateResult = $validator->checkSave($data, $isAudit);
if ($validateResult) {
$this->response(-1, $validateResult);
}
......@@ -141,9 +143,18 @@ class SupplierApiController extends Controller
$service = new SupplierService();
$result = $service->saveSupplier($channel);
if (!$result) {
$this->response(-1, '操作失败');
$this->response(-1, '修改失败');
}
$this->response(0, '操作成功');
//如果是申请审核,还要去修改审核状态
if ($isAudit) {
$supplierService = new SupplierService();
$auditData[] = [
'supplier_id' => $supplierId,
'apply_audit_reason' => '申请审核',
];
$supplierService->batchApplyInReviewSupplier($auditData);
}
$this->response(0, $isAudit ? '申请审核成功' : '修改成功');
}
......
app/Http/Controllers/Api/SupplierContactApiController.php
......@@ -86,7 +86,8 @@ class SupplierContactApiController extends Controller
$data = BatchTrim($data);
//先去表单验证
$validator = new SupplierContactValidator();
$validateResult = $validator->checkSave($request);
$requestData = $request->all();
$validateResult = $validator->checkSave($requestData);
if ($validateResult) {
$this->response(-1, $validateResult);
}
......
app/Http/Controllers/Api/SupplierReceiptApiController.php
......@@ -39,7 +39,8 @@ class SupplierReceiptApiController extends Controller
{
//先去表单验证
$validator = new ReceiptValidator();
$validateResult = $validator->checkSave($request);
$requestData = $request->all();
$validateResult = $validator->checkSave($requestData);
if ($validateResult) {
$this->response(-1, $validateResult);
}
......
app/Http/Controllers/Filter/SupplierFilter.php
......@@ -25,6 +25,9 @@ class SupplierFilter
if (!empty($map['supplier_id'])) {
$query->where('supplier_channel.supplier_id', $map['supplier_id']);
}
if (!empty($map['supplier_type'])) {
$query->where('supplier_channel.supplier_type', $map['supplier_type']);
}
if (!empty($map['supplier_name'])) {
$query->where('supplier_name', 'like', "{$map['supplier_name']}%");
}
......
app/Http/Validators/ReceiptValidator.php
......@@ -10,16 +10,15 @@ class ReceiptValidator
{
//保存相关的验证,别问我为什么不用laravel自带的form-request类
//因为控制器那边已经被之前的人魔改的难用的一比，而且控制器那边还接收了一大堆统一变量
public function checkSave($request)
public function checkSave($data,$returnAllError = false)
{
$receipt = $data;
//整理下请求数据
$receipt = $request->all();
$rules = [
"bank_name" => "required",
"bank_adderss" => "required",
"account_no" => "required",
"receipt_type" => 'required',
// "account_name" => "required",
"certificate" => "required",
];
if ($receipt['receipt_type'] == 2) {
......@@ -30,20 +29,24 @@ class ReceiptValidator
//判断联系方式的表单验证
if ($validator->fails()) {
if ($returnAllError) {
return $validator->errors()->all();
}else{
return $validator->errors()->first();
}
}
}
private function messages()
{
return [
'receipt_type.required' => '开户名称不能为空',
'bank_name.required' => '类型不能为空',
'bank_adderss.required' => '开户行不能为空',
'receipt_type.required' => '开户名称 不能为空',
'bank_name.required' => '类型 不能为空',
'bank_adderss.required' => '开户行 不能为空',
'swift_code.required' => '电汇号码 Swift Code 不能为空',
'account_no.required' => '银行账号不能为空',
'account_name.required' => '账户名称不能为空',
'certificate.required' => '银行信息凭证不能为空',
'account_no.required' => '银行账号 不能为空',
'account_name.required' => '账户名称 不能为空',
'certificate.required' => '银行信息凭证 不能为空',
];
}
}
\ No newline at end of file
app/Http/Validators/SupplierAttachmentValidator.php
......@@ -33,10 +33,10 @@ class SupplierAttachmentValidator
private function messages()
{
return [
'field_name.required' => '附件类型不能为空',
'validity.required' => '有效期类型不能为空',
'file_url.required' => '上传文件不能为空',
'file_name.required' => '文件名不能为空',
'field_name.required' => '附件类型 不能为空',
'validity.required' => '有效期类型 不能为空',
'file_url.required' => '上传文件 不能为空',
'file_name.required' => '文件名 不能为空',
];
}
}
\ No newline at end of file
app/Http/Validators/SupplierContactValidator.php
......@@ -9,10 +9,8 @@ use Validator;
class SupplierContactValidator
{
public function checkSave($request)
public function checkSave($data)
{
$data = $request->all();
$data = BatchTrim($data);
$rules = [
"supplier_consignee" => "required",
......@@ -57,13 +55,13 @@ class SupplierContactValidator
private function messages()
{
return [
'supplier_consignee.required' => '联系人不能为空',
'supplier_email.required' => '联系人邮箱不能为空',
'supplier_consignee.required' => '联系人 不能为空',
'supplier_email.required' => '联系人邮箱 不能为空',
'supplier_email.email' => '邮箱格式不对',
'supplier_mobile.required' => '联系人电话不能为空',
'supplier_telephone.required' => '联系人座机不能为空',
'supplier_position.required' => '联系人职位不能为空',
'can_check_uids.required' => '采购员不能为空',
'supplier_mobile.required' => '联系人电话 不能为空',
'supplier_telephone.required' => '联系人座机 不能为空',
'supplier_position.required' => '联系人职位 不能为空',
'can_check_uids.required' => '采购员 不能为空',
];
}
}
\ No newline at end of file
config/fixed.php
......@@ -205,19 +205,21 @@ return [
1 => '先款后货',
2 => '月结',
],
'FileNameMapping' => [
'business_license' => '营业执照',
'billing_information' => '开票资料',
'quality_assurance_agreement' => '品质保证协议',
'registration_certificate' => '商业登记证',
'cooperation_agreement' => '合作协议',
'proxy_certificate' => '代理证',
'incorporation_certificate' => '公司注册证',
'certification_notice' => '认证通知书',
'supplier_survey' => '供应商调查表',
'proxy_certificate' => '代理证',
'quality_assurance_agreement' => '品质保证协议',
'confidentiality_agreement' => '保密协议',
'cooperation_agreement' => '合作协议',
'other_attachment' => '其它附件',
],
//罗盘菜单对应id
'CompassMenuMap' => [
'total' => '全部',
......
resources/views/script/AddSupplierReceiptScript.blade.php
......@@ -46,6 +46,7 @@
}
, accept: 'file'
, exts: 'jpg|png|bmp|jpeg|zip|pdf'
, size: 20000
, before: function (obj) {
layer.msg('加载中', {
icon: 16
......
resources/views/script/AddSupplierScript.blade.php
......@@ -27,6 +27,7 @@
}
, accept: 'file'
, exts: 'jpg|png|bmp|jpeg|zip|pdf'
, size: 20000
, before: function (obj) {
layer.msg('加载中', {
icon: 16
......@@ -75,7 +76,6 @@
admin.closeThisTabs();
} else {
layer.msg(res.err_msg, {icon: 5});
//todo
}
}
return false;
......@@ -94,7 +94,12 @@
layer.msg(res.err_msg, {icon: 6});
admin.closeThisTabs();
} else {
layer.msg(res.err_msg, {icon: 5});
let errMsg = res.err_msg;
let msg = '';
$.each(errMsg.split('|'), function (index, value) {
msg += "<span>" + value + "</span><br>"
});
layer.msg(msg, {icon: 5})
}
}
});
......
resources/views/script/UpdateSupplierScript.blade.php
<script>
layui.use(['table', 'form', 'element', 'layer', 'admin', 'index', 'laydate', 'xmSelect'], function () {
let admin = layui.admin;
let index = layui.index;
let form = layui.form;
let table = layui.table;
......@@ -8,18 +9,35 @@
layer.load(1);
});
form.on('submit(updateSupplier)', function (data) {
let confirmMessage = '';
if (data.field.status === '-2') {
confirmMessage = '确定要重新入驻吗,该供应商就会再次进入审核阶段'
} else if (data.field.status === '-1') {
confirmMessage = '确定要提交新增供应商信息吗?一旦提交,该供应商就会进入待复审阶段,审核过程中无法进行信息修改'
}else if (data.field.status === '3') {
} else if (data.field.status === '3') {
confirmMessage = '确定要重新提交审核吗?一旦提交,该供应商就会再次进入审核中阶段,审核过程中无法进行信息修改';
} else {
//修改不需要进入审核了,有个单独提交审核的按钮
confirmMessage = '确定要修改供应商信息吗?<br>一旦修改关键字段,该供应商就会再次进入<b>待审核</b>状态,需要去列表页<b>提交申请审核</b>,送至主管审核';
updateSupplier(data);
return;
}
layer.confirm(confirmMessage, function (index) {
updateSupplier(data);
});
})
form.on('submit(applyAuditSupplier)', function (data) {
let confirmMessage = '确定要修改供应商信息吗?<br>一旦修改关键字段,该供应商就会再次进入<b>审核中</b>状态,送至主管审核,期间不允许修改供应商信息';
layer.confirm(confirmMessage, function (index) {
data.field.is_audit = 1;
updateSupplier(data);
});
});
function updateSupplier(data) {
let res = ajax('/api/supplier/UpdateSupplier', data.field);
if (res.err_code === 0) {
admin.putTempData("needFreshList", 1)
......@@ -28,10 +46,14 @@
layer.msg(res.err_msg, {icon: 6})
layer.close(index);
} else {
layer.msg(res.err_msg, {icon: 5})
}
let errMsg = res.err_msg;
let msg = '';
$.each(errMsg.split('|'), function (index, value) {
msg += "<span>" + value + "</span><br>"
});
})
layer.msg(msg, {icon: 5})
}
}
});
</script>
\ No newline at end of file
resources/views/script/supplier/SupplierAttachmentScript.blade.php
......@@ -39,20 +39,20 @@
page: {},
});
//新增银行弹窗
//新增附件弹窗
$("#add_attachment").click(function () {
layer.open({
type: 2,
content: '/supplier_attachment/AddSupplierAttachment?view=iframe&supplier_id=' + supplierId,
area: ['50%', '70%'],
title: '新增银行',
title: '新增附件',
end: function () {
table.reload('attachmentList');
}
});
})
//修改银行弹窗
//修改附件弹窗
$("#update_attachment").click(function () {
let checkStatus = table.checkStatus('attachmentList');
let data = checkStatus.data;
......
resources/views/script/supplier/SupplierFileScript.blade.php
......@@ -22,16 +22,6 @@
}
});
// laydate.render({
// elem: '.validity_period',
// type: 'date',
// trigger: 'click',
// range: '~', //或 range: '~' 来自定义分割字符,
// value: '',
// });
form.on('select(validity_period_selector)', function (data) {
fileType = data.value;
let validityPeriodTimeSelector = $(this).parents('.layui-col-md7')
......@@ -45,8 +35,6 @@
}
});
upload.render({
elem: '#upload_button',
url: '{{config('website.UploadUrl')}}', //改成您自己的上传接口
......@@ -93,7 +81,7 @@
} else {
layer.msg('上传接口异常,请重试或者联系管理员 . ' + res.message);
}
lay('.validity_period').each(function(){
lay('.validity_period').each(function () {
console.log(this)
laydate.render({
elem: this,
......
resources/views/web/AddSupplier.blade.php
......@@ -18,17 +18,18 @@
<div class="layui-card-body">
<style>
.fix-button {
height: 110px;
height: 40px;
margin-top: 0;
margin-left: -30px;
margin-left: -90px;
padding: 10px 45px;
position: fixed;
bottom: 0;
top: 0;
background: white;
width: 100%;
z-index: 10;
}
</style>
<div style="height:40px"></div>
<blockquote class="layui-elem-quote layui-text">
<b>基本信息</b>
</blockquote>
......@@ -177,7 +178,7 @@
<input type="hidden" name="stockup_type"
value="{{$supplier['stockup_type'] or ''}}">
@foreach(config('fixed.StockupType') as $k=>$type)
<input type="checkbox"
<input type="checkbox" name="stockup_type[{{$k}}]"
lay-skin="primary"
title="{{$type}}">
@endforeach
......@@ -193,7 +194,7 @@
<div class="layui-form-item">
<div class="layui-inline" id="tax_number_div"
style="display: none;"
style="display: none;margin-top: 10px"
>
<label class="layui-form-label"><span class="require">*</span>公司税号</label>
<div class="layui-input-inline">
......@@ -204,7 +205,6 @@
@include('web.supplier.SupplierPayType')
<blockquote class="layui-elem-quote layui-text">
<b>财务信息</b>
</blockquote>
......@@ -292,7 +292,7 @@
<b>联系人</b>
</blockquote>
<div class="layui-form-item">
<div class="layui-col-md5">
<div class="layui-col-md4">
<label class="layui-form-label"><span class="require">*</span>联系人</label>
<div class="layui-input-block block-42">
<input type="text" name="supplier_consignee" id="supplier_consignee"
......@@ -300,7 +300,7 @@
value="">
</div>
</div>
<div class="layui-col-md5">
<div class="layui-col-md4">
<label class="layui-form-label"><span class="require">*</span>职位</label>
<div class="layui-input-block block-42">
<input type="text" name="supplier_position" id="supplier_position"
......@@ -308,11 +308,7 @@
value="">
</div>
</div>
<div class="layui-col-md2">
</div>
</div>
<div class="layui-form-item">
<div class="layui-col-md5">
<div class="layui-col-md4">
<label class="layui-form-label"><span class="require">*</span>邮箱</label>
<div class="layui-input-block block-42">
<input type="text" name="supplier_email" id="supplier_email"
......@@ -320,7 +316,9 @@
value="">
</div>
</div>
<div class="layui-col-md5">
</div>
<div class="layui-form-item">
<div class="layui-col-md4">
<label class="layui-form-label"><span class="require">*</span>手机号</label>
<div class="layui-input-block block-42">
<input type="text" name="supplier_mobile" id="supplier_mobile"
......@@ -328,10 +326,7 @@
value="">
</div>
</div>
<div class="layui-col-md2"></div>
</div>
<div class="layui-form-item">
<div class="layui-col-md5">
<div class="layui-col-md4">
<label class="layui-form-label"><span class="require">*</span>座机</label>
<div class="layui-input-block block-42">
<input type="text" name="supplier_telephone" id="supplier_telephone"
......@@ -339,7 +334,7 @@
value="">
</div>
</div>
<div class="layui-col-md5">
<div class="layui-col-md4">
<label class="layui-form-label">QQ</label>
<div class="layui-input-block block-42">
<input type="text" name="supplier_qq" id="supplier_qq"
......@@ -347,10 +342,9 @@
value="">
</div>
</div>
<div class="layui-col-md2"></div>
</div>
<div class="layui-form-item">
<div class="layui-col-md5">
<div class="layui-col-md4">
<label class="layui-form-label">传真</label>
<div class="layui-input-block block-42">
<input type="text" name="supplier_fax" id="supplier_fax"
......@@ -358,44 +352,48 @@
value="">
</div>
</div>
<div class="layui-col-md5">
<div class="layui-col-md4">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('can_check_uids','采购员','',
$userCodes,['required'=>true]) !!}
</div>
<div class="layui-col-md2"></div>
<div class="layui-col-md4"></div>
</div>
<blockquote class="layui-elem-quote layui-text">
<b>附件管理</b>
</blockquote>
@include('web.supplier.SupplierFile')
<div style="height: 100px"></div>
{{-- <div class="fix-button">--}}
<div>
<div class="layui-row" style="width: 90%;">
<hr>
<div class="layui-col-md7">
<div class="layui-form-item" style="margin-top: 10px;margin-left: 10px">
<p>
<b>特别说明:</b>
</p>
<p>
1.在创建新的供应商前，请先查询该供应商是否已经存在。如果供应商已存在，则不允许新增。
1、在创建新的供应商前，请先查询该供应商是否已经存在。如果供应商已存在，则不允许新增。
</p>
<p>
2.附件上传支持小于20M的PDF/ZIP/JPG/PNG/BMP格式,每个类型最多支持上传一个文件
2、附件上传支持小于20M的PDF/ZIP/JPG/PNG/BMP格式,每个类型允许上传多份；
</p>
<P>
3.此处新增供应商基本信息以及配置跟进人,其他信息补全必须进入编辑页面
3、此处新增供应商基本信息以及配置跟进人,其他信息补全必须进入编辑页面；
</P>
<P>
4、正式供应商建档必须上传营业执照，开票资料，现货商类型必须上传品质协议；
</P>
<P>
5、正式供应商建档必须维护至少一条银行信息；
</P>
</div>
<div class="layui-col-md5" style="margin-top: 30px">
<div class="layui-row" style="text-align: right">
<div class="fix-button">
<div>
<div class="layui-row" style="width: 100%;padding-left: 50px" >
<div class="layui-col-md12">
<div class="layui-row" style="text-align: left">
<button type="button" class="layui-btn layui-btn submit-loading" lay-submit
lay-filter="addSupplier">保存
</button>
<button type="button" class="layui-btn layui-btn submit-loading" id="apply_audit_button"
lay-submit lay-filter="addAndApplySupplier">申请审核
</button>
<button type="button" class="layui-btn layui-btn submit-loading" lay-submit
lay-filter="addSupplier">确认
</button>
<button lay-filter="cancelAddSupplier"
type="button" lay-submit
class="layui-btn layui-btn-primary">取消
......@@ -403,9 +401,10 @@
</div>
</div>
</div>
<hr>
</div>
</div>
</form>
<hr/>
</div>
</div>
@include('script.supplier.SupplierBaseScript')
......
resources/views/web/PrintSupplier.blade.php
......@@ -113,9 +113,12 @@
style="text-align: left;padding-left: 20px">{{$printData['ticket_time'] or ''}}</td>
</tr>
<tr>
<td width="20%" colspan="1">账期详情*</td>
{{-- <td width="20%" colspan="1">账期详情*</td>--}}
<td width="20%" colspan="1"></td>
{{-- <td width="80%" colspan="5"--}}
{{-- style="text-align: left;padding-left: 20px">{{$printData['billing_period_detail'] or ''}}</td>--}}
<td width="80%" colspan="5"
style="text-align: left;padding-left: 20px">{{$printData['billing_period_detail'] or ''}}</td>
style="text-align: left;padding-left: 20px"></td>
</tr>
<tr>
<td width="20%" colspan="1">业务负责人</td>
......
resources/views/web/SupplierDetail.blade.php
......@@ -189,7 +189,7 @@
到票时间 ：{{$supplier['ticket_time']}}
</div>
<div class="layui-col-md3">
<span class="required_field">*</span> 账期详情 ：{{$supplier['billing_period_detail']}}
{{-- <span class="required_field">*</span> 账期详情 ：{{$supplier['billing_period_detail']}}--}}
</div>
</div>
<div class="layui-row" style="width: 700px">
......@@ -273,10 +273,14 @@
</div>
<hr/>
<blockquote class="layui-elem-quote layui-text">
<b>财务信息</b>
<b><span class="require">*</span>财务信息</b>
</blockquote>
@include('web.supplier.SupplierReceipt')
<blockquote class="layui-elem-quote layui-text">
<b><span class="require">*</span>附件管理</b>
</blockquote>
@include('web.supplier.SupplierAttachment')
<blockquote class="layui-elem-quote layui-text">
<b>运输信息</b>
</blockquote>
<div class="layui-row">
......
resources/views/web/UpdateSupplier.blade.php
......@@ -81,6 +81,9 @@
<button type="button" class="layui-btn layui-btn submit-loading" lay-submit
lay-filter="updateSupplier">确认修改供应商
</button>
<button type="button" class="layui-btn layui-btn submit-loading" lay-submit
lay-filter="applyAuditSupplier">申请审核
</button>
@endif
<a id="supplierDetailUrl"
href="/supplier/SupplierDetail?view=iframe&supplier_id={{$supplier['supplier_id']}}"
......
resources/views/web/supplier/SupplierBase.blade.php
......@@ -199,14 +199,14 @@
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 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>
@if($operate!='add' && checkPerm('UpdateSupplierTags'))
<blockquote class="layui-elem-quote layui-text">
......
resources/views/web/supplier/SupplierFile.blade.php
......@@ -53,7 +53,7 @@
</div>
<div class="layui-col-md7">
<label class="layui-form-label">有效期 : </label>
<div class="layui-input-inline" style="width: 100px">
<div class="layui-input-inline" style="width: 100px">$attachmentFields
<select name="validity_type[]" lay-filter="validity_period_selector">
<option value="">请选择</option>
<option value="1">长期有效</option>
......
resources/views/web/supplier/SupplierPayType.blade.php
......@@ -177,7 +177,7 @@
<div class="layui-col-md3">
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('pay_type','付款方式 : ',
{!! $statusPresenter->render('pay_type','付款周期 : ',
isset($supplier['pay_type'])?$supplier['pay_type']:'',config('fixed.SupplierPayType'),['required'=>true]) !!}
</div>
</div>
......@@ -205,7 +205,7 @@
{{-- <input type="hidden" class="valueInput" name="pay_type_extra" value="%">--}}
{{-- </div>--}}
</div>
<div class="pay_type_1_div" style="display: none">
<div class="pay_type_1_div" style="display: none;margin-left: -100px">
<div class="layui-row">
<span class="require">*</span>月结 : &nbsp
<div class="layui-input-inline" style="width: 80px;">
......
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