|
@@ -851,10 +851,16 @@ class Returns extends Start_Controller {
|
|
|
if($ret_regist_no){
|
|
if($ret_regist_no){
|
|
|
$where .= " and ret_regist_no like '%$ret_regist_no%' ";
|
|
$where .= " and ret_regist_no like '%$ret_regist_no%' ";
|
|
|
}
|
|
}
|
|
|
- $info_list = $this->returns->find_all($where.$wid,'edittime,ret_regist_no,torderinfo,xh,received,degreetext','time desc');
|
|
|
|
|
|
|
+ $info_list = $this->returns->find_all($where.$wid,'edittime,ret_regist_no,torderinfo,xh,extra_cont,received,degreetext','time desc');
|
|
|
//格式化数据
|
|
//格式化数据
|
|
|
foreach ($info_list as $key=>$value)
|
|
foreach ($info_list as $key=>$value)
|
|
|
{
|
|
{
|
|
|
|
|
+ if(!empty($value['extra_cont'])){
|
|
|
|
|
+ $extra_cont = json_decode($value['extra_cont'],true);
|
|
|
|
|
+ if(!empty($extra_cont['dy_jiaji'])){
|
|
|
|
|
+ $info_list[$key]['extra_cont'] = $extra_cont['dy_jiaji']['jiaji_remark'];
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
$info_list[$key]['edittime'] = ($value['edittime'] > 0)?date('Y-m-d H:i:s',$value['edittime']):'';
|
|
$info_list[$key]['edittime'] = ($value['edittime'] > 0)?date('Y-m-d H:i:s',$value['edittime']):'';
|
|
|
if($value['degreetext'] == '' || $value['degreetext'] == 'undefined-|')
|
|
if($value['degreetext'] == '' || $value['degreetext'] == 'undefined-|')
|
|
|
{
|
|
{
|
|
@@ -909,6 +915,7 @@ class Returns extends Start_Controller {
|
|
|
<td>退货登记编号</td>
|
|
<td>退货登记编号</td>
|
|
|
<td>退货运单号</td>
|
|
<td>退货运单号</td>
|
|
|
<td>装箱箱号</td>
|
|
<td>装箱箱号</td>
|
|
|
|
|
+<td>店员加急备注</td>
|
|
|
<td>货物明细</td>
|
|
<td>货物明细</td>
|
|
|
<td>数量</td>
|
|
<td>数量</td>
|
|
|
<td>完好程度-1</td>
|
|
<td>完好程度-1</td>
|
