|
@@ -727,10 +727,10 @@ class Fullorder extends Start_Controller {
|
|
|
{
|
|
|
$info_list[$key]['orderinfo'] = "<h9 class='window' data-h='/fullorder/edit/".$value['id']."' data-t='订单号:".$value['orderinfo']."' style='color:#000'><p>".$value['orderinfo']."</p>".$tly."</h9>"."<p>合并订单</p>";
|
|
|
}
|
|
|
- //else
|
|
|
- //{
|
|
|
- // $info_list[$key]['orderinfo'] = "<h9 class='window' data-h='/fullorder/edit/".$value['id']."' data-t='订单号:".$value['orderinfo']."'><p>".$value['orderinfo']."</p>".$tly."</h9>";
|
|
|
- //}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ $info_list[$key]['orderinfo'] = "<h9 class='window' data-h='/fullorder/edit/".$value['id']."' data-t='订单号:".$value['orderinfo']."'><p>".$value['orderinfo']."</p>".$tly."</h9>";
|
|
|
+ }
|
|
|
if($value['library'] == 1 && $ud['printtype'] == 3)
|
|
|
{
|
|
|
$info_list[$key]['library'] = "不需要";
|