Merge branch 'zjl_product_tracking_20201117'

app/Http/Controllers/OrderController.php

@@ -23,6 +23,7 @@ use App\Model\CmsModel;
 use App\Model\QueuedModel;
 use App\Model\ErpPayLogModel;
 use App\Model\PayExtendModel;
+use App\Model\OrderPurPriceModel;
 use Session;
 use Hprose\Http\Client;
 
@@ -322,6 +323,19 @@ function getLastTrack($rec_id)
     return $track['msg'].'，状态：'.$track['status_cn'];
 }
 
+// 获取竞调订单采购价格
+function getOrderPurPrice($xls_sn)
+{
+    $OrderPurPriceModel = new OrderPurPriceModel;
+
+    $data = $OrderPurPriceModel->where('xls_sn', $xls_sn)->first();
+
+    if (!$data) return false;
+
+    return $data;
+}
+
+
 Class OrderController extends Controller
 {
     // 首页

app/Model/OrderPurPriceModel.php

+<?php
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OrderPurPriceModel extends Model
+{
+    protected $connection = 'order';
+    protected $table      = 'lie_order_pur_price';
+    protected $primaryKey = 'id';
+    public $timestamps    = false;
+
+
+
+}
\ No newline at end of file

resources/views/detail/detail_items_info.php

@@ -138,6 +138,19 @@
         <?php } ?>
         </tbody>
         <tfoot>
+            <?php if ($username == 'vpadmin@ichunt.com' && $order_info['xls_sn']) { ?>
+                <tr>
+                    <td>订单采购明细：</td>
+                    <td colspan="18">
+                        <?php 
+                            $data = App\Http\Controllers\getOrderPurPrice($order_info['xls_sn']); 
+
+                            echo '税率：'.$data['rate'].'，采购单价：'.$data['pur_price'].'，采购数量：'.$order_items_info[0]['goods_number'].'，币别：'.$data['pur_currency'].'，采购汇率：'.$data['pur_rate'];
+                        ?>
+                    </td>
+                </tr>
+            <?php } ?>
+
             <?php if ($order_info['order_remark']) { ?>
                 <tr>
                     <td>订单备注信息：</td>

resources/views/orderlist/content.blade.php

@@ -32,10 +32,17 @@
                                     </dd>
                                 </dl>
                                 <dl>
+                                    @if ($username != 'vpadmin@ichunt.com')
                                         <dt>ERP订单号：</dt>
                                         <dd>
                                             <input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号">
                                         </dd>
+                                    @else
+                                        <dt>内部编码：</dt>
+                                        <dd>
+                                            <input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入内部编码">
+                                        </dd>
+                                    @endif
                                 </dl> 
                                 
                                 @if ($username != 'vpadmin@ichunt.com')