|
|
@@ -606,13 +606,14 @@ class Returns extends Start_Controller {
|
|
|
if($ret_regist_no){
|
|
|
$where .= " and ret_regist_no like '%$ret_regist_no%' ";
|
|
|
}
|
|
|
- $info_list = $this->returns->find_all($where.$wid,'region,orderinfo,number,name,express,torderinfo,ftime,stime,ret_regist_no,u9_sku,goods,xh,received,degreetext','time desc');
|
|
|
+ $info_list = $this->returns->find_all($where.$wid,'region,orderinfo,number,name,express,torderinfo,ftime,stime,edittime,ret_regist_no,u9_sku,goods,xh,received,degreetext','time desc');
|
|
|
//格式化数据
|
|
|
foreach ($info_list as $key=>$value)
|
|
|
{
|
|
|
$info_list[$key]['region'] = ($value['region'] == 1)?"国内":"美国店";
|
|
|
$info_list[$key]['ftime'] = ($value['ftime'] > 0)?date('Y-m-d H:i:s',$value['ftime']):'';
|
|
|
$info_list[$key]['stime'] = ($value['stime'] > 0)?date('Y-m-d H:i:s',$value['stime']):'';
|
|
|
+ $info_list[$key]['edittime'] = ($value['edittime'] > 0)?date('Y-m-d H:i:s',$value['edittime']):'';
|
|
|
if($value['degreetext'] == '' || $value['degreetext'] == 'undefined-|')
|
|
|
{
|
|
|
$info_list[$key]['degreetext'] = 0;
|
|
|
@@ -662,6 +663,7 @@ class Returns extends Start_Controller {
|
|
|
<td>退回单号</td>
|
|
|
<td>发货日期</td>
|
|
|
<td>收到日期</td>
|
|
|
+<td>更新时间</td>
|
|
|
<td>退货登记编码</td>
|
|
|
<td>原单料号</td>
|
|
|
<td>应退回货物</td>
|
