Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit c766cc51 by 杨树贤
Options

Merge branch 'ysx-供应商需求0807-20230807' into ysx-芯链子母账号-20230802

parents 14736857 0d7f69d9
Inline Side-by-side
Showing with 207 additions and 135 deletions
app/Http/Controllers/Filter/SupplierFilter.php
......@@ -60,8 +60,8 @@ class SupplierFilter
if (!empty($map['purchase_uid'])) {
$query->where('purchase_uid', $map['purchase_uid']);
}
if (!empty($map['uploaded_sku'])) {
$query->where('uploaded_sku', $map['uploaded_sku']);
if (!empty($map['has_uploaded_sku'])) {
$query->where('uploaded_sku', $map['has_uploaded_sku']);
}
if (!empty($map['channel_uid'])) {
$query->where('channel_uid', 'like', "%{$map['channel_uid']}%");
......@@ -219,10 +219,10 @@ class SupplierFilter
//是因为无论什么角色,都可以看到黑名单和禁用供应商
if ($subordinateCodeIds) {
if ($canViewFakeSupplier) {
$query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql
$query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql
or channel_uid REGEXP '$likeSqlRaw' or is_type = 1 or (status = -3 or status = -2)) "));
} else {
$query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql
$query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql
or channel_uid REGEXP '$likeSqlRaw' or (status = -3 or status = -2)) "));
}
} else {
......@@ -411,4 +411,4 @@ class SupplierFilter
}
return $query;
}
}
\ No newline at end of file
}
resources/views/script/SupplierListScript.blade.php
......@@ -62,6 +62,21 @@
$('.hide_filter_type').show();
});
$('#show_filter_row2').click(function () {
let isHidden = $('#filter_row2').is(':hidden');
if (isHidden) {
$('#filter_row2').show();
$('#show_filter_row2').text('隐藏');
} else {
$('#filter_row2').hide();
$('#show_filter_row2').text('展开');
}
});
$(function () {
$('.layui-form .layui-col-md5 .layui-edge').remove();
});
//这个是页面点击刷新方法,隐藏起来是为了页面切换回这个列表的时候触发的
$('#refreshWindow').click(function () {
//判断当前是否有layui弹窗窗口,有的话不刷新
......
resources/views/web/supplier/SupplierListFilter.blade.php
......@@ -17,113 +17,113 @@
</div>
</div>
</div>
{{-- <div class="split-item" id="s2" style="text-align: center">--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="need_review" data-value="-1">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @if(checkPerm('SupplierPendingList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="pending" data-value="0">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierInReviewList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="in_review" data-value="1">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierRejectList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="rejected" data-value="3">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierPassedList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="passed" data-value="2">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- </div>--}}
{{-- <div class="split-item" id="s3" style="text-align: center">--}}
{{-- @if(checkPerm('SupplierNoPurchaseUidList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="非禁用状态的渠道开发员为空的供应商" class="main_filter" id="no_purchase_uid">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierNoChannelUidList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="采购员为空的供应商" class="main_filter" id="no_channel_uid">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierInvalidChannelUidList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="非禁止交易状态联系人绑定的采购员姓名不在组织架构中(采购员离职)的供应商"--}}
{{-- class="main_filter"--}}
{{-- id="invalid_channel_uid">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierInvalidPurchaseUidList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="非禁止交易状态联系人绑定的渠道开发员姓名不在组织架构中(渠道开发员离职)的供应商"--}}
{{-- class="main_filter"--}}
{{-- id="invalid_purchase_uid">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- <div class="layui-row">--}}
{{-- <a title="联系人中存在非必填字段未填写" class="main_filter"--}}
{{-- id="contact_no_complete">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- <div class="split-item" id="s4" style="text-align: center">--}}
{{-- @if(checkPerm('SupplierToFollowUpList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="非禁止交易状态的供应商重新分配渠道员，且必填信息不完整；或者禁用状态的供应商重新分配渠道员"--}}
{{-- class="main_filter"--}}
{{-- id="to_follow_up">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierNoSkuList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="no_sku">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- <div class="layui-row">--}}
{{-- <a title="采购员全离职" class="main_filter" id="all_channel_user_resigned">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- <div class="split-item" id="s5" style="text-align: center">--}}
{{-- @if(checkPerm('SupplierBlockList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="block" data-value="-3">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierDisableList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="disable" data-value="-2">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" title="历史检测异常" id="history_abnormal">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" title="系统标签中贴有客户指定的供应商" id="has_supplier_tag">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- <div class="split-item" id="s2" style="text-align: center">--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="need_review" data-value="-1">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @if(checkPerm('SupplierPendingList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="pending" data-value="0">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierInReviewList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="in_review" data-value="1">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierRejectList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="rejected" data-value="3">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierPassedList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="passed" data-value="2">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- </div>--}}
{{-- <div class="split-item" id="s3" style="text-align: center">--}}
{{-- @if(checkPerm('SupplierNoPurchaseUidList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="非禁用状态的渠道开发员为空的供应商" class="main_filter" id="no_purchase_uid">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierNoChannelUidList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="采购员为空的供应商" class="main_filter" id="no_channel_uid">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierInvalidChannelUidList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="非禁止交易状态联系人绑定的采购员姓名不在组织架构中(采购员离职)的供应商"--}}
{{-- class="main_filter"--}}
{{-- id="invalid_channel_uid">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierInvalidPurchaseUidList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="非禁止交易状态联系人绑定的渠道开发员姓名不在组织架构中(渠道开发员离职)的供应商"--}}
{{-- class="main_filter"--}}
{{-- id="invalid_purchase_uid">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- <div class="layui-row">--}}
{{-- <a title="联系人中存在非必填字段未填写" class="main_filter"--}}
{{-- id="contact_no_complete">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- <div class="split-item" id="s4" style="text-align: center">--}}
{{-- @if(checkPerm('SupplierToFollowUpList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a title="非禁止交易状态的供应商重新分配渠道员，且必填信息不完整；或者禁用状态的供应商重新分配渠道员"--}}
{{-- class="main_filter"--}}
{{-- id="to_follow_up">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierNoSkuList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="no_sku">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- <div class="layui-row">--}}
{{-- <a title="采购员全离职" class="main_filter" id="all_channel_user_resigned">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- <div class="split-item" id="s5" style="text-align: center">--}}
{{-- @if(checkPerm('SupplierBlockList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="block" data-value="-3">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- @if(checkPerm('SupplierDisableList'))--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" id="disable" data-value="-2">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- @endif--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" title="历史检测异常" id="history_abnormal">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- <div class="layui-row">--}}
{{-- <a class="main_filter" title="系统标签中贴有客户指定的供应商" id="has_supplier_tag">--}}
{{-- </a>--}}
{{-- </div>--}}
{{-- </div>--}}
<div class="split-item" id="s6" style="text-align: center">
<div class="layui-row">
<a class="main_filter" title="战略供应商" id="level_a">
......@@ -221,34 +221,96 @@
$routerName = explode('/', request()->path())[1];
?>
<div class="layui-row">
<div class="layui-row">
<div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['supplier_group'=>'供应商性质'],
['supplier_group'=>config('fixed.SupplierGroup')]) !!}
</div>
<div class="layui-inline">
@inject('transformableInputPresenter','App\Presenters\Filter\TransformableInputPresenter')
{!! $transformableInputPresenter->render(['supplier_name'=>'供应商名称']) !!}
</div>
<div class="layui-inline">
@inject('transformableInputPresenter','App\Presenters\Filter\TransformableInputPresenter')
{!! $transformableInputPresenter->render(['supplier_code'=>'供应商编码']) !!}
</div>
<div class="layui-inline">
@inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
{!! $multiSelectorPresenter->render('status','供应商状态','',$statusData) !!}
</div>
<div class="layui-inline">
@inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
{!! $multiSelectorPresenter->render('stockup_type','合作类型','',$stockupTypeData) !!}
</div>
</div>
<div class="layui-row">
<div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['has_sku'=>'SKU上传'],
['has_sku'=>[1=>'是',-1=>'否']]) !!}
</div>
<div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['yunxin_channel_uid' => '线上采购员'],
['yunxin_channel_uid' => $userCodes]) !!}
</div>
<div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['source' => 'SKU上传方式',],
['source'=>config('field.SkuSource')]) !!}
</div>
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('purchase_type','代购类型','',config('field.PurchaseType')) !!}
</div>
<div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['has_uploaded_sku'=>'历史SKU合作'],
['has_uploaded_sku'=>[1=>'是',-1=>'否']]) !!}
</div>
<button class="layui-btn layui-btn-sm" type="button" id="show_filter_row2">展开</button>
</div>
</div>
<div class="layui-row" id="filter_row2" style="display: none">
<div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['supplier_group'=>'供应商性质','company_nature'=>'公司实际性质'],
['supplier_group'=>config('fixed.SupplierGroup'),'company_nature'=>config('field.CompanyNature')]) !!}
{!! $multiTransformableSelectPresenter->render(['company_nature'=>'公司实际性质'],
['company_nature'=>config('field.CompanyNature')]) !!}
</div>
<div class="layui-inline">
@inject('transformableInputPresenter','App\Presenters\Filter\TransformableInputPresenter')
{!! $transformableInputPresenter->render(['supplier_name'=>'供应商名称','supplier_code'=>'供应商编码','group_code'=>'集团编码','supplier_id'=>'供应商ID']) !!}
{!! $transformableInputPresenter->render(['supplier_code'=>'供应商编码']) !!}
</div>
<div class="layui-inline">
@inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
{!! $multiSelectorPresenter->render('status','供应商状态','',$statusData) !!}
@inject('transformableInputPresenter','App\Presenters\Filter\TransformableInputPresenter')
{!! $transformableInputPresenter->render(['group_code'=>'集团编码']) !!}
</div>
<div class="layui-inline">
@inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
{!! $multiSelectorPresenter->render('stockup_type','合作类型','',$stockupTypeData) !!}
@inject('transformableInputPresenter','App\Presenters\Filter\TransformableInputPresenter')
{!! $transformableInputPresenter->render(['supplier_id'=>'供应商ID']) !!}
</div>
<div class="layui-inline">
@inject('transformableSelectPresenter','App\Presenters\Filter\TransformableSelectPresenter')
{!! $transformableSelectPresenter->render(['channel_uid'=>'采购员','purchase_uid'=>'开发员','create_uid'=>'创建人'],$userCodes) !!}
{!! $transformableSelectPresenter->render(['channel_uid'=>'采购员'],$userCodes) !!}
</div>
<div class="layui-inline">
@inject('transformableSelectPresenter','App\Presenters\Filter\TransformableSelectPresenter')
{!! $transformableSelectPresenter->render(['purchase_uid'=>'开发员'],$userCodes) !!}
</div>
<div class="layui-inline">
@inject('transformableSelectPresenter','App\Presenters\Filter\TransformableSelectPresenter')
{!! $transformableSelectPresenter->render(['create_uid'=>'创建人'],$userCodes) !!}
</div>
</div>
<div class="layui-row">
<div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['has_sku'=>'SKU上传','sku_tag'=>'SKU标准','sku_mode'=>'SKU模式','uploaded_sku' => '历史SKU合作','outside_contact_type' => 'SKU上传方式','yunxin_channel_uid' => '线上采购员'],
['has_sku'=>[1=>'是',-1=>'否'], 'sku_tag'=>config('field.SkuTag'),'sku_mode'=>config('field.SkuMode'),'uploaded_sku'=>[1=>'是',-1=>'否'],'outside_contact_type'=>config('field.OutsideContactType'),'yunxin_channel_uid' => $userCodes]) !!}
{!! $multiTransformableSelectPresenter->render(['sku_tag'=>'SKU标准'],
['sku_tag'=>config('field.SkuTag')]) !!}
</div>
<div class="layui-inline">
@inject('multiTransformableSelectPresenter','App\Presenters\Filter\MultiTransformableSelectPresenter')
{!! $multiTransformableSelectPresenter->render(['sku_mode'=>'SKU模式'],
['sku_mode'=>config('field.SkuMode')]) !!}
</div>
<div class="layui-inline">
@inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
......@@ -263,18 +325,14 @@
{!! $multiTransformableSelectPresenter->render(['has_cooperation_agreement'=>'平台合作协议'],
['has_cooperation_agreement'=>[1=>'是',-1=>'否']]) !!}
</div>
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('purchase_type','代购类型','',config('field.PurchaseType')) !!}
<div class="layui-row">
<div class="layui-inline" style="width: 600px">
@inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
{!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间','sku_create_time' => '首次上传sku时间','sku_update_time'=> '最新上传sku时间']) !!}
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 600px">
@inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
{!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间','sku_create_time' => '首次上传sku时间','sku_update_time'=> '最新上传sku时间']) !!}
</div>
</div>
<div class="layui-row" style="margin-top:10px;margin-bottom: 10px;margin-left: 20px;">
<button class="layui-btn layui-btn-sm layui-btn load" id="getSupplierListButton" lay-submit=""
......
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