diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
index f9334392c..a605df164 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
@@ -57,6 +57,7 @@
}
function getTerminateInfo(){
+ var payday_date = getItemValue(0,getRow(),"PAYDAY_DATE");
var adjusttype = getItemValue(0,0,"ADJUST_TYPE");
if(adjusttype.length==0){
alert("请先选择变更类型!!!");
@@ -140,6 +141,9 @@
setItemValue(0,getRow(),"CONTRACT_TOTAL",Number(overduerent)+Number(sumpenalty)+Number(remaincorpus)+Number(HandlingCharge)+Number(getItemValue(0,getRow(),"OTHER_IN"))+Number(getItemValue(0,getRow(),"NOMINAL_PRICE"))-Number(getItemValue(0,getRow(),"OTHER_OUT")).toFixed(2)+REPAYMENT);
}
}
+
+ setItemValue(0,0,"PAYDAY_DATE",payday_date);
+
}
//计算债券总计
function getContractBondTotal(){
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentApplyList.jsp
index 7a2954b82..4d790ad4b 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentApplyList.jsp
@@ -36,7 +36,7 @@
else
{
var mes=sReturnInfos[1];
- alert(mes);
+ alert(sReturnInfos[0]);
}
reloadSelf();
},"请选择合同");
diff --git a/src_sql/鎶曚骇SQL/V20200206/tft_20200206.sql b/src_sql/鎶曚骇SQL/V20200206/tft_20200206.sql
index 65de228b6..b8c87425c 100644
--- a/src_sql/鎶曚骇SQL/V20200206/tft_20200206.sql
+++ b/src_sql/鎶曚骇SQL/V20200206/tft_20200206.sql
@@ -42,7 +42,8 @@ insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `I
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('c670e9dd2c0146be96e12c993bcb4dcd','be101123ef74413eb0d8acad8b6b22b9','8cd356fdc57d442fae1aac56f5ba084f',NULL,NULL,NULL,NULL,NULL,NULL);
insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('f3b35aa84494481dbb9386578bf7f92a','bbe36e81f17542078489f223239e658a','8cd356fdc57d442fae1aac56f5ba084f',NULL,NULL,NULL,NULL,NULL,NULL);
-
-
+-- 选择本方账号,调整账号信息显示不全
+delete from select_catalog where selname='SelectOwnAccountForContract';
+insert into `select_catalog` (`selname`, `seltype`, `seldescribe`, `seltablename`, `selprimarykey`, `selbrowsemode`, `selargs`, `selhidefield`, `selcode`, `selfieldname`, `selfielddisp`, `selreturnvalue`, `selfilterfield`, `isinuse`, `mutilorsingle`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('SelectOwnAccountForContract','Sql','查询本方账户',NULL,NULL,'Grid','String LessorId','account_purpose','select acc_number,acc_bank,acc_name,account_purpose from own_account where own_id=\'#LessorId\'','开户帐号,开户银行,开户户名,用途','acc_number@style={width:300px;}@acc_name@style={width:300px;}','acc_number@acc_bank@acc_name@account_purpose',NULL,'1','Single',NULL,NULL,NULL,NULL,NULL,'SYS_Designer',NULL,'2017/08/15 13:45:07','SYS_Designer','2018/03/08 15:13:26',NULL);
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index cc4c54f50..aeb9db5c3 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -1127,7 +1127,7 @@ public class CollectAuditInfoCache {
strbuff.append("");
strbuff.append("");
strbuff.append("");
- //strbuff.append(sn);//交易明细号
+ strbuff.append(sn);//交易明细号
strbuff.append("");
strbuff.append("");
strbuff.append("");
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
index 3d436a19f..c12c11330 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
@@ -1127,7 +1127,7 @@ public class CollectAuditInfoCacheTj {
strbuff.append("");
strbuff.append("");
strbuff.append("");
- //strbuff.append(sn);//交易明细号
+ strbuff.append(sn);//交易明细号
strbuff.append("");
strbuff.append("");
strbuff.append("");