修正表单远程关联字段显示

修正发货单物流信息无法填写
修正发货单直营物流信息无法填写
去掉没有使用的字段类型

app/Gdoo/Customer/Controllers/CustomerController.php

@@ -283,11 +283,11 @@ class CustomerController extends DefaultController
 
             $model->addSelect(DB::raw('cda.*'));
 
+            if ($query['q']) {
+                $model->whereRaw("(customer.code like '%{$query['q']}%' or customer.name like '%{$query['q']}%')");
+            }
+
             if ($query['suggest']) {
-                if ($query['q']) {
-                    $q = $query['q'];
-                    $model->whereRaw("(customer.code like '%$q%' or customer.name like '%$q%')");
-                }
                 $rows = $model->limit(15)->get();
                 $data = Grid::dataFilters($rows, $header, function($item) {
                     return $item;

app/Gdoo/Customer/Controllers/DeliveryAddressController.php

@@ -131,17 +131,10 @@ class DeliveryAddressController extends DefaultController
                 }
             }
 
-            if (isset($query['select2']) && $query['q']) {
+            if ($query['q']) {
                 $model->where('customer_delivery_address.address', 'like', '%'. $query['q'] .'%');
             }
 
-            // 搜索条件
-            foreach ($search['where'] as $where) {
-                if ($where['active']) {
-                    $model->search($where);
-                }
-            }
-
             $model->whereRaw('customer_delivery_address.customer_id > 0 and customer_delivery_address.customer_id = ?', [$query['customer_id']]);
             
             $header['select'][] = 'customer_delivery_address.id';