From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Sun, 20 Feb 2022 21:24:16 +0800 Subject: [PATCH] Merge branch 'api_score_meger' --- zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 3 ++- 1 files changed, 2 insertions(+), 1 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 6a86a31..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 @@ -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