From 46d83b6bbccf55a9af70081ebb70b0183ace4856 Mon Sep 17 00:00:00 2001
From: xxb <xuxianbin1990820@163.com>
Date: Fri, 10 Sep 2021 10:42:07 +0800
Subject: [PATCH] liche update for admin car search v_id

---
 admin/controllers/auto/Cars.php         |  5 ++++
 admin/controllers/items/goods/Goods.php | 12 +++++---
 admin/views/auto/cars/lists.php         | 40 +++++++++++++++++++++----
 admin/views/items/goods/lists.php       | 10 +++----
 admin/views/items/goods/lists_sold.php  |  2 +-
 5 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/admin/controllers/auto/Cars.php b/admin/controllers/auto/Cars.php
index 737142c6..9e98943d 100644
--- a/admin/controllers/auto/Cars.php
+++ b/admin/controllers/auto/Cars.php
@@ -40,6 +40,11 @@ class Cars extends HD_Controller{
         } else{
             $params['s_id'] = '';
         }
+        if($params['v_id']){
+            $where['v_id'] = $params['v_id'];
+        } else{
+            $params['V_id'] = '';
+        }
         if(strlen($params['status']) > 0){
             $where['status'] = $params['status'];
         } else {
diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php
index 74e20403..cc0f1286 100644
--- a/admin/controllers/items/goods/Goods.php
+++ b/admin/controllers/items/goods/Goods.php
@@ -213,7 +213,7 @@ class Goods extends HD_Controller
                     $rows = $this->mdItems->select_order_fine($where_3, $orderby, $page, $size, $fileds);
                     break;
                 default:
-                    $fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,addr_id';
+                    $fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,out_time,addr_id';
                     $orderby = "{$order} {$sort}";
                     $rows = $this->mdItems->select($where, $orderby, $page, $size, $fileds);
             }
@@ -259,8 +259,11 @@ class Goods extends HD_Controller
                 $str_ids = implode(',', $addr_ids);
                 $where = array("id in ({$str_ids})" => null);
                 $orderby = 'id desc';
-                $select = 'id, title';
-                $map_addr = $this->addr_model->map('id', 'title', $where, $orderby, 0, 0, $select);
+                $select = 'id, title, city_name, county_name';
+                $rows_addr = $this->addr_model->select($where, $orderby, 0, 0, $select);
+                foreach($rows_addr as $v){
+                    $map_addr[$v['id']] = "{$v['city_name']} {$v['county_name']} {$v['title']}";
+                }
             }
 
             $map_fine = array();
@@ -350,7 +353,8 @@ class Goods extends HD_Controller
                     'incor_name' => $map_incorid[$v['incor_id']],
                     'vin' => $v['vin'],
                     'address' => $v['addr_id'] ? $map_addr[$v['addr_id']] : '',
-                    'in_time' => '0000-00-00 00:00:00' == $v['in_time'] ? '' : $v['in_time'],
+                    'in_time' => '0000-00-00 00:00:00' == $v['in_time'] ? '' : substr($v['in_time'], 0, 10),
+                    'out_time' => '0000-00-00 00:00:00' == $v['out_time'] ? '' : substr($v['out_time'], 0, 10),
                     'fine_ids' => $map_fine[$v['id']] ? $map_fine[$v['id']] : array(),
                     'admin_name' => $admin ? $admin['admin_name'] : '',
                 );
diff --git a/admin/views/auto/cars/lists.php b/admin/views/auto/cars/lists.php
index d1bd9954..8f857c61 100644
--- a/admin/views/auto/cars/lists.php
+++ b/admin/views/auto/cars/lists.php
@@ -4,22 +4,25 @@
         <form action="/auto/cars/lists" class="form-search" onsubmit="return false">
         <div class="am-form am-form-horizontal">
             <div class="am-form-group fl">
-                <label class="am-para-label">品牌：</label>
+                <label class="am-para-label">车辆属性：</label>
                 <div class="am-para-inline w150">
                     <select name="brand_id" v-model="params.brand_id">
-                        <option value="">请选择</option>
+                        <option value="">选择品牌</option>
                         <option :value="i" v-for="(v,i) in brandAry">{{v}}</option>
                     </select>
                 </div>
-            </div>
-            <div class="am-form-group fl">
-                <label class="am-para-label">车系：</label>
                 <div class="am-para-inline w150">
                     <select name="s_id" v-model="params.s_id">
-                        <option value="">请选择</option>
+                        <option value="">选择车系</option>
                         <option :value="i" v-for="(v,i) in seryAry">{{v}}</option>
                     </select>
                 </div>
+                <div class="am-para-inline w120">
+                    <select name="v_id" v-model="params.v_id">
+                        <option value="">选择车型</option>
+                        <option :value="v.id" v-for="(v,i) in attrvAry">{{v.title}}</option>
+                    </select>
+                </div>
             </div>
             <div class="am-form-group fl">
                 <label class="am-para-label">状态：</label>
@@ -141,6 +144,7 @@
                 statusAry:[],
                 brandAry:[],
                 seryAry:[],
+                attrvAry:[],
                 info_edit:{}
             },
             mounted:function() {
@@ -244,6 +248,30 @@
                     } else {
                         vm.params.s_id = '';
                     }
+                },
+                'params.s_id':function(nv, ov){
+                    var vm = this;
+                    if (nv > 0) {
+                        //型号
+                        $.ajax({
+                            type: 'post',
+                            url: '/auto/attr/json_lists',
+                            dataType: 'json',
+                            data: {
+                                s_id: nv,
+                                status: 1,
+                                type: 1
+                            },
+                            success: function (response) {
+                                if (response.code == 1) {
+                                    vm.attrvAry = response.data.list;
+                                }
+                            }
+                        });
+                    } else {
+                        vm.attrvAry = [];
+                        vm.params.v_id = '';
+                    }
                 }
             }
         });
diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php
index cb2f58d4..d743b361 100644
--- a/admin/views/items/goods/lists.php
+++ b/admin/views/items/goods/lists.php
@@ -182,7 +182,7 @@
 <!--            </div>-->
             <div class="am-form-group">
                 <label class="am-para-label w100">车架号：</label>
-                <div class="am-para-inline w120">
+                <div class="am-para-inline w200">
                     <input type="text" name="vin" placeholder="车架号关键字" v-model="params.vin" />
                 </div>
             </div>
@@ -243,7 +243,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="15%">
+                <th width="10%">
                     <span :class="'order'+('vin'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('vin')">
                             <span>车架号</span>
@@ -252,7 +252,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="15%">
+                <th width="20%">
                     <span :class="'order'+('addr_id'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('addr_id')">
                             <span>存放地</span>
@@ -261,7 +261,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="15%">
+                <th width="10%">
                     <span :class="'order'+('in_time'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('in_time')">
                             <span>入库日期</span>
@@ -270,7 +270,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="15%">
+                <th width="20%">
                     <span :class="'order'+('fine_num'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('fine_num')">
                             <span>精品加装</span>
diff --git a/admin/views/items/goods/lists_sold.php b/admin/views/items/goods/lists_sold.php
index 200236a6..9fd34931 100644
--- a/admin/views/items/goods/lists_sold.php
+++ b/admin/views/items/goods/lists_sold.php
@@ -169,7 +169,7 @@
             </div>
             <div class="am-form-group">
                 <label class="am-para-label w100">车架号：</label>
-                <div class="am-para-inline w120">
+                <div class="am-para-inline w200">
                     <input type="text" name="vin" placeholder="车架号关键字" v-model="params.vin" />
                 </div>
             </div>