diff --git a/Application/Admin/View/Statement/createCpStatement.html b/Application/Admin/View/Statement/createCpStatement.html index 6dbc23016..5d6634367 100644 --- a/Application/Admin/View/Statement/createCpStatement.html +++ b/Application/Admin/View/Statement/createCpStatement.html @@ -447,6 +447,12 @@ callback(data) } }) + }, + floatAdd(a,b){ + return Math.round(a*100+b*100)/100; + }, + floatCut(a,b){ + return Math.round(a*100-b*100)/100; } } //数据类 @@ -627,28 +633,31 @@ }else{ var ratio = td['second_ratio']/100; } - DATAOBJ.statement_count['sum_money'] -= td['sum_money']; + DATAOBJ.statement_count['sum_money'] = PUBLIC.floatCut(DATAOBJ.statement_count['sum_money'],td['sum_money']); - td['sum_money'] = Math.floor((td['pay_amount']*(100-td['promote_ratio'])/100*ratio*(100-td['fax_ratio'])/100)* 100) / 100 ; - DATAOBJ.statement_count['sum_money']+=(td['sum_money']-0); + td['sum_money'] = Math.round((td['pay_amount']*(100-td['promote_ratio'])/100*ratio*(100-td['fax_ratio'])/100)* 100) / 100 ; + + DATAOBJ.statement_count['sum_money']=PUBLIC.floatAdd(DATAOBJ.statement_count['sum_money'],td['sum_money']); + }else{ - DATAOBJ.fine = Math.floor(DATAOBJ.fine * 100) / 100 ; + DATAOBJ.fine = Math.round(DATAOBJ.fine * 100) / 100 ; + if(!CHECK.money.test(val)){ + layer.msg('罚款金额格式错误'); + $(this).val(DATAOBJ.fine); + return false; + } if(val > DATAOBJ.statement_count['sum_money']){ layer.msg('罚款金额过大,总计不允许为负数'); $(this).val(DATAOBJ.fine); return false; } - DATAOBJ.statement_count['sum_money'] = (DATAOBJ.statement_count['sum_money'] -0+DATAOBJ.fine); - DATAOBJ.statement_count['pay_amount'] = (DATAOBJ.statement_count['pay_amount'] -0+DATAOBJ.fine); + DATAOBJ.statement_count['sum_money'] =PUBLIC.floatAdd(DATAOBJ.statement_count['sum_money'],DATAOBJ.fine); + DATAOBJ.statement_count['pay_amount'] = PUBLIC.floatAdd(DATAOBJ.statement_count['pay_amount'],DATAOBJ.fine); eval(str); - DATAOBJ.statement_count['sum_money'] = DATAOBJ.statement_count['sum_money']-DATAOBJ.fine; - DATAOBJ.statement_count['pay_amount'] = DATAOBJ.statement_count['pay_amount']-DATAOBJ.fine; - + DATAOBJ.statement_count['sum_money'] =PUBLIC.floatCut(DATAOBJ.statement_count['sum_money'],DATAOBJ.fine); + DATAOBJ.statement_count['pay_amount'] = PUBLIC.floatCut(DATAOBJ.statement_count['pay_amount'],DATAOBJ.fine); } - DATAOBJ.statement_count['pay_amount'] = Math.floor(DATAOBJ.statement_count['pay_amount'] * 100) / 100 ; - DATAOBJ.statement_count['sum_money'] = Math.floor(DATAOBJ.statement_count['sum_money'] * 100) / 100; - TPLSHOW.showStatementList(true); }) }, diff --git a/Data/update.sql b/Data/update.sql index 2e8cb8aa6..891665929 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -919,7 +919,7 @@ ADD COLUMN `pay_config` varchar(255) NOT NULL COMMENT '支付渠道 wx 微信 zf ALTER TABLE tab_promote add `company_belong` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会归属:0-内团;1-外团'; ALTER TABLE tab_promote add `company_relation` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会关系:0-自主开发及维护;1-只维护'; ---游戏的合作方新增联系人,联系电话,邮寄地址,公司税号,收款方名称,银行账号,开户行 liuweiwen 2020-01-03 +-- 游戏的合作方新增联系人,联系电话,邮寄地址,公司税号,收款方名称,银行账号,开户行 liuweiwen 2020-01-03 ALTER TABLE tab_partner ADD `link_man` varchar(64) DEFAULT '' COMMENT '联系人' AFTER `status`; ALTER TABLE tab_partner ADD `link_phone` varchar(24) DEFAULT NULL COMMENT '联系电话' AFTER `link_man`; ALTER TABLE tab_partner ADD `address` varchar(255) DEFAULT NULL COMMENT '邮寄地址' AFTER `link_phone`;