Merge remote-tracking branch 'origin/develop' into develop

bae7592a · gzj34291 · 3d4f1e6f · 31121ce3 · bae7592a · bae7592a
Commit bae7592a authored Jun 24, 2022 by gzj34291
Showing with 3 additions and 2 deletions

con_doc_batch_create.lsc src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc +2 -1

con_contract_modify.lview ...main/webapp/modules/cont/CON505/con_contract_modify.lview +1 -1

No files found.
--- a/src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
+++ b/src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
@@ -119,7 +119,8 @@
                ||record_data.templet_code == 'CON_CONTRACT_LEASE_BACK'||record_data.templet_code == 'CON_CONTRACT_MORTGAGE'||record_data.templet_code == 'FINANCE_LEASE_CONTRACT_FIN'
                ||record_data.templet_code == 'FINANCE_LEASE_CONTRACT_FIN_A4'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_TJ'||record_data.templet_code =='CON_CONTRACT_MORTGAGE_TJ'
                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_TJ_SURE'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_TJ_FR'
-                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_D_ESWJ' ||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ_OEC'||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ') {
+                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_D_ESWJ' ||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ_OEC'||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ'
+                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_TJ') {   //update by xsh35973 添加法人铁甲保证函

            // word转pdf
            var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;

--- a/src/main/webapp/modules/cont/CON505/con_contract_modify.lview
+++ b/src/main/webapp/modules/cont/CON505/con_contract_modify.lview