Merge branch 'refs/heads/feature/agent' into develop

src/main/webapp/modules/cont/CON505/hls_bp_master_query.lview

@@ -7,6 +7,8 @@
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
     <a:view>
+        <a:link id="hls303_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
+        <a:link id="hls303_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
         <script type="text/javascript"><![CDATA[
             function prj_check_bp_id(record) {
                 var bp_id;
@@ -19,6 +21,71 @@
                 }
                 return bp_id;
             }
+
+        function hls215n_upload_file(id, name, query_only) {
+            //
+            var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+            if (record.get('check_id')) {
+                var url;
+                if (query_only == 'Y' ||'${/parameter/@download}'=='Y') {
+                    url = $('hls303_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                } else {
+                    url = $('hls303_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                }
+                var win = new Leaf.Window({
+                    url: url,
+                    title: '${l:HLS.SUPPORTING_DOCUMENT}',
+                    id: 'prj500_cdd_uploadFile_screen_id',
+                    width: 850,
+                    height: 400
+                });
+
+                win.on('close', function() {
+                    record.ds.query();
+                });
+            } else {
+                Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
+
+            }
+        }
+        //超链接渲染
+        window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
+            //
+            window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
+            if (name == 'attachment') {
+                link_function = 'upload_file';
+                if (record.get('attach_count') == 0 || !record.get('attach_count')) {
+                    return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
+                } else {
+                    return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '(' + record.get('attach_count') + ')' + '</a>';
+                }
+            } else if (name == 'attach_file_name') {
+                if (value != null) {
+                    var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
+                    var str = value.split(';;');
+                    var url = '';
+                    for (var i = 0; i < str.length; i++) {
+                        var temp = str[i].split('--');
+                        if (!Leaf.isEmpty(temp[0])) {
+                            var file_name = temp[0].toUpperCase();
+                            var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
+                            if (file_name.indexOf('.PDF') >= 0) {
+                                url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
+                            } else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
+                                url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
+                            } else {
+                                url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
+                            }
+                        }
+                    }
+                    return url;
+
+                }
+            } else if(name =='atm_attachment'){
+                link_function = 'hls215n_upload_file';
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
+            }
+        };
             
             //财务报表模板导入
             window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {

src/main/webapp/modules/hls/HLS215N/hls_bp_master_query.lview

@@ -26,11 +26,11 @@
                 var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
                 if (record.get('check_id')) {
                     var url;
-                    //if (query_only == 'Y') {
+                    if (query_only == 'Y') {
                         url = $('hls303_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
-                    // } else {
-                        // url = $('hls303_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
-                    // }
+                    } else {
+                        url = $('hls303_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    }
                     var win = new Leaf.Window({
                         url: url,
                         title: '${l:HLS.SUPPORTING_DOCUMENT}',
@@ -55,7 +55,6 @@
                 if (name == 'attachment') {
                     link_function = 'hls215n_upload_file';
                     return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
-
                 } else if (name == 'attach_file_name') {
                     if (value != null) {
                         var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview

@@ -1264,6 +1264,11 @@
                     calc_session_id: '${/parameter/@calc_session_id}'
                 },
                 success: function() {
+                   if('${/parameter/@document_category}'=='PROJECT'){
+                       $('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_ds').query();
+                   }else if('${/parameter/@document_category}'=='CONTRACT'){
+                       $('CONTRACT_CREATE_INC_G_CASHFLOW_1_con_contract_cashflow_ds').query();
+                   }
 
                     open_after_save_execute();
                 },
@@ -1280,14 +1285,17 @@
         function hls_hls500_user_button2() {
             flag = 'Y';
             lock_calc_current_window();
-
             Leaf.request({
                 url: $('hls_fin_calc_single_variable_manual_link_id').getUrl(),
                 para: {
                     calc_session_id: '${/parameter/@calc_session_id}'
                 },
                 success: function() {
-
+                    if('${/parameter/@document_category}'=='PROJECT'){
+                        $('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_ds').query();
+                    }else if('${/parameter/@document_category}'=='CONTRACT'){
+                        $('CONTRACT_CREATE_INC_G_CASHFLOW_1_con_contract_cashflow_ds').query();
+                    }
                     open_after_save_execute();
                 },
                 failure: function() {