From 38e30d264262e20f946eaee53d97780bc5859201 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Tue, 9 Nov 2021 15:22:20 +0800
Subject: [PATCH] goods_logs_1109_4

---
 admin/views/items/goods/lists.php      | 26 +++++++++-----------------
 admin/views/items/goods/lists_sold.php | 24 ++++++++----------------
 admin/views/items/logs/get.php         |  2 +-
 admin/views/items/logs/lists.php       | 26 +++++++++-----------------
 4 files changed, 27 insertions(+), 51 deletions(-)

diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php
index 2997086b..d0641bb1 100644
--- a/admin/views/items/goods/lists.php
+++ b/admin/views/items/goods/lists.php
@@ -240,7 +240,7 @@
         <table class="am-table am-table-bordered">
             <thead>
             <tr>
-                <th width="7%">
+                <th width="6%">
                     <span :class="'order'+('id'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('id')">
                             <span class="mr10">ID</span>
@@ -267,7 +267,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="21%">
+                <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>
@@ -294,6 +294,7 @@
                         </a>
                     </span>
                 </th>
+                <th width=""><span>操作</span></th>
             </tr>
             </thead>
             <tbody>
@@ -308,21 +309,12 @@
                     <td>{{v.address}}</td>
                     <td>{{v.in_time}}</td>
                     <td>{{v.auto_fine}}</td>
-                </tr>
-                <tr>
-                    <td colspan="6">
-                        <div class="row">
-                            <div class="col-md-4 align-l">
-                            </div>
-                            <div class="col-md-8 align-r" style="padding-right: 30px;">
-                                <a href="javascript:void(0);"
-                                   :data-open="'/items/goods/logs/get?id='+v.id+'&title='+v.title"
-                                   class="am-btn am-btn-primary am-btn-xs">调拨记录</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>
-                            </div>
-                    </td>
+                    <td><a href="javascript:void(0);"
+                           :data-open="'/items/goods/logs/get?id='+v.id+'&title='+v.title"
+                           class="am-btn am-btn-primary am-btn-xs">轨迹</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></td>
                 </tr>
             </template>
             </tbody>
diff --git a/admin/views/items/goods/lists_sold.php b/admin/views/items/goods/lists_sold.php
index d49c4852..539bbf00 100644
--- a/admin/views/items/goods/lists_sold.php
+++ b/admin/views/items/goods/lists_sold.php
@@ -319,7 +319,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="12%">
+                <th width="10%">
                     <span :class="'order'+('sold_time'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('sold_time')">
                             <span>销售日期</span>
@@ -328,6 +328,7 @@
                         </a>
                     </span>
                 </th>
+                <th width=""><span>操作</span></th>
             </tr>
             </thead>
             <tbody>
@@ -343,21 +344,12 @@
                     <td>{{v.mobile}}</td>
                     <td>{{v.admin_name}}</td>
                     <td>{{v.sold_time}}</td>
-                </tr>
-                <tr>
-                    <td colspan="7">
-                        <div class="row">
-                            <div class="col-md-4 align-l">
-                            </div>
-                            <div class="col-md-8 align-r" style="padding-right: 30px;">
-                                <a href="javascript:void(0);"
-                                   :data-open="'/items/goods/logs/get?id='+v.id+'&title='+v.title"
-                                   class="am-btn am-btn-primary am-btn-xs">调拨记录</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>
-                            </div>
-                    </td>
+                    <td><a href="javascript:void(0);"
+                           :data-open="'/items/goods/logs/get?id='+v.id+'&title='+v.title"
+                           class="am-btn am-btn-primary am-btn-xs">轨迹</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></td>
                 </tr>
             </template>
             </tbody>
diff --git a/admin/views/items/logs/get.php b/admin/views/items/logs/get.php
index 7fe8c5b3..97ef2739 100644
--- a/admin/views/items/logs/get.php
+++ b/admin/views/items/logs/get.php
@@ -3,7 +3,7 @@
         <div class="am-panel am-panel-default">
             <div class="am-panel-hd">
                     <span href="javascript:void(0)" style="font-size: 20px">
-                        车辆调拨记录
+                        车辆轨迹记录
                     </span>
             </div>
             <div class="am-panel-bd">
diff --git a/admin/views/items/logs/lists.php b/admin/views/items/logs/lists.php
index 9f2aa494..c2ebd620 100644
--- a/admin/views/items/logs/lists.php
+++ b/admin/views/items/logs/lists.php
@@ -122,14 +122,15 @@
             <thead>
             <tr>
                 <th width="3%"><span>ID</span></th>
-                <th width="20%"><span>门店</span></th>
+                <th width="16%"><span>门店</span></th>
                 <th width="20%"><span>车辆</span></th>
-                <th width="12%"><span>车架号</span></th>
-                <th width="10%"><span>入库日期</span></th>
-                <th width="10%"><span>最后调拨时间</span></th>
-                <th width="10%"><span>库存时间</span></th>
+                <th width="14%"><span>车架号</span></th>
+                <th width="8%"><span>入库日期</span></th>
+                <th width="12%"><span>最后调拨时间</span></th>
+                <th width="7%"><span>库存时间</span></th>
                 <th width="7%"><span>是否出售</span></th>
                 <th width="7%"><span>状态</span></th>
+                <th width=""><span>操作</span></th>
             </tr>
             </thead>
             <tbody>
@@ -146,18 +147,9 @@
                     <td>{{v.inventory_time}}</td>
                     <td>{{v.bill_time}}</td>
                     <td>{{v.status_name}}</td>
-                </tr>
-                <tr>
-                    <td colspan="9">
-                        <div class="row">
-                            <div class="col-md-4 align-l">
-                            </div>
-                            <div class="col-md-8 align-r" style="padding-right: 30px;">
-                                <a href="javascript:void(0);"
-                                   :data-open="'/items/goods/logs/get?id='+v.id+'&title='+v.title+'&biz_name='+v.biz_name"
-                                   class="am-btn am-btn-primary am-btn-xs">调拨记录</a>
-                            </div>
-                    </td>
+                    <td><a href="javascript:void(0);"
+                           :data-open="'/items/goods/logs/get?id='+v.id+'&title='+v.title+'&biz_name='+v.biz_name"
+                           class="am-btn am-btn-primary am-btn-xs">轨迹</a></td>
                 </tr>
             </template>
             </tbody>