Merge branch 'zjl_iteration_v4_20210526' into development

resources/views/detail/detail_items_info.php

@@ -60,6 +60,8 @@
 
                 <?php if ($order_info['order_goods_type'] == 1) { ?>
                     <th>生产跟踪</th>
+                    <th>包装</th>
+                    <th>内部编码</th>
                 <?php } ?>
                 
                 <th>商品备注</th>     
@@ -142,6 +144,8 @@
 
                     <?php if ($order_info['order_goods_type'] == 1) { ?>
                         <td><a class="order-track" data-rid="<?= $v['rec_id'] ?>"><?=  App\Http\Controllers\getLastTrack($v['rec_id'])  ?></a></td>
+                        <td><?= $v['goods_packing'] ?></td>
+                        <td><?= $v['material_number'] ?></td>
                     <?php } ?>
 
                     <td><?= !empty($v['remarks']) ? $v['remarks'] : '' ?></td>
@@ -177,36 +181,36 @@
             <?php if ($order_info['order_remark']) { ?>
                 <tr>
                     <td>订单备注信息：</td>
-                    <td colspan="22"><?= $order_info['order_remark'] ?></td>
+                    <td colspan="24"><?= $order_info['order_remark'] ?></td>
                 </tr>
             <?php } ?>
 
             <?php if ($order_temp_info['kefu_remark']) { ?>
                 <tr>
                     <td>客服备注信息：</td>
-                    <td colspan="22"><?= $order_temp_info['kefu_remark'] ?></td>
+                    <td colspan="24"><?= $order_temp_info['kefu_remark'] ?></td>
                 </tr>
             <?php } ?>
 
             <?php if ($order_info['order_goods_type'] == 2 && $order_temp_info['business_type'] == 1) { ?>
                 <tr>
                     <td>项目需求描述：</td>
-                    <td colspan="22"><?= $order_temp_info['sample_demand_desc'] ?></td>
+                    <td colspan="24"><?= $order_temp_info['sample_demand_desc'] ?></td>
                 </tr>
             <?php } ?>
 
             <?php if ($order_info['order_goods_type'] == 1 && $order_temp_info['business_type'] == 1) { ?>
                 <tr>
                     <td>项目名称：</td>
-                    <td colspan="22"><?= $order_temp_info['sample_project_name'] ?></td>
+                    <td colspan="24"><?= $order_temp_info['sample_project_name'] ?></td>
                 </tr>
                 <tr>
                     <td>项目阶段：</td>
-                    <td colspan="22"><?= $order_temp_info['sample_project_stage'] ?></td>
+                    <td colspan="24"><?= $order_temp_info['sample_project_stage'] ?></td>
                 </tr>
                 <tr>
                     <td>申请理由：</td>
-                    <td colspan="22"><?= $order_temp_info['sample_project_reason'] ?></td>
+                    <td colspan="24"><?= $order_temp_info['sample_project_reason'] ?></td>
                 </tr>
             <?php } ?>
         </tfoot>