From a09909c203b96cf97d905a988f3a6b204527b9c7 Mon Sep 17 00:00:00 2001
From: xxb <xuxianbin1990820@163.com>
Date: Fri, 10 Sep 2021 14:14:03 +0800
Subject: [PATCH] liche update for admin goods sold lists

---
 admin/controllers/items/goods/Goods.php | 15 +++++++-----
 admin/controllers/receiver/Orders.php   |  9 +++++++
 admin/views/items/goods/lists.php       | 32 ++++++++++++-------------
 admin/views/items/goods/lists_sold.php  | 17 ++++++-------
 admin/views/receiver/orders/oinfo.php   | 22 ++++++++---------
 5 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php
index cc0f1286..ee9ee632 100644
--- a/admin/controllers/items/goods/Goods.php
+++ b/admin/controllers/items/goods/Goods.php
@@ -95,20 +95,23 @@ class Goods extends HD_Controller
             $params['addr_id'] = '';
         }
 
-        if(2 == $params['status']){//已售
+        if(strlen($params['status'])>0){
             $where['status'] = $params['status'];
             $where_1['m.status'] = $params['status'];
             $where_2['m.status'] = $params['status'];
             $where_3['m.status'] = $params['status'];
+        } else {
+            $params['status'] = '';
+        }
+
+        if(1 == $params['sold']){//已售
+            $where["bill_time<>'0000-00-00 00:00:00'"] = null;
             $view = '/items/goods/lists_sold';
             $_title = '已售车辆';
         } else {
-            $where['status'] = 1;
-            $where_1['m.status'] = 1;
-            $where_2['m.status'] = 1;
-            $where_3['m.status'] = 1;
+            $where["bill_time"] = '0000-00-00 00:00:00';
             $view = '/items/goods/lists';
-            $_title = '未售车辆';
+            $_title = '库存车辆';
         }
 
         if($params['vin']){
diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index b51fde41..692b0bc5 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -281,6 +281,15 @@ class Orders extends HD_Controller{
         $file && $update['file'] = $file;
         $result = $this->order_bills_model->update($update,['id'=>$id]);
         if($result){
+            //更新开票时间
+            $row = $this->order_bills_model->get(['id'=>$id]);
+            $row_order = $this->orders_model->get(array('id' => $row['o_id']));
+            if($row_order){
+                $this->load->model('items/items_model');
+                $upd = array('bill_time' => time());
+                $where = array('id' => $row_order['item_id']);
+                $ret = $this->items_model->update($upd, $where);
+            }
             return $this->show_json(SYS_CODE_SUCCESS,'保存成功');
         }else{
             return $this->show_json(SYS_CODE_FAIL,'保存失败');
diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php
index d743b361..ef917724 100644
--- a/admin/views/items/goods/lists.php
+++ b/admin/views/items/goods/lists.php
@@ -171,21 +171,21 @@
                     </select>
                 </div>
             </div>
-<!--            <div class="am-form-group fl">-->
-<!--                <label class="am-para-label w100">状态：</label>-->
-<!--                <div class="am-para-inline w120">-->
-<!--                    <select title="状态" name="status" v-model="params.status">-->
-<!--                        <option value="">选择状态</option>-->
-<!--                        <option :value="i" v-for="(v,i) in statusAry">{{v}}</option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
             <div class="am-form-group">
                 <label class="am-para-label w100">车架号：</label>
                 <div class="am-para-inline w200">
                     <input type="text" name="vin" placeholder="车架号关键字" v-model="params.vin" />
                 </div>
             </div>
+            <div class="am-form-group fl">
+                <label class="am-para-label w100">状态：</label>
+                <div class="am-para-inline w120">
+                    <select title="状态" name="status" v-model="params.status">
+                        <option value="">选择状态</option>
+                        <option :value="i" v-for="(v,i) in statusAry">{{v}}</option>
+                    </select>
+                </div>
+            </div>
             <div class="am-form-group">
                 <label class="am-para-label w100">精品：</label>
                 <div class="am-para-inline">
@@ -243,7 +243,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="10%">
+                <th width="15%">
                     <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="20%">
+                <th width="18%">
                     <span :class="'order'+('addr_id'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('addr_id')">
                             <span>存放地</span>
@@ -270,7 +270,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="20%">
+                <th width="18%">
                     <span :class="'order'+('fine_num'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('fine_num')">
                             <span>精品加装</span>
@@ -286,15 +286,13 @@
                 <tr v-for="(v,i) in lists">
                     <td>{{v.id}}</td>
                     <td>{{v.brand_name}}-{{v.s_name}}-{{v.v_name}}-{{v.cor_name}}</td>
-                    <td>{{v.vin}}</td>
+                    <td>
+                        <a href="javascript:void(0);" :data-modal="'/items/goods/goods/get_info?id='+v.id" data-title="详情">{{v.vin}}</a>
+                    </td>
                     <td>{{v.address}}</td>
                     <td>{{v.in_time}}</td>
                     <td>{{v.auto_fine}}</td>
                     <td>
-                        <a href="javascript:void(0);"
-                           :data-modal="'/items/goods/goods/get_info?id='+v.id"
-                           class="am-btn am-btn-primary am-btn-xs"
-                           data-title="详情">查看</a>
                         <a href="javascript:void(0);"
                            :data-open="'/items/goods/goods/get?id='+v.id"
                            class="am-btn am-btn-primary am-btn-xs">编辑</a>
diff --git a/admin/views/items/goods/lists_sold.php b/admin/views/items/goods/lists_sold.php
index 9fd34931..7de5d87d 100644
--- a/admin/views/items/goods/lists_sold.php
+++ b/admin/views/items/goods/lists_sold.php
@@ -204,7 +204,7 @@
                     </select>
                 </div>
             </div>
-            <!--<div class="am-form-group fl">
+            <div class="am-form-group fl">
                 <label class="am-para-label w100">状态：</label>
                 <div class="am-para-inline w120">
                     <select title="状态" name="status" v-model="params.status">
@@ -212,7 +212,7 @@
                         <option :value="i" v-for="(v,i) in statusAry">{{v}}</option>
                     </select>
                 </div>
-            </div>-->
+            </div>
             <div class="am-form-group">
                 <label class="am-para-label w100">是否精品：</label>
                 <div class="am-para-inline w120">
@@ -298,17 +298,14 @@
                 <tr v-for="(v,i) in lists">
                     <td>{{v.id}}</td>
                     <td>{{v.brand_name}}-{{v.s_name}}-{{v.v_name}}-{{v.cor_name}}</td>
-                    <td>{{v.vin}}</td>
+                    <td>
+                        <a href="javascript:void(0);" :data-modal="'/items/goods/goods/get_info?id='+v.id" data-title="详情">{{v.vin}}</a>
+                    </td>
                     <td>{{v.admin_name}}</td>
                     <td>{{v.out_time}}</td>
                     <td>
-                        <a href="javascript:void(0);"
-                           :data-modal="'/items/goods/goods/get_info?id='+v.id"
-                           class="am-btn am-btn-primary am-btn-xs"
-                           data-title="详情">查看</a>
-                        <a href="javascript:void(0);"
-                           :data-open="'/items/goods/goods/get?id='+v.id"
-                           class="am-btn am-btn-primary am-btn-xs">编辑</a>
+                        <a href="javascript:void(0);" class="am-btn am-btn-primary am-btn-xs"
+                           :data-open="'/items/goods/goods/get?id='+v.id">编辑</a>
                     </td>
                 </tr>
             </tbody>
diff --git a/admin/views/receiver/orders/oinfo.php b/admin/views/receiver/orders/oinfo.php
index 8b38f4d8..a9d3c035 100644
--- a/admin/views/receiver/orders/oinfo.php
+++ b/admin/views/receiver/orders/oinfo.php
@@ -6,13 +6,13 @@
     </div>
     <div class="am-panel-bd am-g" style="margin-top: 10px;margin-bottom: 10px;">
         <div class="am-form-inline am-u-lg-12">
-            <div class="am-form-group am-u-lg-3">
+            <div class="am-form-group am-u-lg-6">
                 <label class="am-para-label label-width"><span class="span-bold">品牌车型：</span></label>
                 <div class="am-para-input">
                     <label class="am-para-label align-l">{{info.brand_name}}{{info.s_name}}</label>
                 </div>
             </div>
-            <div class="am-form-group am-u-lg-3 am-u-end">
+            <div class="am-form-group am-u-lg-6">
                 <label class="am-para-label label-width"><span class="span-bold">车辆级别：</span></label>
                 <div class="am-para-input">
                     <label class="am-para-label align-l">{{info.v_name}}</label>
@@ -20,29 +20,27 @@
             </div>
         </div>
         <div class="am-form-inline am-u-lg-12">
-            <div class="am-form-group am-u-lg-3">
+            <div class="am-form-group am-u-lg-6">
                 <label class="am-para-label label-width"><span class="span-bold">车辆平台价：</span></label>
                 <div class="am-para-input">
                     <label class="am-para-label align-l">{{info.price}}</label>
                 </div>
             </div>
-            <div class="am-form-group am-u-lg-3">
+            <div class="am-form-group am-u-lg-6">
                 <label class="am-para-label label-width"><span class="span-bold">车身颜色：</span></label>
                 <div class="am-para-input">
                     <label class="am-para-label align-l">{{info.cor_name}}</label>
                 </div>
             </div>
-            <div class="am-form-group am-u-lg-6">
-            </div>
         </div>
         <div class="am-form-inline am-u-lg-12">
-            <div class="am-form-group am-u-lg-3">
+            <div class="am-form-group am-u-lg-6">
                 <label class="am-para-label label-width"><span class="span-bold">定金金额：</span></label>
                 <div class="am-para-input">
                     <label class="am-para-label align-l">{{info.deposit}}</label>
                 </div>
             </div>
-            <div class="am-form-group am-u-lg-3 am-u-end">
+            <div class="am-form-group am-u-lg-6">
                 <label class="am-para-label label-width"><span class="span-bold">内饰颜色：</span></label>
                 <div class="am-para-input">
                     <label class="am-para-label align-l">{{info.incor_name}}</label>
@@ -50,7 +48,7 @@
             </div>
         </div>
         <div class="am-form-inline am-u-lg-12">
-            <div class="am-form-group am-u-lg-3">
+            <div class="am-form-group am-u-lg-6">
                 <label class="am-para-label label-width"><span class="span-bold">付款方式：</span></label>
                 <div class="am-para-input">
                     <label class="am-para-label align-l">
@@ -59,7 +57,7 @@
                     </label>
                 </div>
             </div>
-            <div class="am-form-group am-u-lg-3 am-u-end">
+            <div class="am-form-group am-u-lg-6">
                 <label class="am-para-label label-width"><span class="span-bold">销售员：</span></label>
                 <div class="am-para-input">
                     <label class="am-para-label align-l w200">{{info.admin_name}}</label>
@@ -67,7 +65,7 @@
             </div>
         </div>
         <div class="am-form-inline am-u-lg-12">
-            <div class="am-form-group am-u-lg-3">
+            <div class="am-form-group am-u-lg-6">
                 <label class="am-para-label label-width"><span class="span-bold">车辆信息：</span></label>
                 <div class="am-para-input">
                     <label class="am-para-label align-l">
@@ -78,7 +76,7 @@
                     </label>
                 </div>
             </div>
-            <div class="am-form-group am-u-lg-3 am-u-end align-r">
+            <div class="am-form-group am-u-lg-6 align-r">
                 <label class="am-para-label label-width">
                     <a @click="carModal" class='am-btn am-btn-primary am-btn-xs'>车辆匹配</a>
                 </label>