From bbb8961f010695a308491cebf392a006032dad29 Mon Sep 17 00:00:00 2001
From: xxb <xuxianbin1990820@163.com>
Date: Tue, 7 Sep 2021 11:55:52 +0800
Subject: [PATCH] liche update for admin goods export micro change

---
 admin/controllers/items/goods/Goods.php | 8 +++-----
 admin/views/items/goods/edit.php        | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php
index 234960ce..f22c1e10 100644
--- a/admin/controllers/items/goods/Goods.php
+++ b/admin/controllers/items/goods/Goods.php
@@ -674,8 +674,7 @@ class Goods extends HD_Controller
             'bill_num' =>'开票号',
             'auto_fine' =>'精品加装',
             'status' =>'状态',
-            'pro_time' =>'生产时间',
-            'in_time' =>'分配时间',
+            'in_time' =>'入库时间',
             'out_time' =>'出库时间',
             'bill_time' =>'开票时间',
         );
@@ -685,11 +684,11 @@ class Goods extends HD_Controller
         if ($count) {
             if(1 == $search_type){
                 //精品筛选
-                $fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,addr_id,count(type_id) as fine_num';
+                $fileds = '*,count(type_id) as fine_num';
                 $orderby = "{$order} {$sort}";
                 $rows = $this->mdItems->select_fine($where_fine, $orderby, 0, 0, $fileds);
             } else {
-                $fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,addr_id';
+                $fileds = '*';
                 $orderby = "{$order} {$sort}";
                 $rows = $this->mdItems->select($where, $orderby, 0, 0, $fileds);
             }
@@ -791,7 +790,6 @@ class Goods extends HD_Controller
                     'bill_num' => $v['bill_num'],
                     'auto_fine' => $auto_fine,
                     'status' => $this->statusAry[$v['status']],
-                    'pro_time' => '0000-00-00 00:00:00' == $v['pro_time'] ? '' : $v['pro_time'],
                     'in_time' => '0000-00-00 00:00:00' == $v['in_time'] ? '' : $v['in_time'],
                     'out_time' => '0000-00-00 00:00:00' == $v['out_time'] ? '' : $v['out_time'],
                     'bill_time' => '0000-00-00 00:00:00' == $v['bill_time'] ? '' : $v['bill_time'],
diff --git a/admin/views/items/goods/edit.php b/admin/views/items/goods/edit.php
index aee28645..0b1736eb 100644
--- a/admin/views/items/goods/edit.php
+++ b/admin/views/items/goods/edit.php
@@ -204,8 +204,8 @@
                     <tr>
                         <td class="table-td">
                             <div class="input-group">
-                                <div class="input-group-addon">平台价</div>
-                                <input type="text" v-model="info.ori_price" placeholder="请输入平台价">
+                                <div class="input-group-addon">指导价</div>
+                                <input type="text" v-model="info.ori_price" placeholder="请输入指导价">
                             </div>
                         </td>
                         <td class="table-td">