Merge branch 'hcy_pcb_20181221-r' into development

app/Http/Controllers/WebController.php

@@ -212,8 +212,8 @@ class WebController extends Controller
         }
         //采购信息
         $purchase = $con->table('purchase')->where(['order_id' => $order_id])->first();
-        //订单费用明细
-        $orderAuditDetail = $con->table('order_audit_detail')->where(['order_id' => $order_id])->first();
+        //采购费用明细
+        $purchaseAuditDetail = $con->table('purchase_audit_detail')->where(['purchase_id' => $purchase_id])->first();
         //订单详细信息
         $orderInfo = $con->table('order_info')->where(['order_id' => $order_id])->first();
         //订单发票信息
@@ -258,7 +258,7 @@ class WebController extends Controller
         $data['orderBase'] = $orderBase;
         $data['purchase'] = $purchase;
         $data['liexinInfo'] = config("params.liexin_info");
-        $data['orderAuditDetail'] = objectToArray($orderAuditDetail);
+        $data['purchaseAuditDetail'] = objectToArray($purchaseAuditDetail);
         $data['orderAuditReason2'] = objectToArray($orderAuditReason2);
         $data['orderInfo'] = objectToArray($orderInfo);
         $data['orderInvoice'] = $orderInvoice;

resources/views/Pcb/PcbOrderDetail.blade.php

@@ -292,13 +292,13 @@
                                 <tr>
                                     <td><?= $orderAuditDetail['pcb_ccf_net'] ?></td>
                                     <td><?= $orderAuditDetail['pcb_jjf_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pcb_sf_net'] ?></td>
+                                    <td><?= $orderBase['invoice_type'] > 0 ? $orderAuditDetail['price']*0.1 : 0; ?></td>
                                     <td><?= $orderAuditDetail['pcb_kdf_net'] ?></td>
                                     <td><?= $orderAuditDetail['pcb_other_net'] ?></td>
                                     <td></td>
                                 </tr>
                                 <tr>
-                                    <th class="c2">总计</th>
+                                    <th class="c2">总计(含税10%)</th>
                                     <th colspan="2"><?= $orderBase['order_amount'] ?></th>
                                     <th class="c2">获得积分</th>
                                     <th colspan="2"><?= $orderBase['integral'] ?></th>

resources/views/Pcb/PcbOrderList.blade.php

@@ -98,8 +98,8 @@
             <th class="pl30" style="background-color: #f2f2f2">交易订单编号</th>
             <th class="pl30" style="background-color: #f2f2f2">采购订单编号</th>
             <th class="pl30" style="background-color: #f2f2f2">是否调价</th>
-            <th class="pl30" style="background-color: #f2f2f2">订单金额</th>
-            <th class="pl30" style="background-color: #f2f2f2">调整后订单金额</th>
+            <th class="pl30" style="background-color: #f2f2f2">订单金额(含税10%)</th>
+            <th class="pl30" style="background-color: #f2f2f2">调整后订单金额(含税10%)</th>
             <th class="pl30" style="background-color: #f2f2f2">订单状态</th>
             <th class="pl30" style="background-color: #f2f2f2">订单类型</th>
             <th class="pl30" style="background-color: #f2f2f2">支付方式</th>

resources/views/Pcb/PcbPurchaseDetail.blade.php

@@ -220,12 +220,12 @@
                                     <th>颜色费</th>
                                 </tr>
                                 <tr>
-                                    <td><?= $orderAuditDetail['pcb_gcf_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pcb_pinban_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pcb_bf_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pcb_flf_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pdf_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pcb_ysf_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_gcf_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_pinban_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_bf_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_flf_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pdf_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_ysf_net'] ?></td>
                                 </tr>
                                 <tr>
                                     <th class="c2">测试费</th>
@@ -236,16 +236,16 @@
                                     <th></th>
                                 </tr>
                                 <tr>
-                                    <td><?= $orderAuditDetail['pcb_ccf_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pcb_jjf_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pcb_sf_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pcb_kdf_net'] ?></td>
-                                    <td><?= $orderAuditDetail['pcb_other_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_ccf_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_jjf_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_sf_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_kdf_net'] ?></td>
+                                    <td><?= $purchaseAuditDetail['pcb_other_net'] ?></td>
                                     <td></td>
                                 </tr>
                                 <tr>
                                     <th class="c2">总计</th>
-                                    <th colspan="2"><?= $orderBase['order_amount'] ?></th>
+                                    <th colspan="2"><?= $purchaseAuditDetail['price'] ?></th>
                                     <th class="c2">获得积分</th>
                                     <th colspan="2"><?= $orderBase['integral'] ?></th>
                                 </tr>

resources/views/Pcb/PcbPurchaseList.blade.php

@@ -76,8 +76,8 @@
             <th class="pl30" style="background-color: #f2f2f2">交易订单编号</th>
             <th class="pl30" style="background-color: #f2f2f2">采购订单编号</th>
             <th class="pl30" style="background-color: #f2f2f2">是否调价</th>
-            <th class="pl30" style="background-color: #f2f2f2">订单金额</th>
-            <th class="pl30" style="background-color: #f2f2f2">调整后订单金额</th>
+            <th class="pl30" style="background-color: #f2f2f2">订单金额(含税10%)</th>
+            <th class="pl30" style="background-color: #f2f2f2">调整后订单金额(含税10%)</th>
             <th class="pl30" style="background-color: #f2f2f2">订单状态</th>
             <th class="pl30" style="background-color: #f2f2f2">订单类型</th>
             <th class="pl30" style="background-color: #f2f2f2">支付方式</th>