diff --git a/WebContent/Tenwa/Lease/Flow/Project/LbBeforeAppLication/LbBeforeAppLicationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/LbBeforeAppLication/LbBeforeAppLicationInfo.jsp index 3ea31a08a..7048bd7a9 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/LbBeforeAppLication/LbBeforeAppLicationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/LbBeforeAppLication/LbBeforeAppLicationInfo.jsp @@ -53,9 +53,10 @@ }) function save(){ + var carattributes = getItemValue(0,0,'CARATTRIBUTES'); if(!checkCertInfo())return; if(!checkTel())return; - if(!getCheckCode())return; + if("used_car"== carattributes && !getCheckCode())return; as_save(0,'check()'); } function changeCartype(){ @@ -67,7 +68,7 @@ setItemRequired(0,"mile",false); setItemRequired(0,"frame_number",false); setItemRequired(0,"age_limit",false); - }else{ + }else if("used_car"==carattributes) { $("#A_div_1110").attr("style","display:block;"); $("#A_div_1120").attr("style","display:block;"); $("#A_div_1130").attr("style","display:block;"); diff --git a/WebContent/fileTemplate/联合租赁——融资租赁合同-修订版-20200806.docx b/WebContent/fileTemplate/联合租赁——融资租赁合同-修订版-20200806.docx index 9df297452..674cbce63 100644 Binary files a/WebContent/fileTemplate/联合租赁——融资租赁合同-修订版-20200806.docx and b/WebContent/fileTemplate/联合租赁——融资租赁合同-修订版-20200806.docx differ diff --git a/src_sql/投产SQL/v20200915/tft_20200915.sql b/src_sql/投产SQL/v20200915/tft_20200915.sql index 7de488310..d8fbac840 100644 --- a/src_sql/投产SQL/v20200915/tft_20200915.sql +++ b/src_sql/投产SQL/v20200915/tft_20200915.sql @@ -92,3 +92,13 @@ insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `I insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('8fbac8e4d5534b1296d81045bca4ef0f','9ba1a7844e4447fe9cb115323a37736f','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL); insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('b99e0d5dd6654d0a9a49d09903c53892','755698c1c27a43efa6c23310757c6163','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL); insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('ed6f64afce91422980cc7efd5f8c9aae','be101123ef74413eb0d8acad8b6b22b9','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL); +insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('1f1719c31a70468283e3891089e942c9','c901f36d5d4e48a89b66dd3bc736afac','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL); +insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('32af84ce27644c19b55d745ffbc5fc5d','bbe36e81f17542078489f223239e658a','7ae245ef8b644b62a4658069adab6c32',NULL,NULL,NULL,NULL,NULL,NULL); +-- ӱǩ +insert into `BF_LABLECONFIG` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) values('c901f36d5d4e48a89b66dd3bc736afac','0050','lh_moneyinfo','޺ͬģ','tag_type2','value_type3','gandb,heji,nl,nll,chejia','SELECT IFNULL(GPS_FEE,0)+IFNULL(INSURANCE_PREMIUM,0) AS gandb,IFNULL(GPS_FEE,0)+IFNULL(INSURANCE_PREMIUM,0) AS heji,YEAR_RATE AS nl,YEAR_RATE AS nll,EQUIP_AMT AS chejia FROM lc_calc_condition_temp WHERE flowunid=:{FLOW_UNID}','','N','','','','','','','','word_default_class'); + + + + + + diff --git a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java index 77df60d02..a6989dd48 100644 --- a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java +++ b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java @@ -289,7 +289,7 @@ public class MakeOneCodeAndContractModel { //ͼƬȺ͸߶ img.scaleAbsolute(160, 15); //ͼƬˮӡλá - img.setAbsolutePosition(265, 820); + img.setAbsolutePosition(410, 818); }else{ img.scaleAbsolute(160, 22); img.setAbsolutePosition(400, 785);