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

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm

@@ -87,6 +87,9 @@
                (select hbm.bank_account_num
                   from hls_bp_master_bank_account hbm
                  where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_number_n,
+                 (select hbm.bank_account_name
+                  from hls_bp_master_bank_account hbm
+                 where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_name,
                cpr.amount,
                --首付款抵充金额
                (select nvl(hd.other_payment2, 0)

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm

@@ -293,12 +293,12 @@
 <!--        <bm:field name="bp_bank_account_name"/>-->
 <!--        <bm:field name="bp_bank_account_num"/>-->
     </bm:fields>
-    <bm:features>
-        <s:bm-script><![CDATA[
-            var cx = Packages.leaf.javascript.Context.getCurrentContext();
-            Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
-        ]]></s:bm-script>
-    </bm:features>
+<!--    <bm:features>-->
+<!--        <s:bm-script><![CDATA[-->
+<!--            var cx = Packages.leaf.javascript.Context.getCurrentContext();-->
+<!--            Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");-->
+<!--        ]]></s:bm-script>-->
+<!--    </bm:features>-->
     <!--只查找该代理店-->
     <bm:data-filters>
 <!--        <bm:data-filter name="enabled_flag" enforceOperations="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>-->

src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview

@@ -225,19 +225,19 @@
         };
         window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
           //  var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
-            var ds_id = '${/parameter/@layout_code}_G_CSH_REQ_1_csh_payment_req_hd_ds';
-            var ds_id_2= '${/parameter/@layout_code}_G_CSH_REQ_2_csh_payment_req_hd_ds';
-
-            if (ds == $(ds_id)) {
-                aut_authority_list_validate_query(ds, qpara);
-            }
-            if (ds == $(ds_id_2)) {
+          //   var ds_id = '${/parameter/@layout_code}_G_CSH_REQ_1_csh_payment_req_hd_ds';
+          //   var ds_id_2= '${/parameter/@layout_code}_G_CSH_REQ_2_csh_payment_req_hd_ds';
+          //
+          //   if (ds.id == ds_id) {
                 aut_authority_list_validate_query(ds, qpara);
-            }
+            // }
+            // if (ds.id == ds_id_2) {
+            //     aut_authority_list_validate_query(ds, qpara);
+            // }
         };
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
-        <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CSH501"/>
+        <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=PAYMENT_REQ&amp;function_code=CSH501"/>
 
     </a:view>
 </a:screen>

src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview

@@ -200,7 +200,7 @@
 
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
-        <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CSH501"/>
+<!--        <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CSH501"/>-->
         <a:dataSets>
             <a:dataSet id="vender_name_ds" lookupCode="VENDER_NAME"/>
             <a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>