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

src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header.lwm

@@ -45,6 +45,6 @@
          <bm:query-field name="journal_date_to" queryExpression="t1.journal_date &lt;= to_date(${@journal_date_to},'yyyy-mm-dd')"/>
          <bm:query-field name="total_amount_dr_from" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &gt;= ${@total_amount_dr_from}"/>
          <bm:query-field name="total_amount_dr_to" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &lt;= ${@total_amount_dr_to}"/>
-        <bm:query-field name="journal_submit_batch_id" queryExpression="t1.journal_submit_batch_id = ${@journal_submit_batch_id}"/>
+         <bm:query-field name="journal_submit_batch_id" queryExpression="t1.journal_submit_batch_id = ${@journal_submit_batch_id}"/>
       </bm:query-fields>
 </bm:model>

src/main/webapp/modules/hls/HLS536/hls_journal_import_entrance.lview

@@ -270,6 +270,7 @@
                 height: 400
             });
             win.on('close', function() {
+                hls536_journal_query();
             });
         }
 
@@ -387,7 +388,7 @@
                     <a:column name="je_detail_count" prompt="凭证行数量" width="50"/>
                     <a:column name="wfl_status_n" prompt="凭证导入状态" width="100"/>
                     <a:column name="reverse_wfl_status_n" prompt="凭证反冲状态" width="100"/>
-                    <a:column name="attachment_file"  prompt="附件" width="120" renderer="receipt_attachment_upload" align="center"/>-
+                    <a:column name="attachment_file"  prompt="附件" width="120" renderer="receipt_attachment_upload" align="center"/>
                    </a:columns>
                 </a:grid>
         </a:screenBody>

src/main/webapp/modules/hls/HLS536/hls_journal_import_wfl.lview

@@ -11,6 +11,7 @@
     <a:view>
         <a:link id="hls_journal_import_create_link_id" url="${/request/@context_path}/modules/hls/HLS536/hls_journal_import_create.lview"/>
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+        <a:link id="journal_attachment_uploadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
         <a:screen-include screen="modules/hls/hls_common_javascript.lview"/>
 
 
@@ -54,6 +55,24 @@
             return '<a href="javascript:hls536_link_dynamic(' + record.id + ',' + record.get('journal_header_id') + ');">' + value + '</a>';
         }
 
+         function receipt_attachment_upload(val,rec,name){
+             return '<a href=javascript:open_upload_window('+rec.get('journal_header_id')+')>附件</a>';
+         }
+
+         function open_upload_window(record_id){
+             var url = $('journal_attachment_uploadFile_id').getUrl() + '?table_name=HLS_JOURNAL_HEADER_IMP&header_id=' + record_id;
+             var win = new Leaf.Window({
+                 url: url,
+                 title: '${l:HLS.SUPPORTING_DOCUMENT}',
+                 id: 'attachment_uploadFile_id',
+                 width: 850,
+                 height: 400
+             });
+             win.on('close', function() {
+                 hls536_journal_query();
+             });
+         }
+
          ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
         <a:dataSets>
@@ -162,6 +181,8 @@
                     <a:column name="description" prompt="凭证摘要" width="220"/>
                     <a:column name="je_detail_count" prompt="凭证行数量" width="50"/>
                     <a:column name="wfl_status_n" prompt="凭证导入状态" width="100"/>
+                    <a:column name="reverse_wfl_status_n" prompt="凭证反冲状态" width="100"/>
+                    <a:column name="attachment_file"  prompt="附件" width="120" renderer="receipt_attachment_upload" align="center"/>
                    </a:columns>
                 </a:grid>
         </a:screenBody>