状态显示已删除

app/Model/QuoteModel.php

@@ -3,6 +3,7 @@
 namespace App\Model;
 namespace App\Model;
 
 
 use App\Http\Services\UserService;
 use App\Http\Services\UserService;
+use App\Http\Utils\AppType;
 use App\Http\Utils\RequestHelper;
 use App\Http\Utils\RequestHelper;
 use App\map\InquiryMap;
 use App\map\InquiryMap;
 use App\map\OperationLogMap;
 use App\map\OperationLogMap;
@@ -189,7 +190,12 @@ class QuoteModel extends Model
 
 
         $map['create_uid'] = isset($input['create_uid']) ? $input['create_uid'] : ''; // 报价制单人
         $map['create_uid'] = isset($input['create_uid']) ? $input['create_uid'] : ''; // 报价制单人
         if ($type == 1) {
         if ($type == 1) {
-            $list = $list->where('q.create_uid', $input['user_id'])->whereNotIn('q.status', [0, -1, 9]); // 过滤报价草稿
+            $list = $list->where('q.create_uid', $input['user_id'])->whereNotIn('q.status', [0, -1]); // 过滤报价草稿
+            // 如果是云芯的，过滤已删除状态
+            if (RequestHelper::getClientType() == AppType::APPTYPE_YUNXIN){
+                $list = $list->where('q.status', '<>', QuoteModel::STATUS_DEL);
+            }
+
         } elseif ($type == 2) {
         } elseif ($type == 2) {
             $perm = new PermController;
             $perm = new PermController;
             $role = $perm->getUserRole($input['user_id'], $input['email']); // 用户角色
             $role = $perm->getUserRole($input['user_id'], $input['email']); // 用户角色
@@ -199,15 +205,15 @@ class QuoteModel extends Model
                 $list = $list->whereIn('q.create_uid', $sub_sale_ids);
                 $list = $list->whereIn('q.create_uid', $sub_sale_ids);
             }
             }
 
 
-            $list = $list->whereNotIn('q.status', [0, -1, 9]); // 过滤报价草稿
+            $list = $list->whereNotIn('q.status', [0, -1]); // 过滤报价草稿
         } elseif ($type == 3) {
         } elseif ($type == 3) {
             $list = $list->where('q.status', 0)->whereIn('q.inquiry_items_id', explode(',', $input['inquiry_items_ids']));
             $list = $list->where('q.status', 0)->whereIn('q.inquiry_items_id', explode(',', $input['inquiry_items_ids']));
         } elseif (@$input['inquiry_items_id'] > 0) {
         } elseif (@$input['inquiry_items_id'] > 0) {
-            $list = $list->whereNotIn('q.status', [0, -1, 9])->where('q.inquiry_items_id', $input['inquiry_items_id']);
+            $list = $list->whereNotIn('q.status', [0, -1])->where('q.inquiry_items_id', $input['inquiry_items_id']);
         } elseif (isset($input['inquiry_items_ids']) && $input['inquiry_items_ids']) {
         } elseif (isset($input['inquiry_items_ids']) && $input['inquiry_items_ids']) {
             $inquiry_items_ids = explode(",", $input['inquiry_items_ids']);
             $inquiry_items_ids = explode(",", $input['inquiry_items_ids']);
             $inquiry_items_ids = array_values(array_filter($inquiry_items_ids));
             $inquiry_items_ids = array_values(array_filter($inquiry_items_ids));
-            $list = $list->whereNotIn('q.status', [0, -1, 9])->whereIn('q.inquiry_items_id', $inquiry_items_ids);
+            $list = $list->whereNotIn('q.status', [0, -1])->whereIn('q.inquiry_items_id', $inquiry_items_ids);
         }
         }
 
 
         if ($map['create_uid']) { // 制单人
         if ($map['create_uid']) { // 制单人