1

core/CoreApp/controllers/Colour.php

@@ -104,7 +104,7 @@ class Colour extends Start_Controller {
 		    {
                 $start = ($page - 1)*$perpage;
             }
-			$info_list = $this->colour->find_all($where,'id,number,shop,warehouse,time,img,img_two',$order_str,$start,$perpage);
+			$info_list = $this->colour->find_all($where,'id,number,shop,warehouse,time,library_time,img,img_two',$order_str,$start,$perpage);
 			foreach ($info_list as $key=>$value) 
 		    {
 				$info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);
@@ -119,6 +119,7 @@ class Colour extends Start_Controller {
 				}
 				$warehouse = $this->warehouse->read($value['warehouse']);
 				$info_list[$key]['warehouse'] = $warehouse['title'];
+				$info_list[$key]['library_time'] = empty($value['library_time'])?'未出库': date('Y-m-d H:i',$value['library_time'])."出库";
 
 				$colorimg = explode('|',$value['img']);
 				$v = $colorimg[0];
@@ -448,7 +449,7 @@ class Colour extends Start_Controller {
 		    {
                 $start = ($page - 1)*$perpage;
             }
-			$info_list = $this->colour->find_all($where,'id,number,shop,warehouse,time,img,img_two',$order_str,$start,$perpage);
+			$info_list = $this->colour->find_all($where,'id,number,shop,warehouse,time,library_time,img,img_two',$order_str,$start,$perpage);
 			foreach ($info_list as $key=>$value) 
 		    {
 				$info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);
@@ -464,7 +465,7 @@ class Colour extends Start_Controller {
 				$warehouse = $this->warehouse->read($value['warehouse']);
 				$info_list[$key]['warehouse'] = $warehouse['title'];
 
-
+				$info_list[$key]['library_time'] = empty($value['library_time'])?'未出库': date('Y-m-d H:i',$value['library_time'])."出库";
 				
 				$colorimg = explode('|',$value['img']);
 				$v = $colorimg[0];

template/erp/colour.html

@@ -33,6 +33,7 @@
 <td>所属店铺</td>
 <td>所属仓库</td>
 <td>添加时间</td>
+<td>发货状态</td>
 <td>订单生产参考配图</td>
 <td>完成货品实拍图</td>
 </tr>

template/erp/colour_seeindex.html

@@ -29,6 +29,7 @@
 <td>所属店铺</td>
 <td>所属仓库</td>
 <td>添加时间</td>
+<td>发货状态</td>
 <td>订单生产参考配图</td>
 <td>完成货品实拍图</td>
 </tr>