[feat]附件开发

src/main/webapp/WEB-INF/classes/cont/CON500/con_doc_file_templet_get_atm.lwm

@@ -50,7 +50,7 @@
                     m.table_pk_value  = lt.templet_id AND
                     lt.templet_id     = t.doc_template_id AND
                      t.doc_plugin_flag = 'Y' AND
-                     t.templet_usage in ('CON_SALE', 'CONTRACT') and
+                     t.templet_usage in ('CON_SALE', 'CONTRACT', 'CHANGE_REQ') and
                     t.templet_id      = cc.templet_id AND
                     (
                         cc.content_id =${/parameter/@content_id} OR

src/main/webapp/WEB-INF/classes/cont/CON732/hls_crr_query_print_detail.lwm

@@ -185,7 +185,7 @@
 			FROM
 			    CON_CONTRACT_CONTENT_V t1
 			WHERE
-			    t1.templet_usage in ('CON_SALE', 'CONTRACT')
+			    t1.templet_usage in ('CON_SALE', 'CONTRACT', 'CHANGE_REQ')
 			    )t
     		 #WHERE_CLAUSE#
     		 ORDER BY decode(t.bp_category,'TENANT',0,'GUARANTOR',1,'VENDER',2,'')

src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm

@@ -55,7 +55,9 @@
                t.bp_id,
                (select bp_name from hls_bp_master where bp_id = t.bp_id) bp_name,
                t.paid_byother_flag,
-               t.csh_bank_account_id bank_account_id
+               t.csh_bank_account_id bank_account_id,
+               t.exists_flag,
+               t.temp_id
 
           FROM fnd_interface_headers hd,
                fnd_interface_lines   li,

src/main/webapp/WEB-INF/server-script/layoutconfig/con_tenant_change_modify_g_bp_1_queryfields.js

+
+
+var add_datafilters = [ {
+    name : 'bp_category',
+    expression : "(t1.bp_category = 'GUARANTOR')"
+} ];
+add_datafilter();

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

@@ -113,7 +113,7 @@
                     winid: 'open_print_detail_win'
                 },
                 url: $('hls_crr_query_print_link_id').getUrl(),
-                title: '${l:CON505.CON_CONTENT_PRINT}',
+                title: '合同变更附件',
                 width: 1000,
                 height: 450
             });

src/main/webapp/modules/cont/CON732/hls_crr_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/CON_ET003/con_early_termination_modify_query.lview

@@ -13,7 +13,8 @@
         <a:link id="con_et_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
         <a:link id="con_et_change_link" url="${/request/@context_path}/modules/cont/CON_ET001/con_early_termination_et_detail.lview"/>
         <a:link id="con_et_create_change_link" model="cont.CON_ET001.create_change_req" modelaction="execute"/>
-        <a:link id="con_grant_deduct_print_link" url="${/request/@context_path}/modules/cont/CON732/hls_ccr_modify_assignment_agreement_print.lsc"/>
+        <!--<a:link id="con_grant_deduct_print_link" url="${/request/@context_path}/modules/cont/CON732/hls_ccr_modify_assignment_agreement_print.lsc"/>-->
+        <a:link id="con_grant_deduct_print_link" url="${/request/@context_path}/modules/cont/CON732/hls_crr_query_print_word_detail.lview"/>
         <script type="text/javascript"><![CDATA[
             function contractQueryScreen_query() {
                 $('contractQueryScreen_mainDs').query();
@@ -37,7 +38,7 @@
         }
 
         //提前结清文本打印
-        function con_gur_np_pint(){debugger;
+        function con_gur_np_pint() {
             var prj_project_result_ds = $('contractQueryScreen_mainDs');
             var records = prj_project_result_ds.getSelected();
             if (records.length != 1) {
@@ -45,10 +46,30 @@
                 return false;
             }
             var record = records[0];
-            var contract_id = record.get('contract_id');
+            var ccr_document_type = 'ET';
+            //var req_status = record.get('req_status');
+            var contract_id = record.get('change_req_id');
+
+            new Leaf.Window({
+                id: 'open_print_detail_win',
+                params: {
+                    contract_id: contract_id,
+                    ccr_document_type: ccr_document_type,
+                    document_category: record.get('document_category'),
+                    business_type : record.get('business_type'),
+                    content_type : 'NORMAL',
+                    winid: 'open_print_detail_win'
+                },
+                url: $('con_grant_deduct_print_link').getUrl(),
+                title: '提前结清附件',
+                width: 1000,
+                height: 450
+            });
+
+            /*var contract_id = record.get('contract_id');
             var templet_code = 'CON_GUR_NP';
             var url = $('con_grant_deduct_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
-            window.open(url, '_self');
+            window.open(url, '_self');*/
         }
 
         function open_change_req_detail(change_req_id,contract_id) {
@@ -79,6 +100,14 @@
             param['winid'] = 'con_et003_detail_winid';
             hls_doc_get_layout_code('con_et_get_layout_code_link_id', param, 'con_et_change_link', 'contractQueryScreen_mainDs');
         }
+
+        function on_grid_select(ds, record, bp_seq) {
+            if(record.get('req_status') != 'APPROVED'){
+                document.getElementById("con_gur_np_pint_id").style.display = "none";
+            }else{
+                document.getElementById("con_gur_np_pint_id").style.display = "";
+            }
+        }
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON_ET001"/>
         <a:dataSets>
@@ -133,6 +162,7 @@
                 </a:fields>
                 <a:events>
                     <a:event name="query" handler="aut_authority_list_validate_query"/>
+                    <a:event name="select" handler="on_grid_select"/>
                 </a:events>
             </a:dataSet>
         </a:dataSets>
@@ -141,7 +171,7 @@
                 <a:screenTitle/>
                 <a:gridButton click="contractQueryScreen_query" text="HLS.QUERY"/>
                 <a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
-                <!--<a:gridButton click="con_gur_np_pint" text="提前结清补充协议"/>-->
+                <a:gridButton click="con_gur_np_pint" text="提前结清附件" id="con_gur_np_pint_id"/>
             </a:screenTopToolbar>
             <a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
                 <a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="变更申请编号"/>

src/main/webapp/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc

@@ -22,7 +22,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);