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

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

@@ -78,6 +78,9 @@
                         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>';
                 }
             };
             

src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview

@@ -385,10 +385,10 @@
                 $(prj_quotation_ds_id).query();
 
             }
-            var  url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
+            var  record=$(ds_id).getCurrentRecord();
+            var  url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id='+record.get('bp_id_tenant');
             $(tenant_ds_id).setQueryUrl(url);
             $(tenant_ds_id).query();
-
             window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
         };
 

src/main/webapp/modules/prj/PRJ500N/prj_project_create_special.lview

@@ -267,9 +267,16 @@
             var param = record.data;
             param['bp_id'] = record.get('bp_id');
             param['bp_class'] = record.get('bp_class');
-            param['function_code'] = 'HLS215D';
+        /*    param['function_code'] = 'HLS215D';
             param['function_usage'] = 'QUERY';
-            param['maintain_type'] = 'READONLY';
+            param['maintain_type'] = 'READONLY';*/
+            if(record.get('bp_category') =='AGENT'){
+                param['function_code'] = 'HLS303_Q';
+                param['function_usage'] = 'QUERY';
+            }else{
+                param['function_code'] = 'CON505H';
+                param['function_usage'] = 'QUERY';
+            }
             param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
             hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, 'con505_hls_bp_master_query_link',  record.ds.id, '${/parameter/@layout_code}');
 
@@ -454,6 +461,8 @@
             window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res) {
                 window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
+
+                var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master');
                 if (ds_id) {
                     record = $(ds_id).getAt(0);
                     var cdd_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

@@ -314,9 +314,17 @@
             var param = {};
             param['bp_id'] = record.get('bp_id');
             param['bp_class'] = record.get('bp_class');
-            param['function_code'] = 'HLS215D';
+            if(record.get('bp_category') =='AGENT'){
+                param['function_code'] = 'HLS303_Q';
+                param['function_usage'] = 'QUERY';
+
+            }else{
+                param['function_code'] = 'HLS215D';
+                param['function_usage'] = 'QUERY';
+            }
+        /*    param['function_code'] = 'HLS215D';
             param['function_usage'] = 'QUERY';
-            param['maintain_type'] = 'READONLY';
+            param['maintain_type'] = 'READONLY';*/
             param['winid'] = '${/parameter/@layout_code}_bp_win_id';
             param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
             hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}');