From cc2abf126a8a23fc0f993138864f2733f7b67a87 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Mon, 30 Oct 2023 22:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=8D=95=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/order/pc-master.html  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html
index ba7ef249..0f9d6db3 100644
--- a/ghy-admin/src/main/resources/templates/order/pc-master.html
+++ b/ghy-admin/src/main/resources/templates/order/pc-master.html
@@ -412,17 +412,16 @@
                     title: '订单信息',
                     formatter: function (value, row) {
                         return '<div style="display:flex;justify-content: center;align-items: center;">'
-                            // + '<img decoding="async" src="' + value.goodsImgUrl + '" width="100" height="100" />'
+                            + '<img decoding="async" src="' + value.goodsImgUrl + '" width="100" height="100" />'
                             + '<div>'
-                            + '<small> 订单编号：' + row.code + '<small/> <br>'
-                            // + '<h4> ' + value.goodsName + '<h4/>'
-                            // + '<small> ' + value.goodsDesc + '</small> <br>'
+                            + '<small>' + row.code + '<small/> <br>'
+                            + '<small> ' + row.consoleGoodsName + '<small/> <br>'
                             + '<small> 联系人：' + row.addressName + '</small> <br>'
                             + '<small> 联系电话：' + row.addressPhone + '</small> <br>'
                             + '<small> 联系地址：' + row.address + '</small> <br>'
                             + '<small> 下单时间：' + row.createTime + '</small> <br>'
                             + '<small> 预约时间：' + row.expectTimeStart + ' - ' + row.expectTimeEnd + '</small> <br>'
-                            + '<small> 总金额：' + row.financialMasterMoney + '元</small> <br>'
+                            + '<small> 下单总金额：' + row.financialMasterMoney + '元,师傅实收金额: '+ row.financialMasterPayMoney + ' </small> <br>'
                             + '</div>'
                             + '</div>';
                     }
@@ -445,12 +444,17 @@
                         }
                     }
                 },
+                {
+                    field: 'lastCallTime',
+                    title: '最近联系时间'
+                },
                 {
                     title: '操作',
                     align: 'left',
                     formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-info"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="callDetail(\'' + row.id + '\')"><i class="fa fa-info"></i>拨号详情</a> ');
                         if(row.orderStatus == 0 || row.orderStatus == 1){
                             actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterCancel(\'' + row.id + '\')"></i>商家退单</a> ');
                         }
@@ -539,6 +543,11 @@
         });
     }
 
+    function callDetail(id) {
+        var url = "order/record?orderId=" + id;
+        $.modal.open("拨号记录", url);
+    }
+
     // 商家退单
     function orderMasterCancel(id){
         $.modal.confirm("确定要取消订单吗？", function() {