From 13b979c314e7af2b0b09e70d7af46d92657650c0 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Fri, 15 Oct 2021 11:15:04 +0800
Subject: [PATCH] admin_orders_1015

---
 admin/controllers/Common.php          | 15 ++++++---------
 admin/views/receiver/orders/get.php   |  2 +-
 admin/views/receiver/orders/oinfo.php | 24 ++++++++++++------------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/admin/controllers/Common.php b/admin/controllers/Common.php
index 69a7ca83..3fc915c1 100644
--- a/admin/controllers/Common.php
+++ b/admin/controllers/Common.php
@@ -1454,15 +1454,12 @@ class Common extends CI_Controller
         $page = $this->input->post('page') ? intval($this->input->post('page')) : 1;
         $size = $this->input->post('size') ? intval($this->input->post('size')) : 10;
         $where = "status=1 ";
-        if ($vin) {
-            $where .= " and vin='{$vin}'";
-        } else {
-            $brand_id && $where .= " and brand_id=$brand_id";
-            $s_id && $where .= " and s_id=$s_id";
-            $v_id && $where .= " and v_id=$v_id";
-            $cor_id && $where .= " and cor_id=$cor_id";
-            $incor_id && $where .= " and incor_id=$incor_id";
-        }
+        $vin && $where .= ' and vin LIKE "%' . trim($vin) . '%"';
+        $brand_id && $where .= " and brand_id=$brand_id";
+        $s_id && $where .= " and s_id=$s_id";
+        $v_id && $where .= " and v_id=$v_id";
+        $cor_id && $where .= " and cor_id=$cor_id";
+        $incor_id && $where .= " and incor_id=$incor_id";
 
         if ($select_id) {
             $fhwhere = [
diff --git a/admin/views/receiver/orders/get.php b/admin/views/receiver/orders/get.php
index a6165f64..7c804dd7 100644
--- a/admin/views/receiver/orders/get.php
+++ b/admin/views/receiver/orders/get.php
@@ -357,7 +357,7 @@
                     that.getCars(1);
                     layer.open({
                         type: 1,
-                        area: ['50%', '80%'], //宽高
+                        area: ['60%', '85%'], //宽高
                         content: $('#car-modal'),
                         title: '选择车辆',
                         shade: false,
diff --git a/admin/views/receiver/orders/oinfo.php b/admin/views/receiver/orders/oinfo.php
index cda23021..34cbe517 100644
--- a/admin/views/receiver/orders/oinfo.php
+++ b/admin/views/receiver/orders/oinfo.php
@@ -112,14 +112,14 @@
 </div>
 <div id="car-modal" style="display: none;">
     <div class="modal-body">
-        <form class="form-search coms-table-hd clearfix no-border" action="">
+        <form class="form-search coms-table-hd clearfix no-border" action="" style="padding-left: 0px;padding-right: 0px;">
             <input type="hidden" name="status_pid"
                    value="<?= $params['status_pid'] != -99 ? $params['status_pid'] : '' ?>">
             <input type="hidden" name="status_id" value="<?= $params['status_id'] ?>">
             <div class="am-form am-form-horizontal">
                 <div class="am-form-group fl">
-                    <label class="am-para-label" style="width:auto">品牌：</label>
-                    <div class="am-para-inline w80">
+                    <label class="am-para-label w60">品牌:</label>
+                    <div class="am-para-inline w100">
                         <select v-model="brand_id">
                             <option v-for="item in brand_list" :value="item.id">
                                 {{item.name}}
@@ -128,8 +128,8 @@
                     </div>
                 </div>
                 <div class="am-form-group fl">
-                    <label class="am-para-label" style="width:auto">车系：</label>
-                    <div class="am-para-inline w80">
+                    <label class="am-para-label w50">车系:</label>
+                    <div class="am-para-inline w100">
                         <select v-model="s_id">
                             <option value="0">全部</option>
                             <option v-for="item in series_list" :value="item.id">
@@ -139,8 +139,8 @@
                     </div>
                 </div>
                 <div class="am-form-group fl">
-                    <label class="am-para-label" style="width:auto">车辆级别：</label>
-                    <div class="am-para-inline w80">
+                    <label class="am-para-label w80">车辆级别:</label>
+                    <div class="am-para-inline w100">
                         <select v-model="v_id">
                             <option value="0">全部</option>
                             <option v-for="item in v_list" :value="item.id">
@@ -150,7 +150,7 @@
                     </div>
                 </div>
                 <div class="am-form-group fl">
-                    <label class="am-para-label" style="width:auto">车身颜色：</label>
+                    <label class="am-para-label w80">车身颜色:</label>
                     <div class="am-para-inline w80">
                         <select v-model="cor_id">
                             <option value="0">全部</option>
@@ -161,7 +161,7 @@
                     </div>
                 </div>
                 <div class="am-form-group fl">
-                    <label class="am-para-label" style="width:auto">内饰颜色：</label>
+                    <label class="am-para-label w80">内饰颜色:</label>
                     <div class="am-para-inline w80">
                         <select v-model="incor_id">
                             <option value="0">全部</option>
@@ -172,13 +172,13 @@
                     </div>
                 </div>
                 <div class="am-form-group fl">
-                    <label class="am-para-label" style="width:auto">车架号：</label>
-                    <div class="am-para-inline w80">
+                    <label class="am-para-label w60">车架号:</label>
+                    <div class="am-para-inline">
                         <input type="text" v-model="vin"/>
                     </div>
                 </div>
                 <div class="am-form-group fl">
-                    <div class="am-form-group fl ml5">
+                    <div class="am-form-group fl ml10">
                         <a href="javascript:;" @click="carModal" class="am-btn am-btn-success am-btn-sm w100">搜索</a>
                     </div>
                 </div>