|
@@ -165,8 +165,12 @@ class Set
|
|
|
|
|
|
</tr>';
|
|
|
|
|
|
- if ($type == 'store' && $show == 2) {
|
|
|
+ if ($type == 'store') {
|
|
|
+ $html .= '<tr>
|
|
|
+ <td width="80">商品数量</td>
|
|
|
+ <td>'.$this->table(false, array(array($info['num']))).'</td>
|
|
|
|
|
|
+ </tr>';
|
|
|
} else {
|
|
|
$html .= '<tr>
|
|
|
<td width="80">对账金额</td>
|
|
@@ -174,15 +178,6 @@ class Set
|
|
|
|
|
|
</tr>';
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- if ($type == 'store') {
|
|
|
- $html .= '<tr>
|
|
|
- <td width="80">商品数量</td>
|
|
|
- <td>'.$this->table(false, array(array($info['num']))).'</td>
|
|
|
-
|
|
|
- </tr>';
|
|
|
- }
|
|
|
|
|
|
if ($show == 1) {
|
|
|
$html .= '<tr>
|
|
@@ -268,7 +263,7 @@ class Set
|
|
|
|
|
|
$head = array('结算单号', '订货单号', '结算类型', '下单日期', '完成日期', '结算日期', '对账金额');
|
|
|
if ($type == 'store') {
|
|
|
- $head[] = '商品数量';
|
|
|
+ $head[6] = '商品数量';
|
|
|
}
|
|
|
$head[] = '结算状态';
|
|
|
|
|
@@ -284,7 +279,7 @@ class Set
|
|
|
);
|
|
|
|
|
|
if ($type == 'store') {
|
|
|
- $d[] = $v['num'];
|
|
|
+ $d[6] = $v['num'];
|
|
|
}
|
|
|
$d[] = '已入账';
|
|
|
$body[] = $d;
|
|
@@ -398,7 +393,7 @@ class Set
|
|
|
'对账金额',
|
|
|
);
|
|
|
if ($type == 'store') {
|
|
|
- $head[] = '商品数量';
|
|
|
+ $head[6] = '商品数量';
|
|
|
}
|
|
|
$head[] = '结算状态';
|
|
|
if ($data) {
|
|
@@ -424,7 +419,7 @@ class Set
|
|
|
$body[$k][5] = $fdate;
|
|
|
$body[$k][6] = $cash;
|
|
|
if ($type == 'store') {
|
|
|
- $body[$k][] = $v['num'];
|
|
|
+ $body[$k][6] = $v['num'];
|
|
|
}
|
|
|
$body[$k][] = '已入账';
|
|
|
}
|