修复bug

jyy

2021-07-15 84edcb7699ac96bd265830dc8cb957e206da966c

修复bug

 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java

@@ -147,7 +147,6 @@
        if (StringUtils.isBlank(pageVo.getOrder())) {
            pageVo.setOrder("desc");
        }
        projService.setShopId(getMe().getShopId());
        List<SysProjServices> dataList = projServicesSerivce.findInPage(projService, pageVo);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, projServicesSerivce.findTotal(projService));
        return result;

 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;
            },