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 '
' - // + '' + + '' + '
' - + ' 订单编号:' + row.code + '
' - // + '

' + value.goodsName + '

' - // + ' ' + value.goodsDesc + '
' + + '' + row.code + '
' + + ' ' + row.consoleGoodsName + '
' + ' 联系人:' + row.addressName + '
' + ' 联系电话:' + row.addressPhone + '
' + ' 联系地址:' + row.address + '
' + ' 下单时间:' + row.createTime + '
' + ' 预约时间:' + row.expectTimeStart + ' - ' + row.expectTimeEnd + '
' - + ' 总金额:' + row.financialMasterMoney + '元
' + + ' 下单总金额:' + row.financialMasterMoney + '元,师傅实收金额: '+ row.financialMasterPayMoney + '
' + '

' + '
'; } @@ -445,12 +444,17 @@ } } }, + { + field: 'lastCallTime', + title: '最近联系时间' + }, { title: '操作', align: 'left', formatter: function (value, row, index) { var actions = []; actions.push('查看 '); + actions.push('拨号详情 '); if(row.orderStatus == 0 || row.orderStatus == 1){ actions.push('商家退单 '); } @@ -539,6 +543,11 @@ }); } + function callDetail(id) { + var url = "order/record?orderId=" + id; + $.modal.open("拨号记录", url); + } + // 商家退单 function orderMasterCancel(id){ $.modal.confirm("确定要取消订单吗?", function() {