1

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

@@ -2962,7 +2962,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
             strSql.Append(" ,PAYABLETIME,AMOUNTRMB AMOUNT,RATE,ISNULL(AMOUNTOT,0)+ISNULL(AMOUNTUSD,0)  USDAMOUNT");
             strSql.Append(" ,APPLICANT,APPLYTIME,ENTERTIME,SETTLEUSER,SETTLETIME ");
             strSql.Append(",(select STLNAME from [code_stlmode] where STLCODE=cm.SETTLETYPE) as SETTLETYPEREF");
-            strSql.Append(" ,REMARK,COMPANYID,SALECORPID ");
+            strSql.Append(" ,REMARK,COMPANYID,SALECORPID,(select [NAME] from [company] where GID=cm.SALECORPID) as SALECORP ");
             strSql.Append(",(select SUM(CASE FEETYPE WHEN 1 THEN -DOAMOUNT ELSE DOAMOUNT END) from ch_fee_do where CURRENCY='RMB' AND BILLNO=cm.BILLNO) as DOAMOUNT ");
             strSql.Append(",(select SUM(CASE FEETYPE WHEN 1 THEN -DOAMOUNT ELSE DOAMOUNT END) from ch_fee_do where CURRENCY!='RMB' AND BILLNO=cm.BILLNO) as USDDOAMOUNT ");
             strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=cm.BILLSTATUS) as BILLSTATUSREF");
@@ -3074,6 +3074,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
                     data.SETTLETYPE = Convert.ToString(reader["SETTLETYPE"]);
                     data.SETTLETYPEREF = Convert.ToString(reader["SETTLETYPEREF"]);
                     data.SALECORPID = Convert.ToString(reader["SALECORPID"]);
+                    data.SALECORP = Convert.ToString(reader["SALECORP"]);
                     data.INVNO = Convert.ToString(reader["INVNO"]);
                     if (reader["AUDITTIME"] != DBNull.Value)
                         data.AUDITTIME = Convert.ToDateTime(reader["AUDITTIME"]).ToString("yyyy-MM-dd hh:mm:ss");

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

@@ -1301,7 +1301,12 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
             dataIndex: 'AUDITSTLAMOUNT',
             header: Zi.LAN.AuditSettlementAmount,
             width: 60
-        }
+            }, {
+                sortable: true,
+                dataIndex: 'SALECORP',
+                header: Zi.LAN.BSSALECORP,
+                width: 60
+            }
             ];
 
         this.girdfeecolums = this.initgirdfeecolums;

DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs

@@ -27,6 +27,7 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient
 {
     public class MsInfoClientDAL
     {
+
         #region BillNoSet
 
         static public List<MsClient> GetDataList(int start, int limit, string strCondition, string userid, string usercode, string companyid, string sort = null,string lan="")

DSWeb/Areas/MvcShipping/Models/MsInfoClient/MsInfoContract.cs

@@ -187,7 +187,6 @@ namespace DSWeb.MvcShipping.Models.MsInfoContract
         public string GID { get; set; }
         public string LINKID { get; set; }
         public string USERID { get; set; }
-
         public string SHOWNAME { get; set; }
         public string MODIFIEDUSER { get; set; }
         public string MODIFIEDTIME { get; set; }