Merge branch 'hcy_pcb_20181221-r' into development

app/Http/Controllers/WebController.php

@@ -107,8 +107,8 @@ class WebController extends Controller
         //订单费用明细
         //订单费用明细
         $orderAuditDetail = $con->table('order_audit_detail')->where(['order_id' => $order_id])->first();
         $orderAuditDetail = $con->table('order_audit_detail')->where(['order_id' => $order_id])->first();
         //采购审核意见备注
         //采购审核意见备注
-        $orderAuditReason2 = $con->table('order_audit_reason')->where(['order_id' => $order_id,'type'=>2])->orderBy("id","desc")->first();
-        $orderAuditReason1 = $con->table('order_audit_reason')->where(['order_id' => $order_id,'type'=>1])->orderBy("id","desc")->first();
+        $orderAuditReason2 = $con->table('order_audit_reason')->where(['order_id' => $order_id,'type'=>2,'status'=>1])->orderBy("id","desc")->first();
+        $orderAuditReason1 = $con->table('order_audit_reason')->where(['order_id' => $order_id,'type'=>1,'status'=>1])->orderBy("id","desc")->first();
 
 
         //订单详细信息
         //订单详细信息
         $orderInfo = $con->table('order_info')->where(['order_id' => $order_id])->first();
         $orderInfo = $con->table('order_info')->where(['order_id' => $order_id])->first();
@@ -221,7 +221,7 @@ class WebController extends Controller
         //物流信息
         //物流信息
         $shipping = $con->table('shipping')->where(['relevance_id' => $purchase_id,'shipping_type'=>3])->first();
         $shipping = $con->table('shipping')->where(['relevance_id' => $purchase_id,'shipping_type'=>3])->first();
         //供应商审核结果
         //供应商审核结果
-        $orderAuditReason2 = $con->table('order_audit_reason')->where(['order_id' => $order_id,'type'=>2])->orderBy("id","desc")->first();
+        $orderAuditReason2 = $con->table('order_audit_reason')->where(['order_id' => $order_id,'type'=>2,'status'=>1])->orderBy("id","desc")->first();
         //查询操作日志
         //查询操作日志
         $actionLog = $con->table("action_log")->where(["type"=>1,'oid'=>$order_id])->orderBy("id","desc")->get();
         $actionLog = $con->table("action_log")->where(["type"=>1,'oid'=>$order_id])->orderBy("id","desc")->get();
 
 

resources/views/Pcb/PcbOrderDetail.blade.php

@@ -19,8 +19,8 @@
                         <th>会员账号</th>
                         <th>会员账号</th>
                         <th>交易订单编号</th>
                         <th>交易订单编号</th>
                         <th>是否调价</th>
                         <th>是否调价</th>
-                        <th>订单金额</th>
-                        <th>调整后金额</th>
+                        <th>订单金额(含税10%)</th>
+                        <th>调整后金额(含税10%)</th>
                         <th>订单状态</th>
                         <th>订单状态</th>
                     </tr>
                     </tr>
                     <tr>
                     <tr>

resources/views/Pcb/PcbPurchaseDetail.blade.php

@@ -18,8 +18,8 @@
                         <th>采购订单编号</th>
                         <th>采购订单编号</th>
                         <th>交易订单编号</th>
                         <th>交易订单编号</th>
                         <th>是否调价</th>
                         <th>是否调价</th>
-                        <th>调整前订单金额</th>
-                        <th>调整后金额</th>
+                        <th>调整前订单金额(含税10%)</th>
+                        <th>调整后金额(含税10%)</th>
                         <th>订单状态</th>
                         <th>订单状态</th>
                     </tr>
                     </tr>
                     <tr>
                     <tr>