From 0689acd127b478dcc5cebfb79000939e85803bfe Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Fri, 4 Mar 2022 11:41:20 +0800
Subject: [PATCH] admin_transfer_304

---
 admin/controllers/items/Transfer.php   | 16 ++++++----
 admin/views/items/goods/lists.php      | 42 ++++++++++++++------------
 admin/views/items/goods/lists_sold.php | 24 +++++++++------
 admin/views/items/logs/lists.php       |  8 +++--
 admin/views/items/transfer/lists.php   | 15 ++++-----
 5 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/admin/controllers/items/Transfer.php b/admin/controllers/items/Transfer.php
index c5fce916..2f00defa 100644
--- a/admin/controllers/items/Transfer.php
+++ b/admin/controllers/items/Transfer.php
@@ -35,9 +35,6 @@ class Transfer extends HD_Controller
 
     public function lists()
     {
-        $this->load->model('auto/auto_brand_model', 'mdAutoBrand');
-        $this->load->model('auto/auto_series_model', 'mdAutoSeries');
-        $this->load->model('auto/auto_attr_model', 'mdAutoAttr');
         $params = $this->input->get();
         $params['page'] = $params['page'] ? intval($params['page']) : 1;
         $params['size'] = $params['size'] ? intval($params['size']) : 20;
@@ -813,7 +810,7 @@ class Transfer extends HD_Controller
         //更新异常
         $jsondata = $re_tr['jsondata'] ? json_decode($re_tr['jsondata'], true) : [];
         $jsondata['abnormal']['note'] = $abnormal['note'] ? $abnormal['note'] : '';
-        $abnor_imgs  = '';
+        $abnor_imgs = '';
         if ($abnormal['imgs']) {
             foreach ($abnormal['imgs'] as $key => $value) {
                 $abnor_imgs[] = $value['value'];
@@ -913,11 +910,18 @@ class Transfer extends HD_Controller
     public function del()
     {
         $id = $this->input->post('id');
+        if (!$id) {
+            return $this->show_json(SYS_CODE_FAIL, '参数错误！');
+        }
         $re = $this->mdTransfer->get(array('id' => $id));
-        if ($re && ($re['status'] <> -1)) {
-            return $this->show_json(SYS_CODE_FAIL, '调拨已提交，不能删除');
+        if ($re && ($re['status'] > 0)) {
+            return $this->show_json(SYS_CODE_FAIL, '已发车或已接车，不能删除');
         }
         $this->mdTransfer->delete(['id' => $id]);
+        if ($re['status'] == 0) {//已调拨删除调拨记录
+            $this->mdTransferRemind->delete(['tran_id' => $id]);
+            $this->mdTransferAdmin->delete(['tran_id' => $id]);
+        }
         return $this->show_json(SYS_CODE_SUCCESS, '删除成功！');
     }
 
diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php
index 9b1a51d0..4a109ab3 100644
--- a/admin/views/items/goods/lists.php
+++ b/admin/views/items/goods/lists.php
@@ -57,23 +57,7 @@
                     </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" style="margin-bottom: 0px;"></div>
             <div class="am-form-group fl">
                 <label class="am-para-label w100">存放地：</label>
                 <div class="am-para-inline w120">
@@ -107,6 +91,13 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group" style="margin-bottom: 0px;"></div>
+            <div class="am-form-group fl">
+                <label class="am-para-label w80">车架号：</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 w70">状态：</label>
                 <div class="am-para-inline w100">
@@ -116,10 +107,21 @@
                     </select>
                 </div>
             </div>
-            <div class="am-form-group">
-                <label class="am-para-label w80">车架号：</label>
+            <div class="am-form-group fl">
+                <label class="am-para-label w100">入库日期：</label>
                 <div class="am-para-inline w200">
-                    <input type="text" name="vin" placeholder="车架号关键字" v-model="params.vin"/>
+                    <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;">
diff --git a/admin/views/items/goods/lists_sold.php b/admin/views/items/goods/lists_sold.php
index 4376bd66..fb5ccd35 100644
--- a/admin/views/items/goods/lists_sold.php
+++ b/admin/views/items/goods/lists_sold.php
@@ -144,7 +144,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>
@@ -152,6 +152,7 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group" style="margin-bottom: 0px;"></div>
             <div class="am-form-group fl">
                 <label class="am-para-label w100">存放地：</label>
                 <div class="am-para-inline w120">
@@ -185,13 +186,8 @@
                     </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">
+            <div class="am-form-group" style="margin-bottom: 0px;"></div>
+            <div class="am-form-group fl">
                 <label class="am-para-label w100">销售员：</label>
                 <div class="am-para-inline w120">
                     <select title="城市" name="city_id_admin" v-model="params.city_id_admin">
@@ -222,8 +218,15 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group" style="margin-bottom: 0px;"></div>
             <div class="am-form-group fl">
-                <label class="am-para-label w100">状态：</label>
+                <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 w70">状态：</label>
                 <div class="am-para-inline w120">
                     <select title="状态" name="status" v-model="params.status">
                         <option value="">选择状态</option>
@@ -231,7 +234,7 @@
                     </select>
                 </div>
             </div>
-            <div class="am-form-group">
+            <div class="am-form-group fl">
                 <label class="am-para-label w100">是否精品：</label>
                 <div class="am-para-inline w120">
                     <select name="is_fine" v-model="params.is_fine">
@@ -241,6 +244,7 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group" style="margin-bottom: 0px;"></div>
             <div class="am-form-group fl ml100">
                 <div class="am-form-group fl ml10">
                     <button type="submit" class="am-btn am-btn-success am-btn-sm w100">搜索</button>
diff --git a/admin/views/items/logs/lists.php b/admin/views/items/logs/lists.php
index 7e65762e..be91f39b 100644
--- a/admin/views/items/logs/lists.php
+++ b/admin/views/items/logs/lists.php
@@ -17,7 +17,7 @@
                     </select>
                 </div>
             </div>
-            <div class="am-form-group">
+            <div class="am-form-group fl">
                 <label class="am-para-label w80">状态：</label>
                 <div class="am-para-inline w120">
                     <select title="状态" name="status" v-model="params.status">
@@ -26,6 +26,7 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group" style="margin-bottom: 0px;"></div>
             <div class="am-form-group fl">
                 <label class="am-para-label w100">车型：</label>
                 <div class="am-para-inline w120">
@@ -70,7 +71,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>
@@ -78,6 +79,7 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group" style="margin-bottom: 0px;"></div>
             <div class="am-form-group fl">
                 <label class="am-para-label w100">门店：</label>
                 <div class="am-para-inline w120">
@@ -111,7 +113,7 @@
                     </select>
                 </div>
             </div>
-            <div class="am-form-group"></div>
+            <div class="am-form-group" style="margin-bottom: 0px;"></div>
             <div class="am-form-group fl ml100">
                 <div class="am-form-group fl ml10">
                     <button type="submit" class="am-btn am-btn-success am-btn-sm w100">搜索</button>
diff --git a/admin/views/items/transfer/lists.php b/admin/views/items/transfer/lists.php
index 5193971f..d8f252cf 100644
--- a/admin/views/items/transfer/lists.php
+++ b/admin/views/items/transfer/lists.php
@@ -251,16 +251,17 @@
                             <? if ($v['status'] == 2) { ?>
                                 <a href="javascript:void(0);" data-open="items/transfer/get?id=<?= $v['id'] ?>"
                                 >详情</a>
-                            <? } else if ($v['status'] == -1) { ?>
-                                <a href="javascript:void(0);" data-open="items/transfer/get_edit?id=<?= $v['id'] ?>"
-                                >修改</a> /
-                                <a href="javascript:void(0);" data-ajax="post" data-params-id="<?= $v['id'] ?>"
-                                   data-action="items/transfer/del">删除</a>
                             <? } else { ?>
-                                <a href="javascript:void(0);" data-open="items/transfer/get?id=<?= $v['id'] ?>"
-                                >详情</a> /
+                                <? if ($v['status'] != -1) { ?>
+                                    <a href="javascript:void(0);" data-open="items/transfer/get?id=<?= $v['id'] ?>"
+                                    >详情</a> /
+                                <? } ?>
                                 <a href="javascript:void(0);" data-open="items/transfer/get_edit?id=<?= $v['id'] ?>"
                                 >修改</a>
+                                <? if ($v['status'] == -1 || $v['status'] == 0) { ?>
+                                    / <a href="javascript:void(0);" data-ajax="post" data-params-id="<?= $v['id'] ?>"
+                                         data-action="items/transfer/del">删除</a>
+                                <? } ?>
                             <? } ?>
                         </td>
                     </tr>