From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
index d3837fd..962a224 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
@@ -352,7 +352,7 @@
title: "打印订单",
area: ['250px', '550px'],
maxmin: true,
- content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + this.order.id],
+ content: [basePath + '/admin/order/printOrder?id=' + this.order.id],
cancel: function (index, layero) {
_this.closeFram();
}
@@ -436,8 +436,11 @@
let _this = this;
let jsqMap={};
let isOk=true;
+ console.log(this.achieveList);
+ let rechargeMoney=parseFloat(_this.rechargeMoney);
for(let i=0 ; i< this.achieveList.length; i++){
let achieve=this.achieveList[i];
+
if(!isNaN(achieve.goodsCash) ){
key=achieve.achieveType;
if(!jsqMap[key]){
@@ -445,17 +448,21 @@
}else{
jsqMap[key]=jsqMap[key]+parseFloat(achieve.goodsCash);
}
- if(jsqMap[key]>_this.rechargeMoney) {
- this.$message.error("业绩分配金额大于支付金额");
- isOk = false;
- return;
- }
}else{
this.$message.error("业绩分配金额请填写数字");
isOk=false;
return;
}
};
+ for(money in jsqMap ){
+ if(money > rechargeMoney) {
+ this.$message.error("业绩分配金额大于支付金额");
+ isOk = false;
+ return;
+ }
+ }
+
+
console.log("isOk",isOk);
return isOk;
},
--
Gitblit v1.9.1