|
|
@@ -343,7 +343,7 @@ class Excel
|
|
|
$file = Dever::input('excel_name');
|
|
|
|
|
|
|
|
|
- $header = array('门店编号', '门店名称', '门店类型', '供货商', '订货单号', '订货总数量', '订货单总金额', '商品编码', '商品名称', '规格型号', '订货单价', '订货数量', '商品合计金额', '订货日期', '订货单状态', '退款状态', '退款金额');
|
|
|
+ $header = array('门店编号', '门店名称', '门店类型', '供货商', '订货单号', '订货总数量', '订货单总金额', '商品编码', '商品名称', '规格型号', '订货单价', '订货数量', '商品合计金额', '订货日期', '发货日期', '订货单状态', '退款状态', '退款金额');
|
|
|
|
|
|
$table = 'shop/info';
|
|
|
|
|
|
@@ -359,6 +359,8 @@ class Excel
|
|
|
$info = Dever::db($table)->find($v['type_id']);
|
|
|
$goods = Dever::db('shop/buy_order_goods')->select(array('order_id' => $v['id']));
|
|
|
$cdate = strstr($v['cdate'], '-') ? $v['cdate'] : date('Y-m-d H:i', $v['cdate']);
|
|
|
+ $fdate = ($ps && $ps['cdate']) ? date('Y-m-d H:i', $ps['cdate']) : '-';
|
|
|
+ $ydate = ($ps && $ps['ydate']) ? date('Y-m-d H:i', $ps['ydate']) : '-';
|
|
|
$refund_status = Dever::load("shop/lib/manage.buyInfoRefundStatus", $v['id']);
|
|
|
|
|
|
$source = Dever::load("shop/lib/manage.buyInfo", $v['source_type'], $v['source_id']);
|
|
|
@@ -400,6 +402,7 @@ class Excel
|
|
|
round($v1['price']*$v1['num'], 2),
|
|
|
|
|
|
$cdate,
|
|
|
+ $fdate,
|
|
|
$status[$v['status']],
|
|
|
$refund_status,
|
|
|
$v['refund_cash'],
|
rabin