Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 62204f8f by 杨树贤
Options

解决冲突

parents 11ace591 4b5f88eb
Inline Side-by-side
Showing with 29 additions and 0 deletions
app/Http/Controllers/Filter/SupplierFilter.php
...@@ -306,6 +306,9 @@ class SupplierFilter ...@@ -306,6 +306,9 @@ class SupplierFilter
break; break;
case "level_a": case "level_a":
$query->where('level', 'A'); $query->where('level', 'A');
break;
case "pay_type_term":
$query->where('pay_type', 1);
} }
return $query; return $query;
} }
......
app/Http/Services/SupplierStatisticsService.php
...@@ -55,6 +55,8 @@ class SupplierStatisticsService ...@@ -55,6 +55,8 @@ class SupplierStatisticsService
//历史检测异常 //历史检测异常
$historyAbnormal = $this->getStatisticsCount('history_abnormal'); $historyAbnormal = $this->getStatisticsCount('history_abnormal');
//战略供应商(等级为A) //战略供应商(等级为A)
$payTypeTerm = $this->getStatisticsCount('pay_type_term');
//账期供应商
$levelA = $this->getStatisticsCount('level_a'); $levelA = $this->getStatisticsCount('level_a');
$result = [ $result = [
'total' => $total, 'total' => $total,
...@@ -75,6 +77,7 @@ class SupplierStatisticsService ...@@ -75,6 +77,7 @@ class SupplierStatisticsService
'has_supplier_tag' => $hasTagSupplier, 'has_supplier_tag' => $hasTagSupplier,
'contact_no_complete' => $concatNoComplete, 'contact_no_complete' => $concatNoComplete,
'history_abnormal' => $historyAbnormal, 'history_abnormal' => $historyAbnormal,
'pay_type_term' => $payTypeTerm,
'level_a' => $levelA, 'level_a' => $levelA,
]; ];
$result = array_map(function ($value) { $result = array_map(function ($value) {
......
config/fixed.php
...@@ -236,6 +236,7 @@ return [ ...@@ -236,6 +236,7 @@ return [
'has_supplier_tag' => '客户指定供应商', 'has_supplier_tag' => '客户指定供应商',
'history_abnormal' => '历史检测异常', 'history_abnormal' => '历史检测异常',
'level_a' => '战略供应商', 'level_a' => '战略供应商',
'pay_type_term' => '账期供应商',
], ],
//Sku列表的罗盘对应菜单id //Sku列表的罗盘对应菜单id
'SkuListCompassMenuMap' => [ 'SkuListCompassMenuMap' => [
......
resources/views/web/supplier/SupplierListCommon.blade.php
...@@ -126,6 +126,10 @@ ...@@ -126,6 +126,10 @@
<a class="main_filter" title="战略供应商" id="level_a"> <a class="main_filter" title="战略供应商" id="level_a">
</a> </a>
</div> </div>
<div class="layui-row">
<a class="main_filter" title="账期供应商" id="pay_type_term">
</a>
</div>
</div> </div>
<div class="split-item" id="s7" style="text-align: center"> <div class="split-item" id="s7" style="text-align: center">
......
resources/views/web/supplier/SupplierPayType.blade.php
...@@ -26,11 +26,26 @@ ...@@ -26,11 +26,26 @@
value="{{$supplier['pay_type_value'] or ''}}"> value="{{$supplier['pay_type_value'] or ''}}">
<select lay-filter="pay_type_month"> <select lay-filter="pay_type_month">
<option value="">请选择</option> <option value="">请选择</option>
<option value="7"
@if($supplier['pay_type_value']==7)
selected='selected'
@endif>7
</option>
<option value="15"
@if($supplier['pay_type_value']==15)
selected='selected'
@endif>15
</option>
<option value="30" <option value="30"
@if($supplier['pay_type_value']==30) @if($supplier['pay_type_value']==30)
selected='selected' selected='selected'
@endif>30 @endif>30
</option> </option>
<option value="45"
@if($supplier['pay_type_value']==45)
selected='selected'
@endif>45
</option>
<option value="60" <option value="60"
@if($supplier['pay_type_value']==60) @if($supplier['pay_type_value']==60)
selected='selected' selected='selected'
...@@ -55,7 +70,10 @@ ...@@ -55,7 +70,10 @@
<input class="layui-input valueInput" type="hidden" name="pay_type_value"> <input class="layui-input valueInput" type="hidden" name="pay_type_value">
<select lay-filter="pay_type_month"> <select lay-filter="pay_type_month">
<option value="">请选择</option> <option value="">请选择</option>
<option value="30">7</option>
<option value="30">15</option>
<option value="30">30</option> <option value="30">30</option>
<option value="30">45</option>
<option value="60">60</option> <option value="60">60</option>
<option value="90">90</option> <option value="90">90</option>
</select> </select>
......
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