【fix】增加代理店权限控制

src/main/webapp/WEB-INF/classes/basic/hls_bp_master_bank_account_v.lwm

@@ -7,11 +7,11 @@
 -->
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_BP_MASTER_BANK_ACCOUNT_V">
     <bm:fields>
-        <bm:field name="bank_account_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BANK_ACCOUNT_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BANK_ACCOUNT_ID"/>
+        <bm:field name="bank_account_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BANK_ACCOUNT_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BANK_ACCOUNT_ID" />
         <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BP_ID"/>
-        <bm:field name="bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_NUM" prompt="HLS.BANK_ACCOUNT_NUM"/>
+        <bm:field name="bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_NUM" prompt="HLS.BANK_ACCOUNT_NUM" forQuery="true" forDisplay="true"/>
         <bm:field name="bank_account_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_CODE" prompt="HLS.BANK_ACCOUNT_CODE"/>
-        <bm:field name="bank_account_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_NAME" prompt="HLS.BANK_ACCOUNT_NAME"/>
+        <bm:field name="bank_account_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_NAME" prompt="HLS.BANK_ACCOUNT_NAME" forDisplay="true" forQuery="true"/>
         <bm:field name="bank_branch_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BANK_BRANCH_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BANK_BRANCH_ID"/>
         <bm:field name="bank_branch_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_BRANCH_NAME" prompt="HLS.BANK_BRANCH_NAME"/>
         <bm:field name="bank_full_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_FULL_NAME" prompt="HLS.BANK_FULL_NAME"/>
@@ -26,6 +26,10 @@
         <bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG" prompt="HLS.ENABLED_FLAG"/>
         <bm:field name="currency_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_NAME" prompt="HLS.CURRENCY"/>
     </bm:fields>
+    <bm:query-fields>
+        <bm:query-field name="bank_account_name" queryExpression="t1.bank_account_name like &apos;%&apos;||${@bank_account_name}||&apos;%&apos;"/>
+        <bm:query-field name="bank_account_num" queryExpression="t1.bank_account_num like &apos;%&apos;||${@bank_account_num}||&apos;%&apos;"/>
+    </bm:query-fields>
     <bm:features>
         <f:standard-who/>
     </bm:features>

src/main/webapp/WEB-INF/classes/csh/CSH502/csh_payment_req_query.lwm

@@ -5,11 +5,13 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" baseTable="csh_payment_req_hd">
+<bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" baseTable="csh_payment_req_hd">
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-       SELECT *
+
+SELECT v.*
+  FROM( SELECT t.*
      FROM (SELECT h.payment_req_number,
                   h.document_type,
                   --应付金额
@@ -159,7 +161,17 @@
                   (SELECT company_id
                      FROM fnd_companies
                     START WITH company_id = 1
-                   CONNECT BY prior company_id = parent_biz_company_id)) v
+                   CONNECT BY prior company_id = parent_biz_company_id)
+                   ) t
+            WHERE t.bp_id_agent_n IN  (
+                 select h.bp_name
+                      from exp_emp_assign_e_v ee, hls_bp_master h
+                     where ee.user_id = ${/session/@user_id}
+                       and ee.unit_id = h.unit_id
+                       and h.bp_category = 'AGENT'
+            )
+            )v
+            #WHERE_CLAUSE#
     ORDER BY v.req_date DESC, v.payment_req_number DESC
 
             ]]></bm:query-sql>
@@ -175,6 +187,7 @@
         </bm:operation>
     </bm:operations>
     <bm:query-fields>
+        <bm:query-field name="payment_req_number" queryExpression="v.payment_req_number like &apos;%&apos; || ${@payment_req_number} || &apos;%&apos;"/>
         <bm:query-field name="bp_id_tenant_n" queryExpression="v.bp_id_tenant_n like ${@bp_id_tenant_n}"/>
         <bm:query-field name="print_flag" queryExpression="nvl(v.print_flag,&apos;N&apos;) = ${@print_flag}"/>
         <bm:query-field name="employee_name" queryExpression="v.user_name like &apos;%&apos; || ${@employee_name} || &apos;%&apos;"/>
@@ -197,4 +210,10 @@
         <bm:query-field name="payment_req_number" queryExpression="v.payment_req_number like  &apos;%&apos;||upper(${@payment_req_number})||&apos;%&apos;"/>
         <bm:query-field name="user_name" queryExpression="v.user_name like ${@user_name}"/>
     </bm:query-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:model>

src/main/webapp/WEB-INF/classes/csh/CSH503/csh_payment_reverse.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:s="leaf.plugin.script">
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
@@ -63,6 +63,12 @@
             ]]></bm:query-sql>
         </bm:operation>
     </bm:operations>
+    <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:query-fields>
         <bm:query-field name="payment_req_number_from" datatype="java.lang.String" queryExpression="v.payment_req_number&gt;=${@payment_req_number_from}"/>
         <bm:query-field name="payment_req_number_to" datatype="java.lang.String" queryExpression="v.payment_req_number&lt;=${@payment_req_number_to}"/>
@@ -73,8 +79,10 @@
         <bm:query-field name="transaction_amount_from" datatype="java.lang.String" queryExpression="v.transaction_amount&gt;=${@transaction_amount_from}"/>
         <bm:query-field name="transaction_amount_to" datatype="java.lang.String" queryExpression="v.transaction_amount&lt;=${@transaction_amount_to}"/>
         <bm:query-field name="bank_account_code_from" datatype="java.lang.String" queryexpression="v.bank_account_code &gt;= ${@bank_account_code_from}"/>
