From 25dd3d05626f331ca3d90a71a4b6b3d8ae36603b Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Tue, 24 Jul 2018 10:23:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7=E5=88=86?=
 =?UTF-8?q?=E8=A1=8C=E5=9C=B0=E5=9D=80=E6=A0=B9=E6=8D=AE=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BF=85=E5=A1=AB=E3=80=82=202.=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E6=98=AF=E5=90=A6=E5=B7=AE=E9=A2=9D=E6=94=BE=E6=AC=BE?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TablesXML/SelectCatalog/SelectContractPayment.xml           | 2 +-
 .../Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp     | 2 ++
 .../WEB-INF/etc/app/component/component-parameter-config.xml    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPayment.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPayment.xml
index 960d1a95e..162c2a791 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPayment.xml
+++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPayment.xml
@@ -38,7 +38,7 @@ SELECT
   lul.customername,
   di.total,
   di.usedlines,
-  relines,
+  di.relines,
   vlfp.plan_money,
   IFNULL(lfi.allfact_money, 0) AS afact_money,
   vlfp.allfact_money,
diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
index e5a740764..7b7ea5305 100644
--- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
+++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
@@ -89,7 +89,9 @@
 		var FbSdk = getItemValue(0,0,"FbSdk");
 		if(FbSdk=='Y'){
 			showItem(0,"branch_code");
+			showItemRequired(0,"branch_code");
 		}else if(FbSdk=='N'){
+			hideItemRequired(0,"branch_code");
 			hideItem(0,"branch_code");
 		}
 	}
diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
index 89f121afe..14701ab64 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -169,7 +169,7 @@
 	<Parameter CODESCRIPT="residual_method" CODESOURCE="Code" COMPONENTTYPE="PRD0380" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="ResidualMethod" PARAMETERNAME="残值处理方式" SELECTTYPE="05" STATUS="1"/>
 	<Parameter CODESCRIPT="INCOME_NUMBER" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="5" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="INCOME_NUMBER" PARAMETERNAME="租赁期限" SELECTTYPE="04" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0380" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="EndValueRatio" PARAMETERNAME="残值比例限定" STATUS="1" UNIT="&lt;font&gt;%&lt;/font&gt;"/>
-	<Parameter CODESCRIPT="yes_no" CODESOURCE="Code" COMPONENTTYPE="PRD0385" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" SELECTTYPE="05" STATUS="1"/>
+	<Parameter CODESCRIPT="yes_no" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" SELECTTYPE="05" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="GuaranteeName" PARAMETERNAME="担保人名称" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="GuaranteePhone" PARAMETERNAME="担保人电话" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="GuaranteeAddress" PARAMETERNAME="担保人地址" STATUS="1"/>