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

src/main/webapp/WEB-INF/classes/csh/CSH501C/req_acp_inf_import.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: zhuxianfei
+    $Date: 2018/7/26 14:11
+    $Revision: 1.0
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                begin
+                csh_payment_asset_req_pkg.req_acp_import(p_invoice_type =>  ${@invoice_type},
+                                                          p_invoice_code =>  ${@invoice_code},
+                                                          p_invoice_number=> ${@invoice_number},
+                                                          p_net_amount   =>  ${@net_amount},
+                                                          p_invoice_date =>  ${@invoice_date},
+                                                          p_payment_req_id => ${@payment_req_id},
+                                                          p_user_id      =>  ${/session/@user_id}
+                                                         );
+                end;
+                ]]>
+            </bm:update-sql>
+        </bm:operation>
+     </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH501C/req_acp_inf_import_total.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: trd
+    $Date: 2024/1/26 14:11
+    $Revision: 1.0
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                begin
+                csh_payment_asset_req_pkg.req_acp_import_total(
+                p_invoice_type => ${@invoice_type},
+                p_invoice_code => ${@invoice_code},
+                p_invoice_number => ${@invoice_number},
+                p_total_amount => ${@total_amount},
+                p_invoice_date => ${@invoice_date},
+                p_payment_req_id => ${@payment_req_id},
+                p_user_id => ${/session/@user_id}
+                 end;
+                ]]>
+            </bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/modules/csh/CSH501C/csh_payment_asset_create_entrance.lview

@@ -10,11 +10,11 @@
         <script type="text/javascript"><![CDATA[
 
         function detail_link(id, name, query_only) {
-
             var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
             var param = {};
             param['payment_req_id'] = record.get('payment_req_id');
+            param['bp_id'] = record.get('bp_id_agent_level1');
             param['business_type'] = record.get('business_type');
             if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') {
                 param['function_usage'] = 'UPDATE';

src/main/webapp/modules/hls/HLS303/bp_agent_create.lview

@@ -359,7 +359,7 @@
             param['screen_height'] = '600';
             param['maintain_type'] = 'UPDATE';
             param['winid'] = 'open_asset_create_window';
-            param['url_title'] = '资产管理费明细页面';
+            param['url_title'] = '资产管理费组合利率定义';
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}asset_management_link',ds_id);
         }
 

src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview

@@ -309,7 +309,7 @@
             param['screen_height'] = '600';
             param['maintain_type'] = 'UPDATE';
             param['winid'] = 'open_asset_create_window';
-            param['url_title'] = '资产管理费明细页面';
+            param['url_title'] = '资产管理费组合利率定义';
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'asset_management_link_id',ds_id);
         }