搜索

app-ghs/controllers/PurchaseOrderController.php

@@ -632,7 +632,7 @@ class PurchaseOrderController extends BaseController
         $where = [];
         $get = Yii::$app->request->get();
         $export = $get['export'] ?? 0;
-        $search = $get['search'] ?? '';
+
         $where['shopId'] = $this->shopId;
         $orderStatus = $get['status'] ?? '';
         if ($orderStatus) {
@@ -642,22 +642,25 @@ class PurchaseOrderController extends BaseController
         if (!empty($ghsId)) {
             $where['ghsId'] = $ghsId;
         }
+        $search = '';
+        $name1 = $get['search'] ?? '';
+        if(!empty($name1)){
+            $search = $name1;
+        }
+        $name2 = $get['name'] ?? '';
+        if(!empty($name2)){
+            $search = $name2;
+        }
         if (!empty($search)) {
+            $ret = strstr($search, 'PH');
             if (is_numeric($search) && strlen($search) == 4) {
                 $where['checkCode'] = $search;
+            }elseif(!empty($ret)){
+                $where['orderSn'] = $search;
             } else {
                 $where['ghsName'] = ['like', $search];
             }
         }
-        $name = $get['name'] ?? '';
-        if (!empty($name)) {
-            $re = strstr($name, 'PH');
-            if (!empty($re)) {
-                $where['orderSn'] = $name;
-            } else {
-                $where['ghsName'] = ['like', $name];
-            }
-        }
         $searchTime = $get['searchTime'] ?? '';
         if (!empty($searchTime)) {
             $startTime = $get['startTime'] ?? '';