diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_Invoicehexiao/ChInvoicehexiaoEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_Invoicehexiao/ChInvoicehexiaoEdit.js index 49259056..194efc55 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_Invoicehexiao/ChInvoicehexiaoEdit.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_Invoicehexiao/ChInvoicehexiaoEdit.js @@ -2962,7 +2962,7 @@ Ext.extend(Shipping.MsChInvoicehexiaoEdit, Ext.Panel, { return ''; } - var sql = ''; + var sql = ' F.FEESTATUS IN (0,8,9) '; var customNo = form.findField('CustomNo').getValue(); sql = sql + getAndConSql(sql, customNo, " (CUSTNO like '%" + customNo + "%' or MBLNO like '%" + customNo + "%' or HBLNO like '%" + customNo + "%' or CUSTOMNO like '%" + customNo + "%' or ORDERNO like '%" + customNo + "%')"); @@ -2983,6 +2983,16 @@ Ext.extend(Shipping.MsChInvoicehexiaoEdit, Ext.Panel, { var ACCDATETO = form.findField('ACCDATETO').getRawValue(); sql = sql + getAndConSql(sql, ACCDATETO, "B.ACCDATE<='" + ACCDATETO + "'"); + var FeeName = form.findField('FeeName').getValue(); + sql = sql + getAndConSql(sql, FeeName, "F.FeeName='" + FeeName + "'"); + + var CUSTNAME = form.findField('CUSTNAME').getValue(); + sql = sql + getAndConSql(sql, CUSTNAME, "F.CUSTOMERNAME='" + CUSTNAME + "'"); + + var DC = form.findField('DC').getValue(); + sql = sql + getAndConSql(sql, DC, "FEETYPE=" + DC); + + var feesql = ' EXISTS (select 1 from ch_fee where b.BSNO=ch_fee.BSNO and ch_fee.ISINVOICE=0 AND FEESTATUS IN (0,8,9) and (AMOUNT<>(ISNULL(INVOICE,0)+ISNULL(ORDERINVOICE,0))) '; @@ -3001,8 +3011,7 @@ Ext.extend(Shipping.MsChInvoicehexiaoEdit, Ext.Panel, { var feesql = ' FEESTATUS IN (0,8,9) and (AMOUNT<>(ISNULL(INVOICE,0)+ISNULL(ORDERINVOICE,0))) '; - var CUSTNAME = form.findField('CUSTNAME').getValue(); - feesql = feesql + getAndConSql(feesql, CUSTNAME, "F.CUSTOMERNAME='" + CUSTNAME + "'"); + var DC = form.findField('DC').getValue(); @@ -3012,7 +3021,10 @@ Ext.extend(Shipping.MsChInvoicehexiaoEdit, Ext.Panel, { feesql = feesql + getAndConSql(feesql, Currency, "Currency='" + Currency + "'"); var FeeName = form.findField('FeeName').getValue(); - feesql = feesql + getAndConSql(feesql, FeeName, "FeeName='" + FeeName + "'"); + feesql = feesql + getAndConSql(feesql, FeeName, "F.FeeName='" + FeeName + "'"); + + var CUSTNAME = form.findField('CUSTNAME').getValue(); + feesql = feesql + getAndConSql(feesql, CUSTNAME, "F.CUSTOMERNAME='" + CUSTNAME + "'"); var ShenNo = form.findField('ShenNo').getValue(); diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs index bea40d75..bf943a9e 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs @@ -2995,7 +2995,7 @@ namespace DSWeb.MvcShipping.Controllers if (bodyList != null) { - result = MsOpSeaeDAL.Modify(bodyList, amodifydata, Convert.ToString(Session["COMPANYID"])); + result = MsOpSeaeDAL.Modify(bodyList, amodifydata, Convert.ToString(Session["COMPANYID"]), Convert.ToString(Session["USERID"]).ToString()); } var jsonRespose = new JsonResponse { diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs index 634fdda4..9e745936 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs @@ -18,6 +18,7 @@ using System.Web; using DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL; using DSWeb.EntityDA; + using DSWeb.MvcShipping.DAL.MsSysParamSet; using DSWeb.SoftMng.DAL.SoftSysTable; using DSWeb.Areas.Account.DAL.Chfee_Settlement; diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpCtnr/MsOpCtnrDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpCtnr/MsOpCtnrDAL.cs index 41f0749d..7506530c 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpCtnr/MsOpCtnrDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpCtnr/MsOpCtnrDAL.cs @@ -335,9 +335,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpCtnrDAL var strSql = new StringBuilder(); strSql.Append("DELETE FROM op_ctnmng WHERE BSNO='" + items.BSNO + "'"); SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql.ToString(), null); - var strSql2 = new StringBuilder(); - strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE BSNO='" + items.BSNO + "'"); - SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); + //var strSql2 = new StringBuilder(); + //strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE CTNSTATUS IN ('买箱','卖箱') AND BSNO='" + items.BSNO + "'"); + //SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); } @@ -393,9 +393,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpCtnrDAL strSql.Append("DELETE FROM op_ctnmng WHERE BSNO ='" + BSNO + "'"); SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql.ToString(), null); - var strSql2 = new StringBuilder(); - strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE BSNO ='" + BSNO + "'"); - SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); + //var strSql2 = new StringBuilder(); + //strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE CTNSTATUS IN ('买箱','卖箱') AND BSNO ='" + BSNO + "'"); + //SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); sqlTran.Commit(); @@ -453,9 +453,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpCtnrDAL strSql.Append("DELETE FROM op_ctnmng WHERE BSNO ='" + head.BSNO + "'"); SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql.ToString(), null); - var strSql2 = new StringBuilder(); - strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE BSNO ='" + head.BSNO + "'"); - SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); + //var strSql2 = new StringBuilder(); + //strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE CTNSTATUS IN ('买箱','卖箱') AND BSNO ='" + head.BSNO + "'"); + //SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); sqlTran.Commit(); @@ -581,9 +581,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpCtnrDAL var strSqlMng = new StringBuilder(); strSqlMng.Append("DELETE FROM op_ctnmng_detail WHERE CTNGID IN (" + ids + ") AND BSNO='" + BSNO + "'"); SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSqlMng.ToString(), null); - var strSql2 = new StringBuilder(); - strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE CTNGID IN (" + ids + ") AND BSNO='" + BSNO + "'"); - SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); + + //var strSql2 = new StringBuilder(); + //strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE CTNSTATUS IN ('买箱','卖箱') AND CTNGID IN (" + ids + ") AND BSNO='" + BSNO + "'"); + //SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); result.Success = true; @@ -706,14 +707,16 @@ namespace DSWeb.MvcShipping.DAL.MsOpCtnrDAL strSqlCtnr.Append("update op_ctnmng_ctndetail set ISBERETURN=0 where CTNGID in(select CTNGID from op_ctnmng_detail where CTNGID IN (" + ids + ") AND BSNO='" + BSNO + "')"); SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSqlCtnr.ToString(), null); } - - var strSqlMng = new StringBuilder(); - strSqlMng.Append("DELETE FROM op_ctnmng_detail WHERE CTNGID IN (" + ids + ") AND BSNO='" + BSNO + "'"); - SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSqlMng.ToString(), null); - var strSql2 = new StringBuilder(); - strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE CTNGID IN (" + ids + ") AND BSNO='" + BSNO + "'"); - SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); - + if (isdeletectn) + { + var strSqlMng = new StringBuilder(); + strSqlMng.Append("DELETE FROM op_ctnmng_detail WHERE CTNGID IN (" + ids + ") AND BSNO='" + BSNO + "'"); + SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSqlMng.ToString(), null); + } + // var strSql2 = new StringBuilder(); + // strSql2.Append("DELETE FROM op_ctnmng_ctnstatus WHERE CTNGID IN (" + ids + ") AND BSNO='" + BSNO + "'"); + // SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, strSql2.ToString(), null); + //} result.Success = true; result.Message = "删除成功"; diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs index 46f54da4..2637f329 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs @@ -1987,7 +1987,18 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL var blUpSQL = " insert into sys_log(GID,NAME,LOGTYPE,LOGTIME,LOGCONTENT,CREATEUSER) values(NEWID(),'" + headData.BSNO + "','提单号更改','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + headData.MBLNO + '(' +MBLNO + ')' + "','" +userid + "')"; bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL); } - + var ETD = T_ALL_DA.GetStrSQL("ETD", "select ETD from OP_SEAE WHERE BSNO='" + headData.BSNO + "'"); + if (ETD != headData.ETD) + { + var blUpSQL = " insert into sys_log(GID,NAME,LOGTYPE,LOGTIME,LOGCONTENT,CREATEUSER) values(NEWID(),'" + headData.BSNO + "','ETD更改','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + headData.ETD + '(' + ETD + ')' + "','" + userid + "')"; + bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL); + } + var ACCDATE2 = T_ALL_DA.GetStrSQL("ACCDATE", "select MBLNO from OP_SEAE WHERE BSNO='" + headData.BSNO + "'"); + if (ACCDATE2 != headData.ACCDATE) + { + var blUpSQL = " insert into sys_log(GID,NAME,LOGTYPE,LOGTIME,LOGCONTENT,CREATEUSER) values(NEWID(),'" + headData.BSNO + "','会计期间更改','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + headData.ACCDATE + '(' + ACCDATE2 + ')' + "','" + userid + "')"; + bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL); + } } else { @@ -3672,7 +3683,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL #endregion #region 批量修改 - public static DBResult Modify(List bodyList, MsOpSeae modifydata, string companyid) + public static DBResult Modify(List bodyList, MsOpSeae modifydata, string companyid,string userid) { var result = new DBResult(); @@ -3828,6 +3839,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSqlBL.Append(" where BSNO=@BSNO "); + + var strSqllog = new StringBuilder(); + strSqllog.Append("insert into sys_log(GID,NAME,LOGTYPE,LOGTIME,LOGCONTENT,CREATEUSER) values(newid(),@LOGNAME,@LOGTYPE,@LOGTIME,@LOGCONTENT,@CREATEUSER) "); + + var cmdupdateLog =db.GetSqlStringCommand(strSqllog.ToString()); + var cmdupdateBL = db.GetSqlStringCommand(strSqlBL.ToString()); var cmdupdate = @@ -3948,7 +3965,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (isPost) { - + bool isedt = false; + bool isaccdate = false; cmdupdate.Parameters.Clear(); cmdupdateBL.Parameters.Clear(); @@ -4018,22 +4036,22 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL var day = Convert.ToDateTime(modifydata.ETD).Day; if (day > nowperiod.CLOSEDAY) { - var ACCDATE = Convert.ToDateTime(modifydata.ETD).AddMonths(1).ToString("yyyy-MM"); - db.AddInParameter(cmdupdate, "@ACCDATE", DbType.String, ACCDATE); + modifydata.ACCDATE = Convert.ToDateTime(modifydata.ETD).AddMonths(1).ToString("yyyy-MM"); + db.AddInParameter(cmdupdate, "@ACCDATE", DbType.String, modifydata.ACCDATE); } else { - var ACCDATE = Convert.ToDateTime(modifydata.ETD).ToString("yyyy-MM"); - db.AddInParameter(cmdupdate, "@ACCDATE", DbType.String, ACCDATE); + modifydata.ACCDATE = Convert.ToDateTime(modifydata.ETD).ToString("yyyy-MM"); + db.AddInParameter(cmdupdate, "@ACCDATE", DbType.String, modifydata.ACCDATE); } } else { - var ACCDATE = Convert.ToDateTime(modifydata.ETD).ToString("yyyy-MM"); - db.AddInParameter(cmdupdate, "@ACCDATE", DbType.String, ACCDATE); + modifydata.ACCDATE = Convert.ToDateTime(modifydata.ETD).ToString("yyyy-MM"); + db.AddInParameter(cmdupdate, "@ACCDATE", DbType.String, modifydata.ACCDATE); } - + isaccdate = true; } - + isedt = true; } if (modifydata.CLOSINGDATE != "" && modifydata.CLOSINGDATE != null) db.AddInParameter(cmdupdate, "@CLOSINGDATE", DbType.String, modifydata.CLOSINGDATE); @@ -4046,7 +4064,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (ACCDATESAMEETD != "1") { if (modifydata.ACCDATE != "" && modifydata.ACCDATE != null) + { db.AddInParameter(cmdupdate, "@ACCDATE", DbType.String, modifydata.ACCDATE); + isaccdate = true; + } } if (modifydata.SALEDEPT != "" && modifydata.SALEDEPT != null) db.AddInParameter(cmdupdate, "@SALEDEPT", DbType.String, modifydata.SALEDEPT); @@ -4098,6 +4119,28 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL db.AddInParameter(cmdupdateBL, "@BSNO", DbType.String, enumValue.BSNO); db.ExecuteNonQuery(cmdupdateBL, tran); i = i + 1; + + if (isedt) { + cmdupdateLog.Parameters.Clear(); + db.AddInParameter(cmdupdateLog, "@LOGNAME", DbType.String, enumValue.BSNO); + db.AddInParameter(cmdupdateLog, "@LOGTYPE", DbType.String,"更新开船日期 "); + db.AddInParameter(cmdupdateLog, "@LOGTIME", DbType.String, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); + db.AddInParameter(cmdupdateLog, "@LOGCONTENT", DbType.String, modifydata.ETD+"("+enumValue.ETD+")"); + db.AddInParameter(cmdupdateLog, "@CREATEUSER", DbType.String, userid); + db.ExecuteNonQuery(cmdupdateLog, tran); + } + + if (isedt) + { + cmdupdateLog.Parameters.Clear(); + db.AddInParameter(cmdupdateLog, "@LOGNAME", DbType.String, enumValue.BSNO); + db.AddInParameter(cmdupdateLog, "@LOGTYPE", DbType.String, "更新会计期间 "); + db.AddInParameter(cmdupdateLog, "@LOGTIME", DbType.String, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); + db.AddInParameter(cmdupdateLog, "@LOGCONTENT", DbType.String, modifydata.ACCDATE + "(" + enumValue.ACCDATE + ")"); + db.AddInParameter(cmdupdateLog, "@CREATEUSER", DbType.String, userid); + db.ExecuteNonQuery(cmdupdateLog, tran); + } + } } diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs index 7379ec57..6c3d093d 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs @@ -8049,7 +8049,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL foreach (var ctn in ctnlist) { - r.WriteLine("51:001:" + ctn.CNTRNO + ":" + ctn.SEALNO + ":" + ctn.SIZE.ToString() + ctn.CTN + ":8:" + ctn.PKGS.ToString() + r.WriteLine("51:001:" + ctn.CNTRNO + ":" + ctn.SEALNO + ":" + ctn.CTNALL + ":8:" + ctn.PKGS.ToString() + ":" + ctn.KGS.ToString() + ":" + ctn.KINDPKGS + ":" + ctn.CBM + ":::::::2'"); r.WriteLine("52:" + ctn.SEALNO + ":M:CA'"); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientEdit.js index 93faafa9..35d0364a 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientEdit.js @@ -291,14 +291,14 @@ Ext.extend(Shipping.MsInfoClientEdit, Ext.Panel, { }); me = this; - this.StoreStlName = Ext.create('Ext.data.Store', { + this.storeStlName = Ext.create('Ext.data.Store', { fields: ['STLNAME', 'DISPLAYNAME'] }); - this.StoreStlName.add({ "STLNAME": "月结", "DISPLAYNAME": Zi.LAN.YUEJIE }); - this.StoreStlName.add({ "STLNAME": "半月结", "DISPLAYNAME": Zi.LAN.BANYUEJIE }); - this.StoreStlName.add({ "STLNAME": "约定天数", "DISPLAYNAME": Zi.LAN.YUEDINGTIANSHU }); - this.StoreStlName.add({ "STLNAME": "周结", "DISPLAYNAME": Zi.LAN.ZHOUJIE }); - this.StoreStlName.add({ "STLNAME": "现结买单", "DISPLAYNAME": Zi.LAN.XIANJIEMAIDAN }); + this.storeStlName.add({ "STLNAME": "月结", "DISPLAYNAME": Zi.LAN.YUEJIE }); + this.storeStlName.add({ "STLNAME": "半月结", "DISPLAYNAME": Zi.LAN.BANYUEJIE }); + this.storeStlName.add({ "STLNAME": "约定天数", "DISPLAYNAME": Zi.LAN.YUEDINGTIANSHU }); + this.storeStlName.add({ "STLNAME": "周结", "DISPLAYNAME": Zi.LAN.ZHOUJIE }); + this.storeStlName.add({ "STLNAME": "现结买单", "DISPLAYNAME": Zi.LAN.XIANJIEMAIDAN }); //this.storeStlName.add({ "FRT": "周结" }); //this.storeStlName.add({ "FRT": "约定天数" }); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpRailway/MsOpRailwayIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpRailway/MsOpRailwayIndex.js index a66831a1..0693a55f 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpRailway/MsOpRailwayIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpRailway/MsOpRailwayIndex.js @@ -45,6 +45,24 @@ Ext.extend(Shipping.MsOpRailwayIndex, Ext.Panel, { width: 30 }); + + this.Pagenum = Ext.create('Ext.form.field.Number', { + name: 'bottles', + fieldLabel: '每页记录数', + labelAlign: 'right', + value: this.PageSize, + maxValue: 100000, + width: 180, + minValue: 0, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }); + this.initgirdcolums = [{ sortable: true, id: '', @@ -550,12 +568,12 @@ Ext.extend(Shipping.MsOpRailwayIndex, Ext.Panel, { }, columns: this.girdcolums, // paging bar on the bottom - bbar: Ext.create('Ext.PagingToolbar', { + bbar: [Ext.create('Ext.PagingToolbar', { store: this.storeList, displayInfo: true, displayMsg: '当前显示 {0} - {1}条记录 /共 {2}条记录', emptyMsg: "没有数据" - }) + }), this.Pagenum] }); /////////////以下部分为获取存储的gridpanel显示样式 @@ -1459,6 +1477,7 @@ Ext.extend(Shipping.MsOpRailwayIndex, Ext.Panel, { //var girdcolums = this.gridList.getColumnMode(); var sql = this.getCondition(); this.sqlcontext = sql; + this.PageSize = this.Pagenum.getValue(); this.storeList.load({ params: { start: 0, limit: this.PageSize, sort: '', condition: sql }, waitMsg: "正在查询数据...", @@ -1470,6 +1489,7 @@ Ext.extend(Shipping.MsOpRailwayIndex, Ext.Panel, { onDsQuery: function (button, event) { //var girdcolums = this.gridList.getColumnMode(); var sql = this.sqlcontext; + this.PageSize = this.Pagenum.getValue(); this.storeList.load({ params: { start: 0, limit: this.PageSize, sort: '', condition: sql }, waitMsg: "正在查询数据...", diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpRailway/MsOpRailwaySZIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpRailway/MsOpRailwaySZIndex.js index 6d8be3b5..a8de1ce3 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpRailway/MsOpRailwaySZIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpRailway/MsOpRailwaySZIndex.js @@ -50,6 +50,24 @@ Ext.extend(Shipping.MsOpRailwayIndex, Ext.Panel, { width: 30 }); + + this.Pagenum = Ext.create('Ext.form.field.Number', { + name: 'bottles', + fieldLabel: '每页记录数', + labelAlign: 'right', + value: this.PageSize, + maxValue: 100000, + width: 180, + minValue: 0, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }); + this.initgirdcolums = [{ sortable: true, id: '', @@ -445,12 +463,12 @@ Ext.extend(Shipping.MsOpRailwayIndex, Ext.Panel, { }, columns: this.girdcolums, // paging bar on the bottom - bbar: Ext.create('Ext.PagingToolbar', { + bbar: [Ext.create('Ext.PagingToolbar', { store: this.storeList, displayInfo: true, displayMsg: '当前显示 {0} - {1}条记录 /共 {2}条记录', emptyMsg: "没有数据" - }) + }), this.Pagenum] }); /////////////以下部分为获取存储的gridpanel显示样式 @@ -1226,6 +1244,7 @@ Ext.extend(Shipping.MsOpRailwayIndex, Ext.Panel, { //var girdcolums = this.gridList.getColumnMode(); var sql = this.getCondition(); this.sqlcontext = sql; + this.PageSize = this.Pagenum.getValue(); this.storeList.load({ params: { start: 0, limit: this.PageSize, sort: '', condition: sql }, waitMsg: "正在查询数据...",