From dc5caa1fc117bc969e86f6d843d5d1c559cb4d47 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Thu, 30 Dec 2021 10:39:05 +0800
Subject: [PATCH] transfer_1230_2

transfer_1230_3
---
 admin/views/items/goods/lists.php    | 45 ++++++++++++++--------------
 admin/views/items/transfer/lists.php |  6 ++--
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php
index 1b47f377..7d8d3b87 100644
--- a/admin/views/items/goods/lists.php
+++ b/admin/views/items/goods/lists.php
@@ -49,7 +49,7 @@
                     </select>
                 </div>
             </div>
-            <div class="am-form-group">
+            <div class="am-form-group fl">
                 <div class="am-para-inline w120">
                     <select name="cor_id" v-model="params.cor_id">
                         <option value="">车身颜色</option>
@@ -57,6 +57,23 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group fl">
+                <label class="am-para-label w100">入库日期：</label>
+                <div class="am-para-inline w200">
+                    <input id="order-lists-time" type="text" name="in_time" value="<?= $params['in_time'] ?>"
+                           autocomplete="off"
+                           placeholder="入库日期范围"/>
+                </div>
+            </div>
+            <div class="am-form-group mb10" style="padding-top: 5px">
+                <div class="am-para-inline w250">
+                    <a class="mr10 order-lists-time-btn" href="javascript:void (0);" data-date="today">今天</a>
+                    <a class="mr10 order-lists-time-btn" href="javascript:void (0);"
+                       data-date="yesterday">昨日</a>
+                    <a class="mr10 order-lists-time-btn" href="javascript:void (0);" data-date="7day">最近7天</a>
+                    <a class="mr10 order-lists-time-btn" href="javascript:void (0);" data-date="30day">最近30天</a>
+                </div>
+            </div>
             <div class="am-form-group fl">
                 <label class="am-para-label w100">存放地：</label>
                 <div class="am-para-inline w120">
@@ -105,23 +122,6 @@
                     <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 w300">
-                    <input id="order-lists-time" type="text" name="in_time" value="<?= $params['in_time'] ?>"
-                           autocomplete="off"
-                           placeholder="入库日期范围"/>
-                </div>
-            </div>
-            <div class="am-form-group fl mb10" style="padding-top: 5px">
-                <div class="am-para-inline w250">
-                    <a class="mr10 order-lists-time-btn" href="javascript:void (0);" data-date="today">今天</a>
-                    <a class="mr10 order-lists-time-btn" href="javascript:void (0);"
-                       data-date="yesterday">昨日</a>
-                    <a class="mr10 order-lists-time-btn" href="javascript:void (0);" data-date="7day">最近7天</a>
-                    <a class="mr10 order-lists-time-btn" href="javascript:void (0);" data-date="30day">最近30天</a>
-                </div>
-            </div>
             <div class="am-form-group fl" style="display:none;">
                 <label class="am-para-label w60">精品：</label>
                 <div class="am-para-inline">
@@ -138,14 +138,15 @@
                     <button type="button" class="am-btn am-btn-default am-btn-sm" @click="fine_modal">+</button>
                 </div>
             </div>
-            <div class="am-form-group fl ml100">
+            <div class="am-form-group" style="margin-bottom: 0px;"></div>
+            <div class="am-form-group fl ml50">
                 <div class="am-form-group fl ml10">
                     <button type="submit" class="am-btn am-btn-success am-btn-sm w100">搜索</button>
                 </div>
                 <div class="am-form-group fl ml10">
                     <button type="button" class="am-btn am-btn-success am-btn-sm w100" @click="reset">重置</button>
                 </div>
-                <div class="am-form-group fl ml20">
+                <div class="am-form-group fl ml10">
                     <button type="button" data-open="/items/goods/goods/get"
                             class="am-btn am-btn-success am-btn-sm w100">新增
                     </button>
@@ -171,7 +172,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="15%">
+                <th width="14%">
                     <span :class="'order'+('vin'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('vin')">
                             <span>车架号</span>
@@ -180,7 +181,7 @@
                         </a>
                     </span>
                 </th>
-                <th width="16%">
+                <th width="17%">
                     <span :class="'order'+('addr_id'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('addr_id')">
                             <span>存放地</span>
diff --git a/admin/views/items/transfer/lists.php b/admin/views/items/transfer/lists.php
index 0d25bee0..a21fe7ed 100644
--- a/admin/views/items/transfer/lists.php
+++ b/admin/views/items/transfer/lists.php
@@ -240,12 +240,12 @@
         <table class="am-table am-table-bordered">
             <thead>
             <tr>
-                <th width="22%"><span>车辆</span></th>
+                <th width="18%"><span>车辆</span></th>
                 <th width="15%"><span>车架号</span></th>
                 <th width="7%"><span>运输人员</span></th>
                 <th width="12%"><span>调拨时间</span></th>
-                <th width="17%"><span>提车人</span></th>
-                <th width="17%"><span>接车人</span></th>
+                <th width="19%"><span>提车人</span></th>
+                <th width="19%"><span>接车人</span></th>
                 <th width="5%"><span>异常</span></th>
                 <th width="7%"><span>状态</span></th>
                 <th width="5%"><span>操作</span></th>