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

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

@@ -10,7 +10,7 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-                SELECT t1.*,
+               SELECT t1.*,
         (select v.code_value_name
            from sys_code_values_v v
           where v.code = 'CON_WRITE_OFF_FLAG'
@@ -208,6 +208,13 @@
                      ),
                      0)) > 0
             AND t.data_class = 'NORMAL'
+            AND t.bp_id_agent_level1 IN (
+                select h.bp_id
+                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'
+            )
           --  AND t.contract_status  IN
           --     ('INCEPT')
                 --测试用，cf_itme应当为0

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

@@ -49,10 +49,11 @@
                         $L.showErrorMessage("提示",'请选择厂商相同的现金流信息！');
                         return;
                     }
-                if(a[i].get('billing_status_n')!='FULL' ||a[i].get('billing_status_n')!='发票已确认'){
+                //暂时去掉
+               /* if(a[i].get('billing_status_n')!='FULL' ||a[i].get('billing_status_n')!='发票已确认'){
                     $L.showErrorMessage("提示",'请选择开票状态为已开票，发票状态为已确认的现金流！');
                     return;
-                }
+                }*/
 
                     cashflow_id = a[i].get('cashflow_id');
                     var arr = {};