|
|
@@ -5689,7 +5689,7 @@ class Fullordertt extends Start_Controller {
|
|
|
foreach ($k as $v)
|
|
|
{
|
|
|
$typeclass = $this->typeclass->read($v['state']);
|
|
|
- $kh[] = array((string)$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'],"CS-".$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)
|
|
|
@@ -5712,47 +5712,63 @@ class Fullordertt extends Start_Controller {
|
|
|
}
|
|
|
|
|
|
if($excel == '4'){
|
|
|
- $header = [
|
|
|
- [
|
|
|
- 'title'=>"订单号",
|
|
|
- 'width'=>0,//为0 默认为自动
|
|
|
- ],
|
|
|
- [
|
|
|
- 'title'=>"订单状态",
|
|
|
- 'width'=>0,//为0 默认为自动
|
|
|
- ],
|
|
|
- [
|
|
|
- 'title'=>"产品名",
|
|
|
- 'width'=>30,//为0 默认为自动
|
|
|
- ],
|
|
|
- [
|
|
|
- 'title'=>"客户名",
|
|
|
- 'width'=>0,//为0 默认为自动
|
|
|
- ],
|
|
|
- [
|
|
|
- 'title'=>"客户邮箱",
|
|
|
- 'width'=>0,//为0 默认为自动
|
|
|
- ],
|
|
|
- [
|
|
|
- 'title'=>"下单时间",
|
|
|
- 'width'=>0,//为0 默认为自动
|
|
|
- ],
|
|
|
- [
|
|
|
- 'title'=>"订单金额",
|
|
|
- 'width'=>0,//为0 默认为自动
|
|
|
- ],
|
|
|
- ];
|
|
|
- if(!empty($country['zname'])){
|
|
|
- $title = $country['zname'].date('Y-m-d',$timetk).'-'.date('Y-m-d',$timetj);
|
|
|
- }else{
|
|
|
- $title = date('Y-m-d',$timetk).'-'.date('Y-m-d',$timetj);
|
|
|
- }
|
|
|
+ // $header = [
|
|
|
+ // [
|
|
|
+ // 'title'=>"订单号",
|
|
|
+ // 'width'=>0,//为0 默认为自动
|
|
|
+ // ],
|
|
|
+ // [
|
|
|
+ // 'title'=>"订单状态",
|
|
|
+ // 'width'=>0,//为0 默认为自动
|
|
|
+ // ],
|
|
|
+ // [
|
|
|
+ // 'title'=>"产品名",
|
|
|
+ // 'width'=>30,//为0 默认为自动
|
|
|
+ // ],
|
|
|
+ // [
|
|
|
+ // 'title'=>"客户名",
|
|
|
+ // 'width'=>0,//为0 默认为自动
|
|
|
+ // ],
|
|
|
+ // [
|
|
|
+ // 'title'=>"客户邮箱",
|
|
|
+ // 'width'=>0,//为0 默认为自动
|
|
|
+ // ],
|
|
|
+ // [
|
|
|
+ // 'title'=>"下单时间",
|
|
|
+ // 'width'=>0,//为0 默认为自动
|
|
|
+ // ],
|
|
|
+ // [
|
|
|
+ // 'title'=>"订单金额",
|
|
|
+ // 'width'=>0,//为0 默认为自动
|
|
|
+ // ],
|
|
|
+ // ];
|
|
|
+ // if(!empty($country['zname'])){
|
|
|
+ // $title = $country['zname'].date('Y-m-d',$timetk).'-'.date('Y-m-d',$timetj);
|
|
|
+ // }else{
|
|
|
+ // $title = date('Y-m-d',$timetk).'-'.date('Y-m-d',$timetj);
|
|
|
+ // }
|
|
|
|
|
|
- $filename = $title;
|
|
|
- $data = $kh;
|
|
|
+ // $filename = $title;
|
|
|
+ // $data = $kh;
|
|
|
|
|
|
|
|
|
- $this->excelnew->doHeadMerg($title,$filename,$header,$data);
|
|
|
+ // $this->excelnew->doHeadMerg($title,$filename,$header,$data);
|
|
|
+ $title = $country['zname'].date('Y-m-d',$timetk).'-'.date('Y-m-d',$timetj);
|
|
|
+ $titlename = "<table border=1>
|
|
|
+ <tr>
|
|
|
+ <td>订单号</td>
|
|
|
+ <td>订单号1</td>
|
|
|
+ <td>订单状态</td>
|
|
|
+ <td>产品名</td>
|
|
|
+ <td>客户名</td>
|
|
|
+ <td>客户邮箱</td>
|
|
|
+ <td>下单时间</td>
|
|
|
+ <td>订单金额</td>
|
|
|
+ </tr>
|
|
|
+ </table>";
|
|
|
+ $filename = $title.".xls";
|
|
|
+ $tail = "\n";
|
|
|
+ $this->excel->get_fz2($kh,$titlename,$filename,$tail);
|
|
|
}else{
|
|
|
$title = $country['zname'].date('Y-m-d',$timetk).'-'.date('Y-m-d',$timetj);
|
|
|
$titlename = "<table border=1>
|
