From aebe25ffdca7877ec8a4a9b3e2b1c10d97005011 Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Mon, 29 Apr 2024 10:24:23 +0800
Subject: [PATCH] 1

---
 .../Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js        | 2 +-
 .../MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js
index 4ad9acec..3529aaf6 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js
@@ -5988,7 +5988,7 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
                     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");
+                    sql = sql + getAndConSql(sql, Currency, " exists(select 1 from ch_fee_do where BILLNO = cm.BILLNO and CURRENCY = '" + Currency +"') and AMOUNTOT<>0");
 
                 }   
         }
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
index 439f41ab..bb2efbad 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
@@ -13852,6 +13852,7 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
         this.panelSearch = new Ext.Panel({
             layout: "border",
             region: "north",
+            autoScroll: true,
             height: 96,
             items: [this.formSearch]
         });