Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 53515f75 by 杨树贤
Options

temp

parent 9cd65653
Inline Side-by-side
Showing with 93 additions and 63 deletions
app/Http/Validators/SupplierValidator.php
...@@ -295,7 +295,7 @@ class SupplierValidator ...@@ -295,7 +295,7 @@ class SupplierValidator
//如果付款方式为账期,那么月结天数一定要选 //如果付款方式为账期,那么月结天数一定要选
if ($validateData['pay_type'] == 1) { if ($validateData['pay_type'] == 1) {
if (!array_get($validateData, 'pay_type_value')) { if (!array_get($validateData, 'pay_type_value')) {
$errorMessageList[] = '付款方式选择账期,月结天数必须设置'; $errorMessageList[] = '付款方式选择账期,具体的付款周期值必填';
} }
} }
......
config/field.php
...@@ -374,7 +374,7 @@ return [ ...@@ -374,7 +374,7 @@ return [
6 => '5年内', 6 => '5年内',
], ],
'SupplierPayExtra' => [ 'SupplierPayTypeExtra' => [
'天' => '天', '天' => '天',
'当月' => '当月', '当月' => '当月',
'当周' => '当周', '当周' => '当周',
......
config/validate.php
...@@ -60,5 +60,8 @@ return [ ...@@ -60,5 +60,8 @@ return [
'sign_com_id' => '签约公司id', 'sign_com_id' => '签约公司id',
'sign_com_name' => '签约公司名称', 'sign_com_name' => '签约公司名称',
'sku_optional_batch_text' => 'SKU可选批次', 'sku_optional_batch_text' => 'SKU可选批次',
'pay_type_name' => '付款周期',
'pay_type_value' => '付款周期值',
'pay_type_extra' => '付款周期类型',
] ]
]; ];
resources/views/script/supplier/SupplierPayTypeScript.blade.php
...@@ -72,16 +72,39 @@ ...@@ -72,16 +72,39 @@
form.render('select'); form.render('select');
}); });
// 处理周期类型选择变化
form.on('select(pay_type_extra)', function (data) { form.on('select(pay_type_extra)', function (data) {
const payTypeExtra = data.value; const payTypeExtra = data.value;
// 隐藏所有子选项
$('.pay_type_1_days_div, .pay_type_1_monthly_div, .pay_type_1_weekly_div').hide();
// 清空所有值
$('#pay_type_value, #pay_type_value_monthly, #pay_type_value_weekly').val('');
// 根据选择的类型显示对应的选项
if (payTypeExtra === '天') { if (payTypeExtra === '天') {
$('#pay_type_month_div').show(); $('.pay_type_1_days_div').show();
}else{ } else if (payTypeExtra === '当月') {
$('#pay_type_value').val(''); $('.pay_type_1_monthly_div').show();
$('#pay_type_month_div').hide(); } else if (payTypeExtra === '当周') {
$('.pay_type_1_weekly_div').show();
} }
// 更新隐藏字段值
$('#pay_type_extra').val(payTypeExtra);
});
// 处理月结天数选择
form.on('select(pay_type_monthly)', function (data) {
const value = data.value;
$('#pay_type_value_monthly').val(value);
});
// 处理当周结星期选择
form.on('select(pay_type_weekly)', function (data) {
const value = data.value;
$('#pay_type_value_weekly').val(value);
}); });
}); });
......
resources/views/web/SupplierDetail.blade.php
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
<div class="layui-col-md3"> <div class="layui-col-md3">
付款周期 ：{{$supplier['pay_type_name'] }} 付款周期 ：{{$supplier['pay_type_name'] }}
@if($supplier['pay_type'] == 1) @if($supplier['pay_type'] == 1)
(月结{{$supplier['pay_type_value'].$supplier['pay_type_extra']}}) ({{$supplier['pay_type_value'].$supplier['pay_type_extra']}})
@endif @endif
</div> </div>
</div> </div>
......
resources/views/web/supplier/SupplierPayType.blade.php
...@@ -8,69 +8,74 @@ ...@@ -8,69 +8,74 @@
{!! $statusPresenter->render('settlement_type','结算方式 : ', {!! $statusPresenter->render('settlement_type','结算方式 : ',
!empty($supplier)?$supplier['settlement_type']:'',config('field.SettlementType'),['required'=>true]) !!} !empty($supplier)?$supplier['settlement_type']:'',config('field.SettlementType'),['required'=>true]) !!}
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md2">
<div class="layui-inline"> <div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('pay_type','付款周期 : ', {!! $statusPresenter->render('pay_type','付款周期 : ',
!empty($supplier)?$supplier['pay_type']:'',config('fixed.SupplierPayType'),['required'=>true]) !!} !empty($supplier)?$supplier['pay_type']:'',config('fixed.SupplierPayType'),['required'=>true,'width'=>'120px']) !!}
</div> </div>
</div> </div>
<div class="layui-col-md6" style="width:500px;margin-bottom: 3px;margin-left: -20px;"> <div class="layui-col-md7" style="width:500px;margin-bottom: 3px;margin-left: -30px;display: flex;align-items: center;">
<div class="layui-row"> {{-- 周期类型选择 --}}
@if (!empty($supplier)&&$supplier['pay_type']==1) <div class="layui-inline pay_type_1_div" style="margin-left: -20px; display: none;">
<div class="pay_type_1_div"> @inject('statusPresenter','App\Presenters\StatusPresenter')
<div class="layui-row" style=""> {!! $statusPresenter->render('pay_type_extra','周期类型 : ',
<span class="require">*</span>月结 : &nbsp !empty($supplier)?$supplier['pay_type_extra']:'',config('field.SupplierPayTypeExtra'),['required'=>true,'width'=>'80px']) !!}
<div class="layui-input-inline" style="width: 80px;"> </div>
<input class="layui-input valueInput" type="hidden" name="pay_type_value" value="{{$supplier['pay_type_value'] or ''}}">
<select lay-filter="pay_type_month"> {{-- 月结天数选择 --}}
<option value="">请选择</option> <div class="pay_type_1_div pay_type_1_days_div" style="@if(!empty($supplier)&&$supplier['pay_type']==1 && $supplier['pay_type_extra']=='天')display: block;@else display: none;@endif margin-bottom: 8px;">
<option value="7" @if($supplier['pay_type_value']==7) selected='selected' @endif>7 <div class="layui-row" style="">
</option> <div class="layui-input-inline" style="width: 80px;">
<option value="15" @if($supplier['pay_type_value']==15) selected='selected' @endif>15 <input class="layui-input valueInput" type="hidden" id="pay_type_value" name="pay_type_value" value="{{$supplier['pay_type_value'] or ''}}">
</option> <select lay-filter="pay_type_month">
<option value="30" @if($supplier['pay_type_value']==30) selected='selected' @endif>30 <option value="">请选择</option>
</option> <option value="7" @if(array_get($supplier,'pay_type_value')=='7' ) selected='selected' @endif>7</option>
<option value="45" @if($supplier['pay_type_value']==45) selected='selected' @endif>45 <option value="15" @if(array_get($supplier,'pay_type_value')=='15' ) selected='selected' @endif>15</option>
</option> <option value="30" @if(array_get($supplier,'pay_type_value')=='30' ) selected='selected' @endif>30</option>
<option value="60" @if($supplier['pay_type_value']==60) selected='selected' @endif>60 <option value="45" @if(array_get($supplier,'pay_type_value')=='45' ) selected='selected' @endif>45</option>
</option> <option value="60" @if(array_get($supplier,'pay_type_value')=='60' ) selected='selected' @endif>60</option>
<option value="90" @if($supplier['pay_type_value']==90) selected='selected' @endif>90 <option value="90" @if(array_get($supplier,'pay_type_value')=='90' ) selected='selected' @endif>90</option>
</option> </select>
</select>
</div>
&nbsp天
<input type="hidden" class="valueInput" name="pay_type_extra" value="天">
</div> </div>
&nbsp天
</div> </div>
@else </div>
{{-- 现在账期类型不仅仅要支持设置具体的天数,还要设置具体的类型,比如当月结,当周结 --}}
<div class="pay_type_1_div" style="display: none"> {{-- 当月结日期选择 --}}
<div class="layui-row"> <div class="pay_type_1_div pay_type_1_monthly_div" style="@if(!empty($supplier)&&$supplier['pay_type']==1 && $supplier['pay_type_extra']=='当月')display: block;@else display: none;@endif margin-bottom: 8px;">
@inject('statusPresenter','App\Presenters\StatusPresenter') <div class="layui-row" style="">
{!! $statusPresenter->render('pay_type_extra','付款周期 : ', <div class="layui-input-inline" style="width: 80px;">
!empty($supplier)?$supplier['pay_type_extra']:'',config('field.SupplierPayExtra'),['required'=>true]) !!} <input class="layui-input valueInput" type="hidden" id="pay_type_value_monthly" name="pay_type_value" value="{{$supplier['pay_type_value'] or ''}}">
<div id="pay_type_month_div"> <select lay-filter="pay_type_monthly">
<span class="require">*</span>月结 : &nbsp <option value="">请选择</option>
<div class="layui-input-inline" style="width: 80px;"> @for($i = 1; $i <= 31; $i++)
<input class="layui-input valueInput" type="hidden" name="pay_type_value"> <option value="{{$i}}" @if(array_get($supplier,'pay_type_value')==$i ) selected='selected' @endif>{{$i}}</option>
<select lay-filter="pay_type_month"> @endfor
<option value="">请选择</option> </select>
<option value="7">7</option>
<option value="15">15</option>
<option value="30">30</option>
<option value="45">45</option>
<option value="60">60</option>
<option value="90">90</option>
</select>
</div>
&nbsp天
<input type="hidden" class="valueInput" name="pay_type_extra" value="天">
</div>
</div> </div>
&nbsp号
</div> </div>
@endif </div>
{{-- 当周结星期选择 --}}
<div class="pay_type_1_div pay_type_1_weekly_div" style="@if(!empty($supplier)&&$supplier['pay_type']==1 && $supplier['pay_type_extra']=='当周')display: block;@else display: none;@endif margin-bottom: 8px;">
<div class="layui-row" style="">
<div class="layui-input-inline" style="width: 80px;">
<input class="layui-input valueInput" type="hidden" id="pay_type_value_weekly" name="pay_type_value" value="{{$supplier['pay_type_value'] or ''}}">
<select lay-filter="pay_type_weekly">
<option value="">请选择</option>
<option value="1" @if(array_get($supplier,'pay_type_value')=='1' ) selected='selected' @endif>周一</option>
<option value="2" @if(array_get($supplier,'pay_type_value')=='2' ) selected='selected' @endif>周二</option>
<option value="3" @if(array_get($supplier,'pay_type_value')=='3' ) selected='selected' @endif>周三</option>
<option value="4" @if(array_get($supplier,'pay_type_value')=='4' ) selected='selected' @endif>周四</option>
<option value="5" @if(array_get($supplier,'pay_type_value')=='5' ) selected='selected' @endif>周五</option>
<option value="6" @if(array_get($supplier,'pay_type_value')=='6' ) selected='selected' @endif>周六</option>
<option value="7" @if(array_get($supplier,'pay_type_value')=='7' ) selected='selected' @endif>周日</option>
</select>
</div>
</div>
</div>
@if (!empty($supplier)&&$supplier['pay_type']==2) @if (!empty($supplier)&&$supplier['pay_type']==2)
<div class="pay_type_2_div"> <div class="pay_type_2_div">
<input type="hidden" class="valueInput" name="pay_type_value"> <input type="hidden" class="valueInput" name="pay_type_value">
...@@ -82,7 +87,6 @@ ...@@ -82,7 +87,6 @@
<input type="hidden" class="valueInput" name="" value=""> <input type="hidden" class="valueInput" name="" value="">
</div> </div>
@endif @endif
</div>
</div> </div>
</div> </div>
</div> </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