From a1ac92dc022f85ff3482a2f43e58e87eab3a738f Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sun, 27 Sep 2020 18:29:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BC=E9=87=91bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyStatementPool/editPuPool.html | 3 +++ Data/update.sql | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index 0fad3346f..660bf6d40 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -419,6 +419,9 @@ if (!refund || refund < 0) { refund = 0; $(_this).parent().parent().find(".refund").val(refund); + } else if(parseFloat(refund) > parseFloat(pay_money)) { + refund = pay_money; + $(_this).parent().parent().find(".refund").val(refund); } //补点 var increment_ratio = $(_this).parent().parent().find(".increment_ratio").val(); diff --git a/Data/update.sql b/Data/update.sql index 01cf88d5c..fae38c04d 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -2535,6 +2535,9 @@ ALTER TABLE `tab_settleup_marketorder` DROP COLUMN `company_name`, ADD COLUMN `company_name` varchar(50) NULL DEFAULT '' COMMENT '公司名称' AFTER `company_id`; +ALTER TABLE `tab_company_lack_statement_info` +ADD COLUMN `remark` varchar(255) NULL DEFAULT '' COMMENT '备注' AFTER `withdraw_type`; + CREATE TABLE `tab_aggregate_lack_statement_info` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增主键', `company_id` int(11) NULL DEFAULT 0 COMMENT '对账公司id',