|
@@ -472,6 +472,7 @@ class Fullorder extends Start_Controller {
|
|
|
$rginfo = $this->returngoods->get_orderinfo($value['orderinfo']);
|
|
$rginfo = $this->returngoods->get_orderinfo($value['orderinfo']);
|
|
|
if(!empty($rginfo)){
|
|
if(!empty($rginfo)){
|
|
|
$info_list[$key]['number'] = $value['number']."<br/>".'<p style="color:blue"><i class="method fa fa-exclamation-circle" data-t="'.$rginfo['remark'].'"></i><p>';
|
|
$info_list[$key]['number'] = $value['number']."<br/>".'<p style="color:blue"><i class="method fa fa-exclamation-circle" data-t="'.$rginfo['remark'].'"></i><p>';
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
$ud = $this->fullorder->read($value['id']);
|
|
$ud = $this->fullorder->read($value['id']);
|
|
|
$ud['address'] = str_replace("'","’",$ud['address']);
|
|
$ud['address'] = str_replace("'","’",$ud['address']);
|
|
@@ -690,7 +691,7 @@ class Fullorder extends Start_Controller {
|
|
|
{
|
|
{
|
|
|
$x .= "<p><b class='focz' data-type='2' data-id='".$value['id']."'>提交审核</b></p>";
|
|
$x .= "<p><b class='focz' data-type='2' data-id='".$value['id']."'>提交审核</b></p>";
|
|
|
}
|
|
}
|
|
|
- $x .= "<p><b class='window' data-h='/customer/edit/0' data-t='客户信息 - 修改'>客户信息</b></p>";
|
|
|
|
|
|
|
+ $x .= "<p><b class='window' data-h='/customer/edit/".$customer['id']."' data-t='客户信息 - 修改'>客户信息</b></p>";
|
|
|
$info_list[$key]['black'] = $x;
|
|
$info_list[$key]['black'] = $x;
|
|
|
$tly = "";
|
|
$tly = "";
|
|
|
if($value['clientremarks'] != "")
|
|
if($value['clientremarks'] != "")
|
longyi