From 4e5ecd152044d53cc5853037eb60361fff4d11dc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 14 Dec 2020 21:46:36 +0800
Subject: [PATCH] Merge branch 'master' into ty_urgent
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 8 ++++----
1 files changed, 4 insertions(+), 4 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 b1890a5..8168b3b 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
@@ -566,7 +566,7 @@
//获取用户列表
AjaxProxy.requst({
app: _this,
- url: basePath + '/admin/getShopStaffByRoleName?roleName=美疗师',
+ url: basePath + '/admin/shopAll',
callback: function (data) {
_this.userList = data.rows;
}
@@ -888,9 +888,9 @@
*/
chouseGoods() {
let _this = this;
- this.multipleSelection.forEach(item => {
- _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
- });
+ // this.multipleSelection.forEach(item => {
+ // _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
+ // });
this.closeXm();
this.calculationTotal();
},
--
Gitblit v1.9.1