From 9c791d431038fe79a111805762ee2f42c96b51c5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 17:03:15 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 1d204ba..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
@@ -253,7 +253,7 @@
goodsCash: 0,
achieveType : _this.achieveTypeList[0].value,
commission : 0,
- isShare: false,
+ isShare: false
});
}
});
@@ -309,6 +309,7 @@
goodsCash: achieve.goodsCash,
achieveType: achieve.achieveType,
projPercentage: achieve.commission,
+ payMethod:"现金",
};
achaeveList.push(achieveNew);
})
@@ -351,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();
}
@@ -435,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]){
@@ -444,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