Browse Source

收款单、付款单明细表2来源单据放大镜条件修改

dingyl 6 years ago
parent
commit
fb76c241eb

+ 1 - 2
frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -96,8 +96,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         return false;
                     }
                     Ext.apply(f, {
-                        defaultCondition: "sl_vendid = "+pb_vendid+" and sl_currency ='"+pb_currency+"' AND sl_custid = 0 AND (  sl_kind IN ( '采购验收单','采购验退单' ) OR ( sl_kind = '期初余额' AND sl_ym = (select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid) ) "+
-                        ") and sl_namount<>0 "
+                        defaultCondition: "sl_vendid = "+pb_vendid+" and sl_currency ='"+pb_currency+"' AND sl_custid = 0 AND sl_kind IN ( '采购验收单','采购验退单', '期初余额' ) and ifnull(sl_preamount,0)=0 and sl_namount<>0 "
                     });
                 }
             },

+ 1 - 2
frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -140,8 +140,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         return false;
                     }
                     Ext.apply(f, {
-                        defaultCondition: "sl_custid = "+rb_custid+" and sl_currency ='"+rb_currency+"' AND sl_custid <> 0 AND (  sl_kind IN ( '出货单', '销售退货单' ) OR ( sl_kind = '期初余额' AND sl_ym = (select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid) ) "+
-                        ") and sl_namount<>0 "
+                        defaultCondition: "sl_custid = "+rb_custid+" and sl_currency ='"+rb_currency+"' AND sl_custid <> 0 AND  sl_kind IN ( '出货单', '销售退货单', '期初余额'  ) and ifnull(sl_preamount,0)=0 and sl_namount<>0 "
                     });
                 }
             },