From 83be430710bd0269cfc781ab241ff2aba93106f0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 06 Jan 2021 16:06:43 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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..b1e8763 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;
}
@@ -776,13 +776,15 @@
_this.achieveList.forEach(achieve => {
for (let i = 0; i < _this.order.items.length; i++) {
let item = _this.order.items[i];
- item.achieveList = [];
+ if (!item.achaeveList){
+ item.achaeveList = [];
+ }
if (item.uuid == achieve.orderItem.uuid) {
let achieveNew = {
beaultId: achieve.saleId,
t1: achieve.achieveMoney
};
- item.achieveList.push(achieveNew);
+ item.achaeveList.push(achieveNew);
break;
}
}
@@ -818,7 +820,13 @@
} else {
_this.$message.success(data.info);
}
- parent.myGrid.serchData();
+ if(parent.myGrid) {
+ parent.myGrid.serchData();
+ }
+
+ if (parent.app) {
+ parent.app.orderQuery();
+ }
}
});
}
@@ -888,9 +896,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