From 269985404f94b50d14099b83f3436d6d405c365d Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Thu, 15 Jul 2021 23:05:36 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 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..d30d303 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 @@ -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