Merge branch 'DS7_HYRD' of http://60.209.125.238:20010/dengyu/DS7 into DS7_HYRD

DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js

@@ -5981,9 +5981,16 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
 
         var Currency = form.findField('Currency').getValue();
         if (Currency != '') {
-            if (Currency == 'RMB')
+            if (Currency == 'RMB') {
                 sql = sql + getAndConSql(sql, Currency, " AMOUNTRMB<>0 ");
-            else sql = sql + getAndConSql(sql, Currency, " AMOUNTUSD<>0 ");
+            } else
+                if (Currency == 'USD') {
+                    sql = sql + getAndConSql(sql, Currency, " AMOUNTRMB<>0 ");
+                }
+                else {
+                    sql = sql + getAndConSql(sql, Currency, "exists(select 1 from ch_fee_do where BILLNO = cm.BILLNO and CURRENCY = '" + Currency +"') and AMOUNTOT<>0");
+
+                }   
         }
 
         var expDateBgn = form.findField('ExpDateBgn').getRawValue();