diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index bdb10df0..61762999 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -56,6 +56,37 @@ border-color: #1c84c6; color: #fff; } + + /* 表格滚动条样式 */ + .table-scroll-container { + overflow-x: auto; + overflow-y: auto; + max-height: 600px; + } + + .table-scroll-container::-webkit-scrollbar { + width: 8px; + height: 8px; + } + + .table-scroll-container::-webkit-scrollbar-track { + background: #f1f1f1; + border-radius: 4px; + } + + .table-scroll-container::-webkit-scrollbar-thumb { + background: #c1c1c1; + border-radius: 4px; + } + + .table-scroll-container::-webkit-scrollbar-thumb:hover { + background: #a8a8a8; + } + + /* 表格最小宽度 */ + #bootstrap-table { + min-width: 2000px; + } @@ -331,7 +362,7 @@ -
+
@@ -645,17 +676,18 @@ field: 'goods', title: '订单信息', formatter: function (value, row) { + var imgUrl = (value && value.goodsImgUrl) ? value.goodsImgUrl : ''; return '
' - + '' + + '' + '
' - + '

' + row.code + ' +

' - + '

' + row.consoleGoodsName + '

' - + '

联系人：' + row.addressName + '

' - + '

联系电话：' + row.addressPhone + '

' - + '

联系地址：' + row.address + '

' - + '

下单时间：' + row.createTime + '

' - + '

预约时间：' + row.mixExpectTime + '

' - + '

下单总金额：' + row.financialMasterMoney + '元,师傅实收金额: '+ row.financialMasterPayMoney + '

' + + '

' + (row.code || '') + '

' + + '

' + (row.consoleGoodsName || '') + '

' + + '

联系人：' + (row.addressName || '') + '

' + + '

联系电话：' + (row.addressPhone || '') + '

' + + '

联系地址：' + (row.address || '') + '

' + + '

下单时间：' + (row.createTime || '') + '

' + + '

预约时间：' + (row.mixExpectTime || '') + '

' + + '

下单总金额：' + (row.financialMasterMoney || '') + '元,师傅实收金额: ' + (row.financialMasterPayMoney || '') + '

' + '
' + '
'; } @@ -790,6 +822,44 @@ { field: 'payTime', title: '付款时间' + }, + { + field: 'returnReason', + title: '退单原因', + align: 'center', + formatter: function (value, row, index) { + return value || '-'; + } + }, + { + field: 'returnReasonDetail', + title: '退单原因详情', + align: 'center', + formatter: function (value, row, index) { + if (value && value.length > 20) { + return value.substring(0, 20) + '...'; + } + return value || '-'; + } + }, + { + field: 'returnImages', + title: '退单图片', + align: 'center', + formatter: function (value, row, index) { + if (value) { + var images = value.split(','); + var html = ''; + for (var i = 0; i < Math.min(images.length, 3); i++) { + html += ''; + } + if (images.length > 3) { + html += '+' + (images.length - 3) + ''; + } + return html; + } + return '-'; + } }] }; $.table.init(options); @@ -1034,6 +1104,26 @@ showPayQrcode(rows.join()); } + // 显示退单图片 + function showImage(imageUrl) { + if (!imageUrl) { + return; + } + + var html = '
' + + '' + + '
'; + + layer.open({ + type: 1, + title: '退单图片', + area: ['600px', '500px'], + content: html, + shadeClose: true, + btn: ['关闭'] + }); + } + // 主订单全部 var orderMasterHaveReleasedUrl = ""; // 主订单新订单