Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit bd411744 by 杨树贤
Options

修复字段

parent d6e47ec7
Inline Side-by-side
Showing with 22 additions and 27 deletions
app/Http/Services/SupplierContractService.php
...@@ -55,7 +55,7 @@ class SupplierContractService ...@@ -55,7 +55,7 @@ class SupplierContractService
if ($oldData) { if ($oldData) {
$columnMap = [ $columnMap = [
'supplier_id' => '供应商', 'supplier_id' => '供应商',
'end_time' => '截止时间', 'end_time' => '合同有效期',
'commission_rate' => '抽佣比率', 'commission_rate' => '抽佣比率',
'check_date' => '对账日期', 'check_date' => '对账日期',
]; ];
......
app/Http/Transformers/SupplierContractTransformer.php
...@@ -21,7 +21,7 @@ class SupplierContractTransformer ...@@ -21,7 +21,7 @@ class SupplierContractTransformer
'Y-m-d H:i:s', 'Y-m-d H:i:s',
$contract['update_time'] $contract['update_time']
) : ''; ) : '';
$contract['valid_date'] = date('Y-m-d H:i:s', $contract['start_time']) . ' 至 ' . date('Y-m-d H:i:s', $contract['end_time']); $contract['valid_date'] = date('Y-m-d H:i:s', $contract['end_time']);
} }
unset($contract); unset($contract);
return $list; return $list;
......
resources/views/web/SavePurchaseRemark.blade.php
...@@ -7,19 +7,23 @@ ...@@ -7,19 +7,23 @@
<div class="layui-card-body"> <div class="layui-card-body">
<form class="layui-form" action=""> <form class="layui-form" action="">
<div class="layui-form-item"> <div class="layui-form-item">
@inject('singleSelectPresenter','App\Presenters\SingleSelectPresenter') @inject('singleSelectPresenter', 'App\Presenters\SingleSelectPresenter')
{!! $singleSelectPresenter->render('participate_type','参与类型 :',!empty($remark)?$remark['participate_type']:1,config('field.PurchaseRemarkParticipateType'),['required'=>true,'disable' => !empty($remark)?true:false]) !!} {!! $singleSelectPresenter->render(
'participate_type',
'参与类型 :',
!empty($remark) ? $remark['participate_type'] : 1,
config('field.PurchaseRemarkParticipateType'),
['required' => true, 'disable' => !empty($remark) ? true : false],
) !!}
</div> </div>
<input type="hidden" name="id" value="{{$remark['id'] or ''}}"> <input type="hidden" name="id" value="{{ $remark['id'] or '' }}">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>参与内容 : </label> <label class="layui-form-label"><span style="color: red">*</span>参与内容 : </label>
<div class="layui-input-block"> <div class="layui-input-block">
<div id="participate_content_div"> <div id="participate_content_div">
<textarea rows="7" name="participate_content" <textarea rows="7" name="participate_content" placeholder="请输入 型号/标准品牌 全称，多个以英文逗号隔开,如果选择品牌类型,会去校验标准品牌是否正确"
placeholder="请输入 型号/标准品牌 全称，多个以英文逗号隔开,如果选择品牌类型,会去校验标准品牌是否正确" class="layui-textarea @if (empty($remark) || (!empty($remark) && $remark['participate_type'] == 1)) layui-disabled @endif"
class="layui-textarea @if(empty($remark) || (!empty($remark) && $remark['participate_type']==1)) layui-disabled @endif" @if (empty($remark) || (!empty($remark) && $remark['participate_type'] == 1)) disabled @endif id="participate_content">{{ $remark['participate_content'] or '' }}</textarea>
@if(empty($remark)|| (!empty($remark) && $remark['participate_type']==1)) disabled @endif
id="participate_content">{{$remark['participate_content'] or ''}}</textarea>
</div> </div>
<blockquote class="layui-elem-quote layui-text"> <blockquote class="layui-elem-quote layui-text">
<b style="color: red" id="checkStandardBrandNameResult"></b> <b style="color: red" id="checkStandardBrandNameResult"></b>
...@@ -31,11 +35,8 @@ ...@@ -31,11 +35,8 @@
<div class="layui-input-block"> <div class="layui-input-block">
<div class="layui-col-xs4"> <div class="layui-col-xs4">
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="start_time" name="start_time" <input type="text" id="start_time" name="start_time" placeholder="请输入开始时间"
placeholder="请输入开始时间" class="layui-input" autocomplete="off" value="{{ $remark['start_time'] or '' }}">
class="layui-input"
autocomplete="off"
value="{{$remark['start_time'] or ''}}">
</div> </div>
</div> </div>
<div class="layui-col-xs1"> <div class="layui-col-xs1">
...@@ -43,11 +44,8 @@ ...@@ -43,11 +44,8 @@
</div> </div>
<div class="layui-col-xs7" style="margin-left: -25px"> <div class="layui-col-xs7" style="margin-left: -25px">
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="end_time" name="end_time" <input type="text" id="end_time" name="end_time" placeholder="请输入合同有效期"
placeholder="请输入截止时间" class="layui-input" autocomplete="off" value="{{ $remark['end_time'] or '' }}">
class="layui-input"
autocomplete="off"
value="{{$remark['end_time'] or ''}}">
</div> </div>
</div> </div>
</div> </div>
...@@ -55,22 +53,20 @@ ...@@ -55,22 +53,20 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>备注内容 : </label> <label class="layui-form-label"><span style="color: red">*</span>备注内容 : </label>
<div class="layui-input-block"> <div class="layui-input-block">
<textarea rows="7" name="remark" placeholder="活动内容（展示在【询报价系统】供销售查看的内容通知）" <textarea rows="7" name="remark" placeholder="活动内容（展示在【询报价系统】供销售查看的内容通知）" class="layui-textarea" id="remark">{{ $remark['remark'] or '' }}</textarea>
class="layui-textarea"
id="remark">{{$remark['remark'] or ''}}</textarea>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div align="right" style="margin-top: 20px"> <div align="right" style="margin-top: 20px">
<button type="button" class="layui-btn layui-btn-sm layui-btn-info submit-loading" lay-submit <button type="button" class="layui-btn layui-btn-sm layui-btn-info submit-loading" lay-submit
lay-filter="savePurchaseRemark">确认 lay-filter="savePurchaseRemark">确认
</button> </button>
<button type="button" class="layui-btn layui-btn-sm layui-btn-primary" lay-submit <button type="button" class="layui-btn layui-btn-sm layui-btn-primary" lay-submit
lay-filter="cancel">关闭 lay-filter="cancel">关闭
</button> </button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
\ 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