diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index e46accc5..bbc68b12 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -313,10 +313,12 @@ shiro:hasPermission="order:order:export"> 导出 - 付款 + + 指派 + @@ -827,6 +829,28 @@ }); } + function showPcOrderWorker() { + table.set(); + var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); + if (rows.length === 0) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } + var url = "pcOrderWorker/" + rows.join(","); + layer.open({ + type: 2, + area: ['800px', '450px'], + fix: false, + //不固定 + maxmin: true, + shade: 0.3, + title: '指派师傅', + content: url, + // 弹层外区域关闭 + shadeClose: true + }); + } + function mergePay() { table.set(); var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); 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 f32186e4..6f952acc 100644 --- a/ghy-admin/src/main/resources/templates/order/pc-master.html +++ b/ghy-admin/src/main/resources/templates/order/pc-master.html @@ -170,9 +170,9 @@ 付款 - - 指派 - + + +