Merge branch 'feature/反冲指示书打印开发' into develop

src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm

@@ -108,7 +108,7 @@ SELECT h.period_year,
  WHERE h.journal_header_id = l.journal_header_id
    and h.sbo_num is not null
    and ga.account_id=l.account_id
-   and ga.account_code='2221001020'
+   and ga.account_code in('2221001020','2221001023')
     and h.reversed_flag='N'
    AND ((h.je_transaction_code IN
        ('HL_SALES_TAX_ACT_NEW', 'HL_CSH_CONSOLIDATION_DALAY')

src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm

@@ -108,7 +108,7 @@ SELECT h.period_year,
  WHERE h.journal_header_id = l.journal_header_id
    and h.sbo_num is not null
    and ga.account_id=l.account_id
-   and ga.account_code='2221001020'
+   and ga.account_code in('2221001020','2221001023')
     and h.reversed_flag='N'
    AND ((h.je_transaction_code IN
        ('HL_SALES_TAX_ACT_NEW', 'HL_CSH_CONSOLIDATION_DALAY')

src/main/webapp/WEB-INF/server-script/jacob/jacob.js

 var jacob_config = {
-    jacobUrl : "http://10.40.128.182:8080/core/jacob/",
-    jacobserviceUrl : "http://10.40.128.186:8091/jacob/jacob/",
-    target_path : "C://hls_file/ds_hls/excel/"
+    jacobUrl : "http://10.203.0.125:8082/hlcm_leasing/jacob/",
+    jacobserviceUrl : "http://10.203.0.125:8083/jacob/jacob/",
+    target_path : "D:\\"
 };
\ No newline at end of file

src/main/webapp/modules/acr/ACR620/acr_invoice_reverse_apply_query.lview

@@ -10,6 +10,8 @@
         <a:link id="acr_invoice_reverse_apply_detail_link" url="${/request/@context_path}/modules/acr/ACR620/acr_invoice_reverse_apply_detail.lview"/>
         <a:link id="acr_invoice_reverse_apply_detail_readonly_link" url="${/request/@context_path}/modules/acr/ACR620/acr_invoice_reverse_apply_detail_wfl.lview"/>
         <a:link id="acr620_invoice_reverse_apply_status_change" model="acr.ACR610.acr_invoice_apply_query" modelaction="delete"/>
+        <a:link id="acr620_invoice_finish_print_link_id"
+                url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc"/>
         <script><![CDATA[
 
         function lock_current_window() {
@@ -100,8 +102,19 @@
             }else{
                 document.getElementById("acr620_invoice_reverse_cancel_id").style.display = "";
             }
+            if (record.get('reverse_method') == 'REDPUNCH'||record.get('reverse_method') == 'INVALID') {
+                document.getElementById("acr620_invoice_print_id").style.display = "";
+            } else {
+                document.getElementById("acr620_invoice_print_id").style.display = "none";
+            }
 
         }
+        function acr620_invoice_print() {
+            var record = $('acr620_invoice_reverse_result_ds').getSelected()[0];
+            var document_id = record.get('invoice_apply_id');
+            var url_l = $('acr620_invoice_finish_print_link_id').getUrl() + '?document_id=' + document_id + '&document_table=ACR_INVOICE_REVERSE&batch_flag=Y&source_type=COMMON';
+            var OpenWindow = window.open(href = url_l, target = "_blank");
+        }
         
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
@@ -139,6 +152,7 @@
                 <a:screenTitle/>
                 <a:toolbarButton click="acr620_invoice_reverse_reset" text="HLS.RESET"/>
                 <a:toolbarButton click="acr620_invoice_reverse_query" text="HLS.QUERY"/>
+                <a:toolbarButton id="acr620_invoice_print_id" click="acr620_invoice_print" text="HLS.PRINT"/>
                 <a:toolbarButton id="acr620_invoice_reverse_cancel_id" click="acr620_invoice_reverse_cancel" text="取消申请"/>
             </a:screenTopToolbar>
             <a:form marginWidth="200" padding="0" title="查询条件">

src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc

@@ -33,7 +33,7 @@
                function wordToPdf(word_file_path,pdf_file_path) {
                 // word转pdf
                 var pdf_file_path_new = pdf_file_path + '.pdf';
-                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.18-x64.dll");
+                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.19-x64.dll");
                 wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
                 //删除word文件
                // deleteFile(word_file_path);

src/main/webapp/modules/cont/CON500/con_ele_doc_batch_create.lsc

@@ -33,7 +33,7 @@
                function wordToPdf(word_file_path,pdf_file_path) {
                 // word转pdf
                 var pdf_file_path_new = pdf_file_path + '.pdf';
-                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.18-x64.dll");
+                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.19-x64.dll");
                 wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
                 //删除word文件
                // deleteFile(word_file_path);

src/main/webapp/modules/cont/CON620/create_content_for_collection.lsc

@@ -27,7 +27,7 @@
                function wordToPdf(word_file_path,pdf_file_path) {
                 // word转pdf
                 var pdf_file_path_new = pdf_file_path + '.pdf';
-                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.18-x64.dll");
+                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.19-x64.dll");
                 wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
                 //删除word文件
                // deleteFile(word_file_path);

src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview

@@ -155,11 +155,45 @@
                             },
                             scope: this
                         });
+                    }if (name == 'pay_method') {
+                        if ( value== 'WIRE_TRANSFER') {
+                            record.set('bank_account_id', null);
+                            record.set('bank_account_id_n', null);
+                            record.getField('bank_account_id').setReadOnly(true);
+                            record.getField('bank_account_id_n').setReadOnly(true);
+                            record.getField('bank_account_id').setRequired(false);
+                            record.getField('bank_account_id_n').setRequired(false);
+                            record.set('bank_account_name', null);
+                            record.set('bank_branch_num', null);
+                            record.set('bank_branch_name', null);
+                            record.set('withhold_way', null);
+                        } else if (value== 'AGRI_THREE'){
+                            record.getField('bank_account_id').setReadOnly(false);
+                            record.getField('bank_account_id_n').setReadOnly(false);
+                            record.getField('bank_account_id').setRequired(true);
+                            record.getField('bank_account_id_n').setRequired(true);
+                            record.set('withhold_way', 'ABC');
                         }
+                        else if (value == 'AGRI_TWO'){
+                            record.getField('bank_account_id').setReadOnly(false);
+                            record.getField('bank_account_id_n').setReadOnly(false);
+                            record.getField('bank_account_id').setRequired(true);
+                            record.getField('bank_account_id_n').setRequired(true);
+                            record.set('withhold_way', 'ABC_2');
+                        }
+                        else if (value == 'CCB_THREE'){
+                            record.getField('bank_account_id').setReadOnly(false);
+                            record.getField('bank_account_id_n').setReadOnly(false);
+                            record.getField('bank_account_id').setRequired(true);
+                            record.getField('bank_account_id_n').setRequired(true);
+                            record.set('withhold_way', null);
+                        }
+
+                    }
+
                 }
                 // 回款賬戶變更
                 if ('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY') {
-                    debugger;
                     if (name == 'pay_method') {
                         if ( value== 'WIRE_TRANSFER') {
                             record.set('bank_account_id', null);

src/main/webapp/modules/cont/CON732/hls_ccr_modify_entrance.lview

@@ -20,7 +20,6 @@
             var download_arr = [];
 
         Leaf.onReady(function() {
-            debugger;
             if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
                 document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "";
                 document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "";

src/main/webapp/modules/cont/CON8000/con_bad_debts_confirmed.lview

@@ -94,7 +94,7 @@
             </a:form>
             <a:tabPanel marginHeight="100" marginWidth="50">
                 <a:tabs>
-                    <a:tab prompt="分期回购合同计提对象金额" width="190">
+                    <a:tab prompt="解约回购合同计提对象金额" width="190">
                         <a:grid id="con_bad_debts_confirmed_result_id" bindTarget="con_bad_debts_confirmed_result_ds"
                                 marginHeight="150" marginWidth="238" navBar="true">
                             <a:columns>
@@ -113,7 +113,7 @@
                             </a:columns>
                         </a:grid>
                     </a:tab>
-                    <a:tab prompt="分期回购坏账计提合计" width="180">
+                    <a:tab prompt="解约回购坏账计提合计" width="180">
                         <a:grid id="con_bad_debts_confirmed_sum_id" bindTarget="con_bad_debts_confirmed_sum_ds"
                                 marginHeight="150" marginWidth="238" navBar="true">
                             <a:columns>

src/main/webapp/modules/prj/PRJ501N/create_content_for_prj_quotation.lsc

@@ -28,7 +28,7 @@
                function wordToPdf(word_file_path,pdf_file_path) {
                 // word转pdf
                 var pdf_file_path_new = pdf_file_path + '.pdf';
-                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.18-x64.dll");
+                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.19-x64.dll");
                 wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
                 //删除word文件
                // deleteFile(word_file_path);