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/csh/CSH501C/csh_payment_asset_req.lview

@@ -29,11 +29,10 @@
         <script src="${/request/@context_path}/javascripts/jquery-1.6.4.min.js" type="text/javascript"/>
          <a:link id="csh_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
         <a:link id="csh_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
-        <a:link id="acp_invoice_inf_import_link" model="acp.ACP522.acp_invoice_inf_import" modelaction="update"/>
-        <a:link id="acp_invoice_inf_import_total_link" model="acp.ACP522.acp_invoice_inf_import_total" modelaction="update"/>
+        <a:link id="csh_invoice_inf_import_link" model="csh.CSH501C.req_acp_inf_import" modelaction="update"/>
+        <a:link id="csh_invoice_inf_import_total_link" model="csh.CSH501C.req_acp_inf_import_total" modelaction="update"/>
         <script type="text/javascript"><![CDATA[
         jQuery.noConflict();
-        //var con_business_type='${/parameter/@con_business_type}'||'${/model/loan_flag_path/record/@business_type}'||'LEASE';
            function get_current_amount(amt) {
             if (!Ext.isEmpty(amt)) {
                 return parseFloat(amt).toFixed(2);
@@ -41,7 +40,7 @@
                 return 0;
             }
         }
-        //如果头id 不为空，就使用自在定义的ds进行查询
+
         Leaf.onReady(function () {
          if ('${/parameter/@source_type}' == 'WFL'||'${/parameter/@source_type}' == 'WFL_N'||'${/parameter/@source_type}' == 'WFL_ACCT') {
             if(document.getElementById('${/parameter/@layout_code}_save')){
@@ -65,8 +64,6 @@
                        record.getField('bp_bank_account_num').setReadOnly(true);
                        record.getField('bp_bank_account_num_n').setReadOnly(true);
                        record.getField('req_date').setReadOnly(true);
-
-
                 }
             }
         }
@@ -111,12 +108,10 @@
 
                     }
                 }
-
-            }
                  //进项票
                  var acp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hl_req_payment_acp');
-              if (name == 'invoice' && value && hdrecord.get('contract_id')) {
-                 var contract_id = hdrecord.get('contract_id');
+                  if (name == 'invoice' && value) {
+                     var payment_req_id = hdrecord.get('payment_req_id');
                      var strs = value.split(',');
                      var invoice_type = strs[1];
                      var invoice_code = strs[2];
@@ -124,7 +119,6 @@
                      var net_amount = strs[4];
                      var invoice_date = strs[5];
                      var total_amount =strs[4];
-                 //检验设备价格需要大于不含税金额
                       if (strs.length == 9) {
                          //校验重复发票号码 add by 26887cz 2021-09-07
                          var acr_records = $(acp_ds_id).getAll();
@@ -138,14 +132,15 @@
                              }
                          }
                          Leaf.request({
-                         url: $('acp_invoice_inf_import_link').getUrl(),
+                             url: $('csh_invoice_inf_import_link').getUrl(),
                              para: {
                                  invoice_type: invoice_type,
                                  invoice_code: invoice_code,
                                  invoice_number: invoice_number,
                                  net_amount: net_amount,
                                  invoice_date: invoice_date,
-                             contract_id: contract_id
+                                 payment_req_id:payment_req_id
+
                              },
 
                              success: function () {
@@ -157,7 +152,6 @@
                                  setTimeout(function () {
                                      record.set('invoice', '');
                                  }, 50);
-                             $(acp_ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
                                   $(acp_ds_id).query();
                              }, failure: function () {
                                  setTimeout(function () {
@@ -184,14 +178,14 @@
                              }
                          }
                          Leaf.request({
-                         url: $('acp_invoice_inf_import_total_link').getUrl(),
+                             url: $('csh_invoice_inf_import_total_link').getUrl(),
                              para: {
                                  invoice_type: invoice_type,
                                  invoice_code: invoice_code,
                                  invoice_number: invoice_number,
                                  total_amount: total_amount,
                                  invoice_date: invoice_date,
-                             contract_id: contract_id
+                                 payment_req_id:payment_req_id
                               },
                              success: function () {
                                  Leaf.SideBar.show({
@@ -202,7 +196,6 @@
                                  setTimeout(function () {
                                      record.set('invoice', '');
                                  }, 50);
-                             $(acp_ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
                                   $(acp_ds_id).query();
                              }, failure: function () {
                                  setTimeout(function () {
@@ -229,14 +222,14 @@
                              }
                          }
                          Leaf.request({
-                         url: $('acp_invoice_inf_import_link').getUrl(),
+                             url: $('csh_invoice_inf_import_link').getUrl(),
                              para: {
                                  invoice_type: invoice_type,
                                  invoice_code: invoice_code,
                                  invoice_number: invoice_number,
                                  net_amount: net_amount,
                                  invoice_date: invoice_date,
-                             contract_id: contract_id
+                                 payment_req_id:payment_req_id
                               },
                              success: function () {
                                  Leaf.SideBar.show({
@@ -247,7 +240,6 @@
                                  setTimeout(function () {
                                      record.set('invoice', '');
                                  }, 50);
-                             $(acp_ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
                                   $(acp_ds_id).query();
                              }, failure: function () {
                                  setTimeout(function () {
@@ -268,6 +260,9 @@
                          }, 50);
                      }
                  }
+
+            }
+
         };
 
 

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);
         }