Merge branch 'hcy_pcb_20181221-r' into development

app/Model/Pcb/PcbPurchaseModel.php

@@ -83,7 +83,7 @@ class PcbPurchaseModel extends Model
         $temp = [];
         $temp = [];
         foreach ($data as $k=>$v){
         foreach ($data as $k=>$v){
             array_push($temp,[
             array_push($temp,[
-                'order_id'=>$v['order_id'],
+                'purchase_id'=>$v['purchase_id'],
                 'user_account' =>$v['user_account']."\n",
                 'user_account' =>$v['user_account']."\n",
                 'order_sn' =>$v['order_sn']."\n",
                 'order_sn' =>$v['order_sn']."\n",
                 'purchase_sn' =>@$v['purchase_sn']."\n",
                 'purchase_sn' =>@$v['purchase_sn']."\n",

resources/views/Pcb/PcbOrderDetail.blade.php

@@ -140,6 +140,18 @@
                                     <td><?= @$orderInvoice["province"].@$orderInvoice["city"].@$orderInvoice["district"].@$orderInvoice['consignee_address'] ?></td>
                                     <td><?= @$orderInvoice["province"].@$orderInvoice["city"].@$orderInvoice["district"].@$orderInvoice['consignee_address'] ?></td>
                                     <td><?= @$orderInvoice['tax_no'] ?></td>
                                     <td><?= @$orderInvoice['tax_no'] ?></td>
                                 </tr>
                                 </tr>
+                                <tr>
+                                    <th>公司电话</th>
+                                    <th>开户银行</th>
+                                    <th>银行卡号</th>
+                                    <th></th>
+                                </tr>
+                                <tr>
+                                    <td><?= @$orderInvoice['company_phone'] ?></td>
+                                    <td><?= @$orderInvoice['bank_name'] ?></td>
+                                    <td><?= @$orderInvoice['bank_account'] ?></td>
+                                    <td></td>
+                                </tr>
                                 </tbody>
                                 </tbody>
                             </table>
                             </table>
                         </td>
                         </td>
@@ -182,7 +194,7 @@
                                     <th>过孔</th>
                                     <th>过孔</th>
                                     <th>字符颜色</th>
                                     <th>字符颜色</th>
                                     <th>铜箔厚度</th>
                                     <th>铜箔厚度</th>
-                                    <th>飞针测试</th>
+                                    <th>测试类型</th>
                                 </tr>
                                 </tr>
                                 <tr>
                                 <tr>
                                     <td><?= $orderInfo['thickness'] ?></td>
                                     <td><?= $orderInfo['thickness'] ?></td>
@@ -293,7 +305,7 @@
                     </tbody>
                     </tbody>
                 </table>
                 </table>
                 <!--费用信息end-->
                 <!--费用信息end-->
-                <?Php if(!count($purchase)) { ?>
+                <?Php if(!count($purchase) && $orderBase['status'] == 1) { ?>
                 <div style="margin-top: 10px;margin-bottom: 20px;">
                 <div style="margin-top: 10px;margin-bottom: 20px;">
                     <div style="">
                     <div style="">
                         <button class="layui-btn export" onclick="AddPurchase()">发起采购</button>
                         <button class="layui-btn export" onclick="AddPurchase()">发起采购</button>