From c1cb25ff1c05f90858aaef8cb12ccade4c36dba7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 22 Dec 2020 17:45:53 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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..c964927 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;
                 }
@@ -818,7 +818,13 @@
                                 } else {
                                     _this.$message.success(data.info);
                                 }
-                                parent.myGrid.serchData();
+                                if(parent.myGrid) {
+                                    parent.myGrid.serchData();
+                                }
+
+                                if (parent.app) {
+                                    parent.app.orderQuery();
+                                }
                             }
                         });
                     }
@@ -888,9 +894,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