|
|
@@ -5689,7 +5689,7 @@ class Fullordertt extends Start_Controller {
|
|
|
foreach ($k as $v)
|
|
|
{
|
|
|
$typeclass = $this->typeclass->read($v['state']);
|
|
|
- $kh[] = array($v['orderinfo'],$typeclass['spare'],$v['product'],$v['name'],$v['email'],date("Y-m-d H:i:s",$v['dtime']),$v['shouldmoney']);
|
|
|
+ $kh[] = array((string)$v['orderinfo'],$typeclass['spare'],$v['product'],$v['name'],$v['email'],date("Y-m-d H:i:s",$v['dtime']),$v['shouldmoney']);
|
|
|
}
|
|
|
}
|
|
|
if($excel == 5 && count($k) < 2)
|
|
|
@@ -5751,6 +5751,7 @@ class Fullordertt extends Start_Controller {
|
|
|
$filename = $title;
|
|
|
$data = $kh;
|
|
|
|
|
|
+
|
|
|
$this->excelnew->doHeadMerg($title,$filename,$header,$data);
|
|
|
}else{
|
|
|
$title = $country['zname'].date('Y-m-d',$timetk).'-'.date('Y-m-d',$timetj);
|