+        <bm:query-field name="bank_account_num"  queryexpression="v.bank_account_num like &apos;%&apos; || ${@bank_account_num} || &apos;%&apos;"/>
         <bm:query-field name="bank_account_code_to" datatype="java.lang.String" queryexpression="v.bank_account_code &lt;= ${@bank_account_code_to}"/>
         <bm:query-field name="currency_code" datatype="java.lang.String" queryexpression="v.currency_code = ${@currency_code}"/>
         <bm:query-field name="bp_id" datatype="java.lang.String" queryexpression="v.bp_id = ${@bp_id}"/>
+        <bm:query-field name="bp_name" datatype="java.lang.String" queryexpression="v.bp_name = ${@bp_name}"/>
     </bm:query-fields>
 </bm:model>

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

@@ -223,7 +223,21 @@
                 }
             }
         };
+        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)) {
+                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:view>
 </a:screen>

src/main/webapp/modules/csh/CSH502/csh_payment_req_pay.lview

@@ -111,7 +111,6 @@
                     param['merge_flag'] = 'N';
                     param['bp_category'] =identify_category;
                     param['details'] = saveData;
-
                     Leaf.showConfirm('${l:PROMPT_MESSAGE}', '确定提交？', function okFun() {
                         Leaf.request({
                             url: $('csh_payment_req_pay_link_id').getUrl(),
@@ -688,7 +687,7 @@
                     <a:field name="zero_amounts_allowed" defaultValue="N"/>
                     <a:field name="currency_code" defaultValue="CNY"/>
                     <a:field name="currency_name" defaultValue="人民币"/>
-                    <a:field name="bank_account_id" defaultValue="1531"/>
+                    <a:field name="bank_account_id"/>
                     <a:field name="bank_account_name"/>
                     <a:field name="bank_account_num" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" required="true" title="CSH511.BANK_ACCOUNT_CODE">
                         <a:mapping>
@@ -696,6 +695,7 @@
                             <a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
                             <a:map from="bank_account_id" to="bank_account_id"/>
                             <a:map from="bank_account_num" to="bank_account_num"/>
+                            <a:map from="bank_account_id" to="bank_account_id"/>
                             <a:map from="bank_account_name" to="bank_account_name"/>
                             <a:map from="bank_account_code" to="bank_account_code"/>
                             <a:map from="currency_code" to="currency_code"/>

src/main/webapp/modules/csh/CSH502/csh_payment_req_query.lview

@@ -8,6 +8,7 @@
 <a:screen xmlns:a="http://www.leaf-framework.org/application">
     <a:init-procedure/>
     <a:view>
+        <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CSH502"/>
         <a:link id="payment_req_post_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_insert_tmp.lsc"/>
         <a:link id="payment_req_excel_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_excel_sheets.lsc"/>
         <a:link id="payment_req_excel_cib_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_excel_sheets_cib.lsc"/>

src/main/webapp/modules/csh/CSH503/csh_payment_reverse.lview

@@ -173,18 +173,19 @@
             </a:dataSet>
             <a:dataSet id="csh_payment_reverse_query_ds">
                 <a:fields>
-                    <a:field name="bp_code" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov" lovWidth="500">
+                    <a:field name="bp_name" lovGridHeight="350" lovHeight="550" lovService="basic.hls_bp_master_bank_account_v" lovWidth="580">
                         <a:mapping>
-                            <a:map from="bp_code" to="bp_code"/>
-                            <a:map from="bp_name" to="bp_name"/>
-                            <a:map from="bp_id" to="bp_id"/>
+                         <!--   <a:map from="bp_code" to="bp_code"/>-->
+                            <a:map from="bank_account_name" to="bp_name"/>
+<!--                            <a:map from="bp_id" to="bp_id"/>-->
                         </a:mapping>
                     </a:field>
                     <a:field name="transaction_date_from" validator="dateValidator"/>
                     <a:field name="transaction_date_to" validator="dateValidator"/>
-                    <a:field name="bank_account_code_from" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
+                    <a:field name="bank_account_num"  lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
                         <a:mapping>
-                            <a:map from="bank_account_code" to="bank_account_code_from"/>
+                            <a:map from="bank_account_name" to="bank_account_name"/>
+                            <a:map from="bank_account_num" to="bank_account_num"/>
                         </a:mapping>
                     </a:field>
                     <a:field name="bank_account_from_id"/>
@@ -230,9 +231,9 @@
                 <a:textField name="payment_req_number_to" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_REQ_HD.PAYMENT_REQ_NUMBER_TO" width="150"/>
                 <a:numberField name="transaction_amount_from" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT_FROM" width="150"/>
                 <a:numberField name="transaction_amount_to" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT_TO" width="150"/>
-                <a:lov name="bank_account_code_from" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.BANK_ACCOUNT_CODE_FROM" width="150"/>
-                <a:lov name="bank_account_code_to" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.BANK_ACCOUNT_CODE_TO" width="150"/>
-                <a:lov name="bp_code" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_OBJ" width="150"><![CDATA[
+                <a:lov name="bank_account_num" bindTarget="csh_payment_reverse_query_ds" prompt="付款账号" width="150"/>
+<!--                <a:lov name="bank_account_code_to" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.BANK_ACCOUNT_CODE_TO" width="150"/>-->
+                <a:lov name="bp_name" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_OBJ" width="150"><![CDATA[
                 ]]></a:lov>
                 <a:comboBox name="currency_name_display" bindTarget="csh_payment_reverse_query_ds" prompt="HLS.CURRENCY"/>
             </a:form>