待确认

app/Http/Controllers/Filter/SupplierFilter.php

@@ -305,15 +305,24 @@ class SupplierFilter
         $canViewFakeSupplier = checkPerm('ViewFakeSupplier');
         $canViewFakeSupplier = checkPerm('ViewFakeSupplier');
         $canViewBlockSupplier = checkPerm('ViewBlockSupplier');
         $canViewBlockSupplier = checkPerm('ViewBlockSupplier');
         $canViewDisableSupplier = checkPerm('ViewDisableSupplier');
         $canViewDisableSupplier = checkPerm('ViewDisableSupplier');
+        $canViewConfirmSupplier = checkPerm('ViewConfirmSupplier');
         // 构建复合查询条件：基础条件 OR 特殊状态
         // 构建复合查询条件：基础条件 OR 特殊状态
-        $query->where(function ($mainQuery) use ($canViewFakeSupplier, $canViewBlockSupplier, $canViewDisableSupplier, $userId, $codeId, $canViewAllSupplier, $canViewSubordinateSupplier) {
+        $query->where(function ($mainQuery) use ($canViewFakeSupplier, $canViewBlockSupplier, $canViewDisableSupplier, $canViewConfirmSupplier, $userId, $codeId, $canViewAllSupplier, $canViewSubordinateSupplier) {
             // 主要条件组：基础业务条件
             // 主要条件组：基础业务条件
-            $mainQuery->where(function ($baseQuery) use ($canViewFakeSupplier, $userId, $codeId, $canViewAllSupplier, $canViewSubordinateSupplier) {
+            $mainQuery->where(function ($baseQuery) use ($canViewFakeSupplier, $canViewConfirmSupplier, $userId, $codeId, $canViewAllSupplier, $canViewSubordinateSupplier) {
                 // 基础类型限制
                 // 基础类型限制
                 if (!$canViewFakeSupplier) {
                 if (!$canViewFakeSupplier) {
                     $baseQuery->where('is_type', 0);
                     $baseQuery->where('is_type', 0);
                 }
                 }
 
 
+                // 如果没有查看待确认供应商权限，过滤掉待确认和CRM转移供应商不通过状态的供应商
+                if (!$canViewConfirmSupplier) {
+                    $baseQuery->whereNotIn('status', [
+                        SupplierChannelModel::STATUS_CONFIRM,
+                        SupplierChannelModel::STATUS_CRM_REJECTED
+                    ]);
+                }
+
                 // 权限相关的条件
                 // 权限相关的条件
                 if (!$canViewAllSupplier) {
                 if (!$canViewAllSupplier) {
                     if ($canViewSubordinateSupplier) {
                     if ($canViewSubordinateSupplier) {
@@ -352,6 +361,10 @@ class SupplierFilter
             if ($canViewDisableSupplier && !checkPerm('ViewAllSupplier')) {
             if ($canViewDisableSupplier && !checkPerm('ViewAllSupplier')) {
                 $mainQuery->orWhere('status', SupplierChannelModel::STATUS_DISABLE);
                 $mainQuery->orWhere('status', SupplierChannelModel::STATUS_DISABLE);
             }
             }
+            if ($canViewConfirmSupplier && !checkPerm('ViewAllSupplier')) {
+                $mainQuery->orWhere('status', SupplierChannelModel::STATUS_CONFIRM);
+                $mainQuery->orWhere('status', SupplierChannelModel::STATUS_CRM_REJECTED);
+            }
 
 
             // //只有原厂、代理商需要走权限,其他性质的随便看
             // //只有原厂、代理商需要走权限,其他性质的随便看
             // if (!checkPerm('ViewAllSupplier')) {
             // if (!checkPerm('ViewAllSupplier')) {