Merge branch 'feature/bug_fix' into develop

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

@@ -286,12 +286,12 @@
         <bm:field name="cf_61_write_off_flag_n"/>
         <bm:field name="billing_status_n"/>
         <bm:field name="invoice_status_n"/>
-        <bm:field name="bp_bank_account_id"/>
-        <bm:field name="vender_bank_account_id"/>
-        <bm:field name="vender_name"/>
-        <bm:field name="VENDER_BANK_ACCOUNT_NUMBER"/>
-        <bm:field name="bp_bank_account_name"/>
-        <bm:field name="bp_bank_account_num"/>
+<!--        <bm:field name="bp_bank_account_id"/>-->
+<!--        <bm:field name="vender_bank_account_id"/>-->
+<!--        <bm:field name="vender_name"/>-->
+<!--        <bm:field name="VENDER_BANK_ACCOUNT_NUMBER"/>-->
+<!--        <bm:field name="bp_bank_account_name"/>-->
+<!--        <bm:field name="bp_bank_account_num"/>-->
     </bm:fields>
     <bm:features>
         <s:bm-script><![CDATA[

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

@@ -728,7 +728,6 @@
             //检验输入的数据是否符合要求
             var check_due_amount_flag=true;
             var line_datas=$(ds_line_id).data;
-            debugger
             for(var i=0;i<line_datas.length;i++){
                 var line_data=line_datas[i];
                 //应付我司金额
@@ -745,13 +744,13 @@
                     return false;
                 }
                 //根据金额判断代理店和厂商不能为空
-                if(amount_agent>0 &&!vender_bank_account_id){
+                if(amount_agent>0 &&!bp_bank_account_id){
 
                     $L.showErrorMessage("提示",'请选择代理店账号信息！');
                     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     return false;
                 }
-                if(amount_vender>0 &&!bp_bank_account_id){
+                if(amount_vender>0 &&!vender_bank_account_id){
 
                     $L.showErrorMessage("提示",'请选择厂商账号信息！');
                     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();