Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit ee2741c1 by 杨树贤
Options

修改页面和新增页面保持基础信息布局一致

parent 1de5f431
Inline Side-by-side
Showing with 91 additions and 314 deletions
resources/views/web/AddSupplier.blade.php
...@@ -74,12 +74,12 @@ ...@@ -74,12 +74,12 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-row"> <div class="layui-row">
<div class="layui-col-md5"> <div class="layui-col-md3">
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('region','所在区域 : ','', {!! $statusPresenter->render('region','所在区域 : ','',
config('fixed.Region'),['required'=>true,'width'=>'150px']) !!} config('fixed.Region'),['required'=>true,'width'=>'150px']) !!}
</div> </div>
<div class="layui-col-md7"> <div class="layui-col-md9">
<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>
......
resources/views/web/UpdateSupplier.blade.php
...@@ -145,17 +145,17 @@ ...@@ -145,17 +145,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row"> {{-- <div class="layui-row">--}}
<div class="layui-col-md3"> {{-- <div class="layui-col-md3">--}}
<div class="layui-inline"> {{-- <div class="layui-inline">--}}
@inject('statusPresenter','App\Presenters\StatusPresenter') {{-- @inject('statusPresenter','App\Presenters\StatusPresenter')--}}
{!! $statusPresenter->render('trading_method','交易方式 : ', {{-- {!! $statusPresenter->render('trading_method','交易方式 : ',--}}
isset($supplier)?$supplier['trading_method']:'',config('fixed.TradingMethod'),['required'=>false]) !!} {{-- isset($supplier)?$supplier['trading_method']:'',config('fixed.TradingMethod'),['required'=>false]) !!}--}}
</div> {{-- </div>--}}
</div> {{-- </div>--}}
<div class="layui-col-md3"> {{-- <div class="layui-col-md3">--}}
</div> {{-- </div>--}}
</div> {{-- </div>--}}
<blockquote class="layui-elem-quote layui-text"> <blockquote class="layui-elem-quote layui-text">
<b><span class="require">*</span>财务信息</b> <b><span class="require">*</span>财务信息</b>
</blockquote> </blockquote>
......
resources/views/web/supplier/SupplierBase.blade.php
...@@ -33,24 +33,27 @@ ...@@ -33,24 +33,27 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>供应商名称 : </label> <div class="layui-col-md5">
<div class="layui-input-block"> <label class="layui-form-label"><span class="require">*</span>供应商名称 : </label>
<input type="text" name="supplier_name" id="supplier_name" <div class="layui-input-block">
placeholder="请输入供应商名称" class="layui-input" <input type="text" name="supplier_name" id="supplier_name"
value="{{$supplier['supplier_name'] or ''}}"> placeholder="请输入供应商名称" class="layui-input"
value="{{$supplier['supplier_name'] or ''}}">
</div>
</div> </div>
</div> <div class="layui-col-md7">
<div class="layui-form-item"> <label class="layui-form-label">注册公司名 : </label>
<label class="layui-form-label">注册公司名 : </label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="text" name="register_company_name" id="register_company_name"
<input type="text" name="register_company_name" id="register_company_name" placeholder="请输入注册公司名,注册公司名必须同执照" class="layui-input"
placeholder="请输入注册公司名" class="layui-input" value="{{$supplier['register_company_name'] or ''}}">
value="{{$supplier['register_company_name'] or ''}}"> </div>
{{-- <div style="margin-top: -15px;margin-left: 20px">--}}
{{-- <div class="layui-form-mid layui-word-aux">注册公司名必须同执照</div>--}}
{{-- </div>--}}
</div> </div>
</div> </div>
<div style="margin-top: -15px;margin-left: 20px">
<div class="layui-form-mid layui-word-aux">注册公司名必须同执照</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">英文名称 : </label> <label class="layui-form-label">英文名称 : </label>
<div class="layui-input-block"> <div class="layui-input-block">
...@@ -61,41 +64,48 @@ ...@@ -61,41 +64,48 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-row"> <div class="layui-row">
<div class="layui-col-md4"> <div class="layui-col-md3">
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('region','所在区域',!empty($supplier)?array_get($supplier,'region',''):'', {!! $statusPresenter->render('region','所在区域',!empty($supplier)?array_get($supplier,'region',''):'',
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-md9">
<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>
</div> </div>
<div class="layui-col-md12"> <div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>注册地址 : <div class="layui-col-md5">
</label> <label class="layui-form-label"><span class="require">*</span>注册地址 :
<div class="layui-input-block"> </label>
<input type="text" name="supplier_address" id="supplier_address"
placeholder="请输入注册地址" class="layui-input"
value="{{$supplier['supplier_address'] or ''}}">
</div>
</div>
@if($operate=='add')
<div class="layui-col-md12">
<label class="layui-form-label">发货地址 : </label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="shipping_address" id="shipping_address" <input type="text" name="supplier_address" id="supplier_address"
placeholder="请输入发货地址" class="layui-input" placeholder="请输入注册地址" class="layui-input"
value="{{$address['shipping_address'] or ''}}"> value="{{$supplier['supplier_address'] or ''}}">
</div> </div>
</div> </div>
@endif @if($operate=='add')
<div class="layui-col-md7">
<label class="layui-form-label">发货地址 : </label>
<div class="layui-input-block">
<input type="text" name="shipping_address" id="shipping_address"
placeholder="请输入发货地址" class="layui-input"
value="{{$address['shipping_address'] or ''}}">
</div>
</div>
@endif
</div>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-row"> <div class="layui-row">
<div class="layui-col-md4"> <div class="layui-col-md3">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('supplier_group','公司性质',!empty($supplier)?array_get($supplier,'supplier_group',null):'',
config('fixed.SupplierGroup'),['required'=>true]) !!}
</div>
<div class="layui-col-md3">
<label class="layui-form-label"><span class="require">*</span>法人代表 : <label class="layui-form-label"><span class="require">*</span>法人代表 :
</label> </label>
<div class="layui-input-block"> <div class="layui-input-block">
...@@ -104,7 +114,7 @@ ...@@ -104,7 +114,7 @@
value="{{$supplier['legal_representative'] or ''}}"> value="{{$supplier['legal_representative'] or ''}}">
</div> </div>
</div> </div>
<div class="layui-col-md8"> <div class="layui-col-md6">
<label class="layui-form-label" style="width: 80px">成立时间 : <label class="layui-form-label" style="width: 80px">成立时间 :
</label> </label>
<div class="layui-input-block" style="width: 150px"> <div class="layui-input-block" style="width: 150px">
...@@ -117,11 +127,31 @@ ...@@ -117,11 +127,31 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item">
<label class="layui-form-label">资信调查 : </label> <div class="layui-col-md3">
<div class="layui-input-block"> @inject('statusPresenter','App\Presenters\StatusPresenter')
<textarea name="credit_investigation" placeholder="请输入资信调查" {!! $statusPresenter->render('currency','结算币种',
class="layui-textarea">{{$supplier['credit_investigation'] or ''}}</textarea> isset($supplier)?$supplier['currency']:'',config('fixed.Currency'),['required'=>true]) !!}
</div>
<div class="layui-col-md3">
<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>
<div class="layui-col-md6">
<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>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
...@@ -136,15 +166,6 @@ ...@@ -136,15 +166,6 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <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"> <div class="layui-inline">
<label class="layui-form-label"><span class="require">*</span>合作类型</label> <label class="layui-form-label"><span class="require">*</span>合作类型</label>
<div class="layui-input-block"> <div class="layui-input-block">
...@@ -161,21 +182,15 @@ ...@@ -161,21 +182,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item layui-form-text">
<div class="layui-row"> <label class="layui-form-label">资信调查 : </label>
<div class="layui-col-md4"> <div class="layui-input-block">
@inject('statusPresenter','App\Presenters\StatusPresenter') <textarea name="credit_investigation" placeholder="请输入资信调查"
{!! $statusPresenter->render('supplier_group','公司性质',!empty($supplier)?array_get($supplier,'supplier_group',null):'', class="layui-textarea">{{$supplier['credit_investigation'] or ''}}</textarea>
config('fixed.SupplierGroup'),['required'=>true]) !!}
</div>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('currency','结算币种',
isset($supplier)?$supplier['currency']:'',config('fixed.Currency'),['required'=>true]) !!}
</div>
<div class="layui-inline" id="tax_number_div" <div class="layui-inline" id="tax_number_div"
@if(empty($supplier) || (!empty($supplier)&&$supplier['currency']!=1)) @if(empty($supplier) || (!empty($supplier)&&$supplier['currency']!=1))
style="display: none;" style="display: none;"
...@@ -189,25 +204,8 @@ ...@@ -189,25 +204,8 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> @include('web.supplier.SupplierPayType')
<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>
@if($operate!='add' && checkPerm('UpdateSupplierTags')) @if($operate!='add' && checkPerm('UpdateSupplierTags'))
<blockquote class="layui-elem-quote layui-text"> <blockquote class="layui-elem-quote layui-text">
<b>供应商标签 : </b> <b>供应商标签 : </b>
...@@ -243,127 +241,4 @@ ...@@ -243,127 +241,4 @@
</div> </div>
@endif @endif
@if($operate=='add')
<blockquote class="layui-elem-quote layui-text">
<b>跟进人</b>
</blockquote>
@inject('statusPresenter','App\Presenters\StatusPresenter')
<div class="layui-form-item">
{!! $statusPresenter->render('purchase_uid','渠道开发员','',$userCodes,['required'=>true,'width'=>'150px']) !!}
</div>
<blockquote class="layui-elem-quote layui-text">
<b>联系人</b>
</blockquote>
<div class="layui-form-item">
<div class="layui-col-md5">
<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"
placeholder="请输入联系人" class="layui-input"
value="">
</div>
</div>
<div class="layui-col-md5">
<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"
placeholder="请输入职位" class="layui-input"
value="">
</div>
</div>
<div class="layui-col-md2">
</div>
</div>
<div class="layui-form-item">
<div class="layui-col-md5">
<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"
placeholder="请输入邮箱" class="layui-input"
value="">
</div>
</div>
<div class="layui-col-md5">
<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"
placeholder="请输入手机号" class="layui-input"
value="">
</div>
</div>
<div class="layui-col-md2"></div>
</div>
<div class="layui-form-item">
<div class="layui-col-md5">
<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"
placeholder="请输入座机" class="layui-input"
value="">
</div>
</div>
<div class="layui-col-md5">
<label class="layui-form-label">QQ</label>
<div class="layui-input-block block-42">
<input type="text" name="supplier_qq" id="supplier_qq"
placeholder="请输入QQ" class="layui-input"
value="">
</div>
</div>
<div class="layui-col-md2"></div>
</div>
<div class="layui-form-item">
<div class="layui-col-md5">
<label class="layui-form-label">传真</label>
<div class="layui-input-block block-42">
<input type="text" name="supplier_fax" id="supplier_fax"
placeholder="请输入传真" class="layui-input"
value="">
</div>
</div>
<div class="layui-col-md5">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('can_check_uids','采购员','',
$userCodes,['required'=>true]) !!}
</div>
<div class="layui-col-md2"></div>
</div>
@endif
@include('script.supplier.SupplierBaseScript') @include('script.supplier.SupplierBaseScript')
@if($operate=='add')
<div style="height: 100px"></div>
<div class="fix-button">
<div class="layui-row" style="width: 90%;">
<hr>
<div class="layui-col-md8">
<p>
<b>特别说明:</b>
</p>
<p>
1.在创建新的供应商前，请先查询该供应商是否已经存在。如果供应商已存在，则不允许新增。
</p>
<p>
2.附件上传支持小于20M的PDF/ZIP/JPG/PNG/BMP格式,每个类型最多支持上传一个文件
</p>
<P>
3.此处新增供应商基本信息以及配置跟进人,其他信息补全必须进入编辑页面
</P>
</div>
<div class="layui-col-md4" style="margin-top: 30px">
<div class="layui-row" style="text-align: right">
<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">取消
</button>
</div>
</div>
</div>
</div>
</form>
@endif
\ No newline at end of file
resources/views/web/supplier/SupplierPayType.blade.php
...@@ -9,12 +9,6 @@ ...@@ -9,12 +9,6 @@
</script> </script>
@endif @endif
<div id="pay_type_div_list"> <div id="pay_type_div_list">
@if (!empty($supplier))
<div style="margin-bottom: 10px;margin-top: 5px">
<button type="button" class="layui-btn layui-btn-sm add_pay_type">新增付款方式</button>
</div>
@endif
@if (!empty($supplier['pay_type_list'])) @if (!empty($supplier['pay_type_list']))
@foreach($supplier['pay_type_list'] as $payType) @foreach($supplier['pay_type_list'] as $payType)
<div class="layui-row pay_type_div" style="margin-bottom: 5px;"> <div class="layui-row pay_type_div" style="margin-bottom: 5px;">
...@@ -92,76 +86,8 @@ ...@@ -92,76 +86,8 @@
<input type="hidden" class="valueInput" name="" value=""> <input type="hidden" class="valueInput" name="" value="">
</div> </div>
@endif @endif
{{-- @if ($payType['pay_type']==3)--}}
{{-- <div class="pay_type_3_div">--}}
{{-- <div class="layui-col-md3">--}}
{{-- <label class="layui-form-label">--}}
{{-- <span class="require">*</span>首款要求 :--}}
{{-- </label>--}}
{{-- </div>--}}
{{-- <div class="layui-col-md3" style="margin-left: -15px">--}}
{{-- <div class="layui-input-inline" style="width: 100px">--}}
{{-- <select lay-filter="pay_type_3_type">--}}
{{-- <option value="首款比例"--}}
{{-- @if (!empty($payType['pay_type_extra'])&&strpos($payType['pay_type_extra'],'%')!==false)--}}
{{-- selected='selected'--}}
{{-- @endif>首款比例--}}
{{-- </option>--}}
{{-- <option value="首款金额"--}}
{{-- @if (!empty($payType['pay_type_extra'])&&strpos($payType['pay_type_extra'],'RMB')!==false)--}}
{{-- selected='selected'--}}
{{-- @endif>首款金额--}}
{{-- </option>--}}
{{-- </select>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- <div class="layui-col-md6">--}}
{{-- <div class="layui-input-inline" style="width: 100px;margin-left: -20px;">--}}
{{-- <input class="layui-input valueInput" type="text" name="pay_type_value"--}}
{{-- value="{{$payType['pay_type_value']}}">--}}
{{-- </div>--}}
{{-- &nbsp--}}
{{-- @if (!empty($payType['pay_type_extra'])&&strpos($payType['pay_type_extra'],'%')!==false)--}}
{{-- <span class="temp">%</span>--}}
{{-- <input type="hidden" class="valueInput" name="pay_type_extra" value="%">--}}
{{-- @elseif (!empty($payType['pay_type_extra'])&&strpos($payType['pay_type_extra'],'RMB')!==false)--}}
{{-- <span class="temp">RMB</span>--}}
{{-- <input type="hidden" class="valueInput" name="pay_type_extra" value="RMB">--}}
{{-- @else--}}
{{-- <span class="temp">%</span>--}}
{{-- <input type="hidden" class="valueInput" name="pay_type_extra"--}}
{{-- value="%">--}}
{{-- @endif--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- @else--}}
{{-- <div class="pay_type_3_div" style="display: none">--}}
{{-- <div class="layui-col-md3">--}}
{{-- <label class="layui-form-label">--}}
{{-- <span class="require">*</span>首款要求 :--}}
{{-- </label>--}}
{{-- </div>--}}
{{-- <div class="layui-col-md3" style="margin-left: -15px">--}}
{{-- <div class="layui-input-inline" style="width: 100px">--}}
{{-- <select lay-filter="pay_type_3_type">--}}
{{-- <option value="首款比例">首款比例</option>--}}
{{-- <option value="首款金额">首款金额</option>--}}
{{-- </select>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- <div class="layui-col-md6">--}}
{{-- <div class="layui-input-inline" style="width: 100px;margin-left: -20px;">--}}
{{-- <input class="layui-input valueInput" type="text" name="">--}}
{{-- </div>--}}
{{-- &nbsp<span class="temp">%</span>--}}
{{-- <input type="hidden" class="valueInput" name="" value="%">--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- @endif--}}
</div> </div>
</div> </div>
<button type="button" class="layui-btn layui-btn-danger layui-btn-sm delete_pay_type">删除</button>
</div> </div>
@endforeach @endforeach
@endif @endif
...@@ -184,26 +110,6 @@ ...@@ -184,26 +110,6 @@
<div class="layui-col-md6" style="width:500px;margin-bottom: 3px;margin-left: -20px;"> <div class="layui-col-md6" style="width:500px;margin-bottom: 3px;margin-left: -20px;">
<div class="layui-row"> <div class="layui-row">
<div class="pay_type_3_div" style="display: none"> <div class="pay_type_3_div" style="display: none">
{{-- <div class="layui-col-md3">--}}
{{-- <label class="layui-form-label">--}}
{{-- <span class="require">*</span>首款要求 :--}}
{{-- </label>--}}
{{-- </div>--}}
{{-- <div class="layui-col-md3" style="margin-left: -15px">--}}
{{-- <div class="layui-input-inline" style="width: 100px">--}}
{{-- <select lay-filter="pay_type_3_type">--}}
{{-- <option value="首款比例">首款比例</option>--}}
{{-- <option value="首款金额">首款金额</option>--}}
{{-- </select>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- <div class="layui-col-md6">--}}
{{-- <div class="layui-input-inline" style="width: 100px;margin-left: -20px;">--}}
{{-- <input class="layui-input valueInput" type="text" name="pay_type_value">--}}
{{-- </div>--}}
{{-- &nbsp<span class="temp">%</span>--}}
{{-- <input type="hidden" class="valueInput" name="pay_type_extra" value="%">--}}
{{-- </div>--}}
</div> </div>
<div class="pay_type_1_div" style="display: none;margin-left: -100px"> <div class="pay_type_1_div" style="display: none;margin-left: -100px">
<div class="layui-row"> <div class="layui-row">
...@@ -227,9 +133,6 @@ ...@@ -227,9 +133,6 @@
</div> </div>
</div> </div>
</div> </div>
@if (!empty($supplier))
<button type="button" class="layui-btn layui-btn-danger layui-btn-sm delete_pay_type">删除</button>
@endif
</div> </div>
</template> </template>
......
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