1

DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs

@@ -6487,7 +6487,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
             }
             else if (visiblerange == "1")
             {
-                str = " COMPANYID='" + companyid + "' ";
+                str = " COMPANYID='" + companyid + "' or  SALECORPID='"+ companyid + "' ";
             }
             else if (visiblerange == "5")
             {
@@ -6502,11 +6502,11 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
                         {
                             if (str == "")
                             {
-                                str = " (COMPANYID='" + Convert.ToString(reader["COMPANYID"]) + "'";
+                                str = " (COMPANYID='" + Convert.ToString(reader["COMPANYID"]) + "' or  SALECORPID='"+ Convert.ToString(reader["COMPANYID"]) + "'";
                             }
                             else
                             {
-                                str = str + " or COMPANYID='" + Convert.ToString(reader["COMPANYID"]) + "'";
+                                str = str + " or COMPANYID='" + Convert.ToString(reader["COMPANYID"]) + "' or  SALECORPID='"+ Convert.ToString(reader["COMPANYID"]) +"' ";
                             };
                         }
                         str = str + ")";

DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js

@@ -9600,7 +9600,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                        buttons: Ext.Msg.OK
                    });
                    return false;
-               }
+               } else return true;
                //if (this.strMBLNO == '') {
                //    Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: Zi.LAN.FEE.WeiLuRuTiDanHao, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
                //    return false;

DSWeb/DSWeb.csproj.user

@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>D:\DS7_HYRD\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\DONGSHENG7\DS7HYRD\DSWeb\Properties\PublishProfiles\配置文件1.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />