增加退单 后台主单显示
This commit is contained in:
cb
parent
d2260ade7b
commit
356d2beaa5
|
|
@ -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;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body class="gray-bg">
|
||||
|
|
@ -331,7 +362,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<div class="col-sm-12 select-table table-striped table-scroll-container">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -645,17 +676,18 @@
|
|||
field: 'goods',
|
||||
title: '订单信息',
|
||||
formatter: function (value, row) {
|
||||
var imgUrl = (value && value.goodsImgUrl) ? value.goodsImgUrl : '';
|
||||
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="' + imgUrl + '" width="100" height="100" />'
|
||||
+ '<div>'
|
||||
+ '<p>' + row.code + ' + <p/>'
|
||||
+ '<p> ' + row.consoleGoodsName + '<p/>'
|
||||
+ '<p> 联系人：' + row.addressName + '</p>'
|
||||
+ '<p> 联系电话：' + row.addressPhone + '</p>'
|
||||
+ '<p> 联系地址：' + row.address + '</p>'
|
||||
+ '<p> 下单时间：' + row.createTime + '</p>'
|
||||
+ '<p> 预约时间：' + row.mixExpectTime + '</p>'
|
||||
+ '<p> 下单总金额：' + row.financialMasterMoney + '元,师傅实收金额: '+ row.financialMasterPayMoney + ' </p>'
|
||||
+ '<p>' + (row.code || '') + '</p>'
|
||||
+ '<p>' + (row.consoleGoodsName || '') + '</p>'
|
||||
+ '<p>联系人：' + (row.addressName || '') + '</p>'
|
||||
+ '<p>联系电话：' + (row.addressPhone || '') + '</p>'
|
||||
+ '<p>联系地址：' + (row.address || '') + '</p>'
|
||||
+ '<p>下单时间：' + (row.createTime || '') + '</p>'
|
||||
+ '<p>预约时间：' + (row.mixExpectTime || '') + '</p>'
|
||||
+ '<p>下单总金额：' + (row.financialMasterMoney || '') + '元,师傅实收金额: ' + (row.financialMasterPayMoney || '') + '</p>'
|
||||
+ '</div>'
|
||||
+ '</div>';
|
||||
}
|
||||
|
|
@ -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 += '<img src="' + images[i] + '" style="width:30px;height:30px;margin:2px;" onclick="showImage(\'' + images[i] + '\')" />';
|
||||
}
|
||||
if (images.length > 3) {
|
||||
html += '<span style="color:#999;">+' + (images.length - 3) + '</span>';
|
||||
}
|
||||
return html;
|
||||
}
|
||||
return '-';
|
||||
}
|
||||
}]
|
||||
};
|
||||
$.table.init(options);
|
||||
|
|
@ -1034,6 +1104,26 @@
|
|||
showPayQrcode(rows.join());
|
||||
}
|
||||
|
||||
// 显示退单图片
|
||||
function showImage(imageUrl) {
|
||||
if (!imageUrl) {
|
||||
return;
|
||||
}
|
||||
|
||||
var html = '<div style="text-align:center;">' +
|
||||
'<img src="' + imageUrl + '" style="max-width:100%;max-height:500px;" />' +
|
||||
'</div>';
|
||||
|
||||
layer.open({
|
||||
type: 1,
|
||||
title: '退单图片',
|
||||
area: ['600px', '500px'],
|
||||
content: html,
|
||||
shadeClose: true,
|
||||
btn: ['关闭']
|
||||
});
|
||||
}
|
||||
|
||||
// 主订单全部
|
||||
var orderMasterHaveReleasedUrl = "";
|
||||
// 主订单新订单
|
||||
|
|
|
|||
Loading…
Reference in New Issue