调整显示

application/admin/controller/Produceorder.php

@@ -239,6 +239,7 @@ class Produceorder extends Backend
                         return $q->where('mobile_order.admin_id', $this->auth->id);
                     }
                 })
+                ->with(['produce'])
                 ->order($sort, $order)
                 ->paginate($limit);
             return MobileOrderExport::export($list,$this->admin());
@@ -283,6 +284,7 @@ class Produceorder extends Backend
 //                ->whereOr('platform_source','敢探号')
 
                 ->order($sort, $order)
+                ->with(['produce'])
                 ->paginate($limit);
             // print_r($list->getLastSql());
             $upStatus=[];
@@ -358,6 +360,7 @@ class Produceorder extends Backend
                     ->whereNotIn('status', [0, 50, 90])
                     ->where($map)
                     ->where('mobile_order.type', 1)
+                    ->with(['produce'])
                     ->where(function ($q) {
                         //供应商
                         if ($this->proxy) {

application/admin/view/produceorder/show_open_data.html

@@ -0,0 +1,39 @@
+<style>
+    .key{display: inline-block;min-width: 100px;text-align: right;margin-right: 10px;}
+</style>
+<p>
+    <span class="key">姓名：</span>
+    <span>{$row.open_name}</span>
+</p>
+<p>
+    <span class="key">手机号：</span>
+    <span>{$row.open_phone}</span>
+</p>
+<p>
+    <span class="key">身份证号码：</span>
+    <span>{$row.open_id_no}</span>
+</p>
+<p>
+    <span class="key">正面照：</span>
+    <span>
+        <a target="_blank" href="{$row.open_face_img}">
+            <img src="{$row.open_face_img}" style="max-width: 200px;max-height: 200px;">
+        </a>
+    </span>
+</p>
+<p>
+    <span class="key">身份证正面：</span>
+    <span>
+        <a target="_blank" href="{$row.open_idcard_face_img}">
+            <img src="{$row.open_idcard_face_img}" style="max-width: 200px;max-height: 200px;">
+        </a>
+    </span>
+</p>
+<p>
+    <span class="key">身份证反面：</span>
+    <span>
+        <a target="_blank" href="{$row.open_idcard_back_img}">
+            <img src="{$row.open_idcard_back_img}" style="max-width: 200px;max-height: 200px;">
+        </a>
+    </span>
+</p>

public/assets/js/backend/produceorder.js

@@ -144,24 +144,27 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
                     {field: 'order_no', title: __('订单信息'),operate: false,formatter(_,order){
                             let a=[]
                             a.push(`<div>订单号:<b class="btn-order_link" data-link="${order.order_no}">${order.order_no}</b><span style='color: ${order.flag};font-size: 24px; '>&#127987;</span></div>`)
-                            if(order.pay_no){
-                                a.push(`<div>支付单号:<b class="btn-order_link" data-link="${order.pay_no}">${order.pay_no}</b></div>`)
-                            }
-                            a.push(`<div class="btn-order_link" data-link="${order.no}"><b>商品信息:${order.no}</b></div>`)
+                            a.push(`<div>外部订单号:<b class="btn-order_link" data-link="${order.out_order_no}">${order.out_order_no}</b></div>`)
+                            a.push(`<div>商品编码:<b class="btn-order_link" data-link="${order.produce ? order.produce.local_code : ''}">${order.produce ? order.produce.local_code : ''}</b></div>`)
+                            a.push(`<div>供应商:<b class="btn-order_link" data-link="${order.supplier}">${order.supplier}</b></div>`)
+                            // if(order.pay_no){
+                            //     a.push(`<div>支付单号:<b class="btn-order_link" data-link="${order.pay_no}">${order.pay_no}</b></div>`)
+                            // }
+                            // a.push(`<div class="btn-order_link" data-link="${order.no}"><b>商品信息:${order.no}</b></div>`)
                             // a.push(`<div>归属地:${order.info.mobile.province}/${order.info.mobile.city}</div>`)
-                            if(adminInfo.is_manager){
-                                a.push(`<div>供应商:${order.proxy?order.proxy.nickname:''}</div>`)
-                            }
+                            // if(adminInfo.is_manager){
+                            //     a.push(`<div>供应商:${order.proxy?order.proxy.nickname:''}</div>`)
+                            // }
                             // a.push(`<div>运营商:${order.info?order.info.mobile.network:''}</div>`)
-                            a.push(`<div>卡品牌:${order.brand}</div>`)
-                            if(showAmountDi && is_proxy==0) {
-                                a.push(`<div class="btn-order_link" data-link="${order}">底价:${order.amount_di}</div>`)
-                            }
-                            a.push(`<div class="btn-order_link" data-link="${order.amount_charge}">预存:${order.amount_charge}</div>`)
-                            if(is_proxy == 0 ) {
+                            // a.push(`<div>卡品牌:${order.brand}</div>`)
+                            // if(showAmountDi && is_proxy==0) {
+                            //     a.push(`<div class="btn-order_link" data-link="${order}">底价:${order.amount_di}</div>`)
+                            // }
+                            // a.push(`<div class="btn-order_link" data-link="${order.amount_charge}">预存:${order.amount_charge}</div>`)
+                            // if(is_proxy == 0 ) {
                                 // a.push(`<div class="btn-order_link" data-link="${order.info.mobile.is_activity?order.info.mobile.amount_kill:order.info.mobile.amount_base}"><b>售价:${order.info.mobile.is_activity?order.info.mobile.amount_kill:order.info.mobile.amount_base}</b></div>`)
-                                a.push(`<div class="btn-order_link" data-link="${order.amount}">订单价格:${order.amount}</div>`)
-                            }
+                            //     a.push(`<div class="btn-order_link" data-link="${order.amount}">订单价格:${order.amount}</div>`)
+                            // }
                             // a.push(`<div class='btn-order_link' data-link="${order.info.info.describe}">套餐:${order.info?order.info.info.describe:''}</div>`)
                             // a.push(`<div>备注:${order.info?order.info.mobile.remark:''}</div>`)
                             // a.push(`<a class="btn btn-success btn-sm btn-order_link" data-link="${a.join('')}">点击复制</a>`)
@@ -180,8 +183,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
                                 // a.push(`<div>快手商户号:<span style="color: #0d6aad;">${order.pay_mid_ks}</span></div>`)
                             }
                             a.push(`<div>备注:${order.remark}</div>`)
-                            a.push(`<div>快递名称:${order.trans_name}</div>`)
-                            a.push(`<div>快递单号:${order.trans_no}</div>`)
+                            // a.push(`<div>快递名称:${order.trans_name}</div>`)
+                            // a.push(`<div>快递单号:${order.trans_no}</div>`)
                             a.push(`<a class="btn btn-link btn-click-show-open" style="color: #00a2ff;" data-id="${order.id}" data-open="${order.open_uploaded}">查看资料</a>`)
                             return `<div style="max-width: 200px;text-align: left;" class="break-words">${a.join('')}</div>`
                         },width:'20%',valign:'top',align:'left'},