From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index bea0774..fb3829a 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -118,7 +118,7 @@
}
</style>
</head>
-<body style="overflow: hidden">
+<body >
<div id="app" v-cloak>
@@ -911,7 +911,7 @@
this.achieveList.push({
orderItem: item,
staff: this.loginUser,
- saleId: this.loginUser.suId,
+ saleId: _this.loginUser.suUserType === 'admin' ? '' : this.loginUser.suId,
goodsCash: item.payMoney,
achieveType : _this.achieveTypeList[0].value,
commission: 0,
@@ -1103,6 +1103,7 @@
//结算打印提示
if (submitType == 1) {
if (_this.printPaper) {
+ _this.$message.success(data.info);
_this.print();
} else {
_this.$message.success({
--
Gitblit v1.9.1