Merge branch 'hcy_pcb_20181221-r' into development

parents b4e39056 f3a353f9
Showing with 4 additions and 4 deletions
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</tr> </tr>
<tr class="c2"> <tr class="c2">
<th>订单类型</th> <th>订单类型</th>
<th>是否返单</th> <th>支付方式</th>
<th>公司名称</th> <th>公司名称</th>
<th>Adtag或其它</th> <th>Adtag或其它</th>
<th>下单时间</th> <th>下单时间</th>
...@@ -41,27 +41,27 @@ ...@@ -41,27 +41,27 @@
</tr> </tr>
<tr > <tr >
<td><?= @$orderBase['order_type'] ?></td> <td><?= @$orderBase['order_type'] ?></td>
<td><?= $orderBase['is_return_order'] ? "是" : "否" ?></td> <td><?= $orderBase['order_pay_type'] ?></td>
<td><?= $orderBase['company_name'] ?></td> <td><?= $orderBase['company_name'] ?></td>
<td><?= @$orderBase['adtag'] ?></td> <td><?= @$orderBase['adtag'] ?></td>
<td><?= @$orderBase['create_time'] ?></td> <td><?= @$orderBase['create_time'] ?></td>
<td><?= @$orderBase['pay_time'] ?></td> <td><?= @$orderBase['pay_time'] ?></td>
</tr> </tr>
<tr > <tr >
<th class="c2">支付方式</th>
<th class="c2">采购订单编号</th> <th class="c2">采购订单编号</th>
<th></th> <th></th>
<th></th> <th></th>
<th></th> <th></th>
<th></th> <th></th>
<th></th>
</tr> </tr>
<tr style="height: 30px;"> <tr style="height: 30px;">
<td><?= $orderBase['order_pay_type'] ?></td>
<td><?= @$purchase['purchase_sn'] ?></td> <td><?= @$purchase['purchase_sn'] ?></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment