Commit c766cc51 by 杨树贤

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

parents 14736857 0d7f69d9
...@@ -60,8 +60,8 @@ class SupplierFilter ...@@ -60,8 +60,8 @@ class SupplierFilter
if (!empty($map['purchase_uid'])) { if (!empty($map['purchase_uid'])) {
$query->where('purchase_uid', $map['purchase_uid']); $query->where('purchase_uid', $map['purchase_uid']);
} }
if (!empty($map['uploaded_sku'])) { if (!empty($map['has_uploaded_sku'])) {
$query->where('uploaded_sku', $map['uploaded_sku']); $query->where('uploaded_sku', $map['has_uploaded_sku']);
} }
if (!empty($map['channel_uid'])) { if (!empty($map['channel_uid'])) {
$query->where('channel_uid', 'like', "%{$map['channel_uid']}%"); $query->where('channel_uid', 'like', "%{$map['channel_uid']}%");
...@@ -219,10 +219,10 @@ class SupplierFilter ...@@ -219,10 +219,10 @@ class SupplierFilter
//是因为无论什么角色,都可以看到黑名单和禁用供应商 //是因为无论什么角色,都可以看到黑名单和禁用供应商
if ($subordinateCodeIds) { if ($subordinateCodeIds) {
if ($canViewFakeSupplier) { 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)) ")); or channel_uid REGEXP '$likeSqlRaw' or is_type = 1 or (status = -3 or status = -2)) "));
} else { } 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)) ")); or channel_uid REGEXP '$likeSqlRaw' or (status = -3 or status = -2)) "));
} }
} else { } else {
...@@ -411,4 +411,4 @@ class SupplierFilter ...@@ -411,4 +411,4 @@ class SupplierFilter
} }
return $query; return $query;
} }
} }
\ No newline at end of file
...@@ -62,6 +62,21 @@ ...@@ -62,6 +62,21 @@
$('.hide_filter_type').show(); $('.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 () { $('#refreshWindow').click(function () {
//判断当前是否有layui弹窗窗口,有的话不刷新 //判断当前是否有layui弹窗窗口,有的话不刷新
......
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