~jiangyouyao/beauty-erp.git

jiangyouyao / beauty-erp

forked from beauty-erp

summary
commits
tree
docs
forks
compare

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-07-20 9a341d58bf0cfc4d9c0b9be745671f4e5c490b02

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form-bak.html

@@ -185,7 +185,7 @@
            title: "打印订单",
            area: ['250px', '550px'],
            maxmin: true,
            content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + loj.getResult().mapInfo.orderId],
            content: [basePath + '/admin/order/printOrder?id=' + loj.getResult().mapInfo.orderId],
            cancel: function (index, layer) {
               if (parent.app) {
                  parent.app.vipInfoFn();

			@@ -185,7 +185,7 @@
			title: "打印订单",
			area: ['250px', '550px'],
			maxmin: true,
			content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + loj.getResult().mapInfo.orderId],
			content: [basePath + '/admin/order/printOrder?id=' + loj.getResult().mapInfo.orderId],
			cancel: function (index, layer) {
			if (parent.app) {
			parent.app.vipInfoFn();