diff --git a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs index d9de7035..de952056 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs @@ -4738,7 +4738,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication StringWriter writer = new StringWriter(); htmlDoc.Save(writer); string mailbody = writer.ToString(); - var mailtopic = "【"+ deptname + "、"+ username + "、"+ head.CUSTOMERNAME + "】付费申请"; + var mailtopic = "【"+ deptname + " "+ username + " "+ head.CUSTOMERNAME + "】付费申请"; var MAILTONAME = "admin@dongshengsoft.com"; var PARAMVALUE = MsSysParamSetDAL.GetData("PARAMNAME='MAILTONAME'"); @@ -4842,7 +4842,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication StringWriter writer = new StringWriter(); htmlDoc.Save(writer); string mailbody = writer.ToString(); - var mailtopic = "【" + deptname + "、" + username + "、" + head.CUSTOMERNAME + "】月结付费申请"; + var mailtopic = "【" + deptname + " " + username + " " + head.CUSTOMERNAME + "】月结付费申请"; var MAILTONAME = "admin@dongshengsoft.com"; var PARAMVALUE = MsSysParamSetDAL.GetData("PARAMNAME='MAILTONAME'"); diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs index ecd4815a..bb6f7da2 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs @@ -889,7 +889,6 @@ namespace DSWeb.MvcShipping.Controllers } #endregion - #region 保存 // public ContentResult Save(string opstatus, string data, string data2, string data3, string body) // { @@ -1443,17 +1442,18 @@ namespace DSWeb.MvcShipping.Controllers data2 = data2.Replace("❥", "<"); var headData = JsonConvert.Deserialize(data.Replace("}", ",") + data2.Replace("{", "").Replace("}", ",") + data3.Replace("{", "")); var bodyList = JsonConvert.Deserialize>(body); - var result = MsOpSeaeDAL.DoSave(opstatus,headData,bodyList, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]),Session["COMPANYNAME"].ToString()); + var result = MsOpSeaeDAL.DoSave(opstatus, headData, bodyList, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), Session["COMPANYNAME"].ToString()); //var bsopstatus = MsOpStatusDAL.GetData(" BSNO='" + headData.BSNO + "' AND (STATUS='已发确认' or STATUS='已发订舱') "); //if (bsopstatus != null && !string.IsNullOrEmpty(bsopstatus.STATUS)) //{ - var djylist = new List(); - djylist.Add(headData); - MsOpSeaeEdiPortDAL.SendToDJY(djylist, Convert.ToString(Session["COMPANYID"])); + var djylist = new List(); + djylist.Add(headData); + MsOpSeaeEdiPortDAL.SendToDJY(djylist, Convert.ToString(Session["COMPANYID"])); //} - if (result.Success) { + if (result.Success) + { var jsonRespose = new JsonResponse { Success = result.Success, @@ -1470,7 +1470,7 @@ namespace DSWeb.MvcShipping.Controllers } } - public ContentResult PLCopy(string bsno,int copynum) + public ContentResult PLCopy(string bsno, int copynum) { string userid = Convert.ToString(Session["USERID"]); @@ -1481,8 +1481,8 @@ namespace DSWeb.MvcShipping.Controllers } - var headData = MsOpSeaeDAL.GetData("BSNO='"+bsno+"'"); - var bodyList = MsOpSeaeDAL.GetBodyList("BSNO='"+bsno+"'"); + var headData = MsOpSeaeDAL.GetData("BSNO='" + bsno + "'"); + var bodyList = MsOpSeaeDAL.GetBodyList("BSNO='" + bsno + "'"); //var mblnohead = ""; //var mblnonum = ""; //var mblno = headData.MBLNO; @@ -1502,7 +1502,7 @@ namespace DSWeb.MvcShipping.Controllers DBResult result = new DBResult(); - for (int i = 1;i<=copynum;i++) + for (int i = 1; i <= copynum; i++) { //mblnonum = (Convert.ToInt32(mblnonum)+1).ToString(); //while (mblnonum.Length < numlength) { @@ -1510,7 +1510,7 @@ namespace DSWeb.MvcShipping.Controllers // mblnonum = "0" + mblnonum; //} //var newmblno = mblnohead + mblnonum; - headData.MBLNO =""; + headData.MBLNO = ""; headData.CUSTNO = ""; headData.ORDERNO = ""; headData.BSNO = "topseae" + Guid.NewGuid().ToString(); @@ -1527,13 +1527,14 @@ namespace DSWeb.MvcShipping.Controllers } result = MsOpSeaeDAL.DoSave("add", headData, bodyList, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), Session["COMPANYNAME"].ToString()); - if (result.Success) { - var head = MsOpSeaeEdiPortDAL.GetAmsData("BSNO='"+ bsno + "'"); + if (result.Success) + { + var head = MsOpSeaeEdiPortDAL.GetAmsData("BSNO='" + bsno + "'"); head.BSNO = headData.BSNO; head.DbOperationType = DbOperationType.DbotIns; head.AMSNO = Guid.NewGuid().ToString(); var modb = new ModelObjectDB(); - modb.Save(head); + modb.Save(head); } @@ -1775,9 +1776,9 @@ namespace DSWeb.MvcShipping.Controllers } } - if (detailpkgs !=pkgs) errorstr = errorstr + " 多品名中 件数总和与集装箱件数不一致！"; - if (detailkgs !=kgs) errorstr = errorstr + " 多品名中 重量总和与集装箱重量不一致！"; - if (detailcbm !=cbm) errorstr = errorstr + " 多品名中 立方数总和与集装箱立方不一致！"; + if (detailpkgs != pkgs) errorstr = errorstr + " 多品名中 件数总和与集装箱件数不一致！"; + if (detailkgs != kgs) errorstr = errorstr + " 多品名中 重量总和与集装箱重量不一致！"; + if (detailcbm != cbm) errorstr = errorstr + " 多品名中 立方数总和与集装箱立方不一致！"; if (errorstr != "") { @@ -1977,8 +1978,8 @@ namespace DSWeb.MvcShipping.Controllers } - headData.SIREMARK = FullWidthToHalfWidth(ToDBC(headData.SIREMARK)); - headData.SIREMARK = DelEndSpace(headData.SIREMARK); + headData.SIREMARK = MsOpSeaeDAL.FullWidthToHalfWidth(MsOpSeaeDAL.ToDBC(headData.SIREMARK)); + headData.SIREMARK = MsOpSeaeDAL.DelEndSpace(headData.SIREMARK); if (isPost) @@ -2009,6 +2010,9 @@ namespace DSWeb.MvcShipping.Controllers } + + + #endregion #region 删除 @@ -3089,16 +3093,16 @@ namespace DSWeb.MvcShipping.Controllers //headData.CONSIGNEE = ToDBC(headData.CONSIGNEE); //headData.NOTIFYPARTY = ToDBC(headData.NOTIFYPARTY); //20191126 保存方法改为和主业务内的处理方法一致 - headData.SHIPPER = FullWidthToHalfWidth(ToDBC(headData.SHIPPER)); - headData.SHIPPER = DelEndSpace(headData.SHIPPER); - headData.CONSIGNEE = FullWidthToHalfWidth(ToDBC(headData.CONSIGNEE)); - headData.CONSIGNEE = DelEndSpace(headData.CONSIGNEE); - headData.NOTIFYPARTY = FullWidthToHalfWidth(ToDBC(headData.NOTIFYPARTY)); - headData.NOTIFYPARTY = DelEndSpace(headData.NOTIFYPARTY); + headData.SHIPPER = MsOpSeaeDAL.FullWidthToHalfWidth(MsOpSeaeDAL.ToDBC(headData.SHIPPER)); + headData.SHIPPER = MsOpSeaeDAL.DelEndSpace(headData.SHIPPER); + headData.CONSIGNEE = MsOpSeaeDAL.FullWidthToHalfWidth(MsOpSeaeDAL.ToDBC(headData.CONSIGNEE)); + headData.CONSIGNEE = MsOpSeaeDAL.DelEndSpace(headData.CONSIGNEE); + headData.NOTIFYPARTY = MsOpSeaeDAL.FullWidthToHalfWidth(MsOpSeaeDAL.ToDBC(headData.NOTIFYPARTY)); + headData.NOTIFYPARTY = MsOpSeaeDAL.DelEndSpace(headData.NOTIFYPARTY); - headData.MARKS = ToDBC(headData.MARKS); - headData.DESCRIPTION = ToDBC(headData.DESCRIPTION); + headData.MARKS = MsOpSeaeDAL.ToDBC(headData.MARKS); + headData.DESCRIPTION = MsOpSeaeDAL.ToDBC(headData.DESCRIPTION); headData.MODIFYUSER = Convert.ToString(Session["USERID"]); headData.MODIFYTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); @@ -4803,6 +4807,39 @@ namespace DSWeb.MvcShipping.Controllers #endregion #region 亿通EDI导出 + + public ContentResult IsCreateYTList(string bsnos, string mblno, string filetype, string filerole, int isbill, string carrier) + { + + var result = new DBResult(); + bsnos = bsnos.Replace(",", "','"); + var headList = MsOpSeaeDAL.GetDataList("BSNO IN ('" + bsnos + "')", CookieConfig.GetCookie_UserId(Request), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"])); + var error = ""; + foreach (var head in headList) { + + if (head.CARGOID == "R" && carrier == "ZIM" && filetype == "E") + { + var OpAms = MsOpSeaeEdiPortDAL.GetAmsData("BSNO='" + head.BSNO + "'"); + if (string.IsNullOrEmpty(OpAms.SIREMARK)) + { error = error + "
主提单号:"+head.MBLNO+" SI备注为空"; } + } + + } + + if (!string.IsNullOrEmpty(error)) + { + var jsonRespose2 = new JsonResponse { Success = false, Message = error + " 确定要发送SI吗？" }; + return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) }; + } + else { + var jsonRespose = new JsonResponse { Success =true, Message ="" }; + return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; + + } + + } + + public ContentResult CreateYTList(string bsnos, string mblno, string filetype, string filerole, int isbill, string carrier) { bsnos = bsnos.Replace(",", "','"); diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index 948ba6bd..cb548079 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -13931,8 +13931,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL foreach (var bill in headData) { //if (filetype != "B") - if (bill.MBLNO == null || bill.MBLNO == "") - { error = error + "
主提单号不能为空"; } + if (bill.ORDERNO== null || bill.ORDERNO == "") { error = error + "
订舱编号不能为空"; } diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs index 844f130a..4d70c4c8 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs @@ -2852,7 +2852,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE strSql.Append(" select vb.CUSTOMERNAME,(select ISSP from info_client where shortname=vb.CUSTOMERNAME) ISSP "); strSql.Append(" ,C.ACCTYPE ,(g.RMBDR-g.STLRMBDR) RMBNODR,(g.USDDR-g.STLUSDDR) USDNODR,(g.TTLDR-g.STLTTLDR)TTLNODR , "); strSql.Append(" isnull(dbo.trimdate(vb.stldate),'') stldate "); - strSql.Append(" ,ISNULL(C.ALLOWAMOUNT,0) ALLOWAMOUNT,'' WFDHT,vb.SALE,vb.OPLBNAME,vb.ETD "); + strSql.Append(" ,ISNULL(C.ALLOWAMOUNT,0) ALLOWAMOUNT,'' WFDHT,vb.SALE,vb.OPLBNAME,vb.ETD,c.BGNDATE,c.ENDDATE "); strSql.Append(" from v_OP_bs VB "); if (BLISSUENOSHEN.PARAMVALUE == "1") @@ -2891,11 +2891,11 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE } if (Convert.ToString(reader["ACCTYPE"]).Trim() == "") { - data.结费类型 = data.结费类型 + "客户结费类型为：现结买单"; + data.结费类型 = data.结费类型 + "客户结费类型为：现结买单 "; } else { - data.结费类型 = data.结费类型 + "客户结费类型为：" + Convert.ToString(reader["ACCTYPE"]); + data.结费类型 = data.结费类型 + "客户结费类型为：" + Convert.ToString(reader["ACCTYPE"])+" 账期开始日期:"+ Convert.ToString(reader["BGNDATE"])+" 至 "+ " 结束日期:" + Convert.ToString(reader["ENDDATE"]); } if (Convert.ToString(reader["ACCTYPE"]) == "约定天数") { //data.结费类型 = data.结费类型 + Convert.ToString(reader["stldays"]) + "天 "; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js index 128ff646..d7f8f7f0 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js @@ -153,13 +153,19 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { store: this.storeFeeNameRef, minChars: 1, matchFieldWidth: false, - //queryParam: 'Name', + queryMode: 'remote', + queryParam: 'Name', forceSelection: true, lazyRender: false, name: 'FeeName', valueField: 'Name', displayField: 'CodeAndName', listeners: { + beforequery: function (e) { + var port = _thisfee.comboxFeeNameRef.rawValue; + if (port != '') + e.query = port; + }, 'focus': function (_this, eOpts) { //var selections = _thisfee.gridDrChFee.getSelectionModel().getSelection(); //获得选中的项 //var strCustomerName = selections[0].get('FeeName'); @@ -200,14 +206,19 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { this.comboxFeeNameRefCr = Ext.create('DsExt.ux.RefTableCombox', { store: this.storeFeeNameRefCr, forceSelection: true, - queryMode: 'local', + queryMode: 'remote', minChars: 1, - //queryParam: 'Name', + queryParam: 'Name', lazyRender: false, name: 'FeeName', matchFieldWidth: false, valueField: 'Name', displayField: 'CodeAndName', listeners: { + beforequery: function (e) { + var port = _thisfee.comboxFeeNameRefCr.rawValue; + if (port != '') + e.query = port; + }, //beforequery: function (e) { // return FilterCombox(e); //}, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index 1fec5283..8cf1ff38 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -164,7 +164,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { model: 'DsShipping.ux.UserRefModel', proxy: { url: '/CommMng/BasicDataRef/GetUserLinkRefListRm' } }); - this.storeOpCode3.load(); + //this.storeOpCode3.load(); this.storeOpCode4 = Ext.create('DsExt.ux.RefTableStore', { model: 'DsShipping.ux.UserRefModel', proxy: { url: '/CommMng/BasicDataRef/GetUserLinkRefListRm' } @@ -5224,14 +5224,14 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }], scope: this }, '-', { - text: '订舱报文', //"打印", + text: 'EDI', //"打印", iconCls: "btnexportexcel", handler: function (button, event) { this.onCreateEDIClick('B'); }, scope: this }, '-', { - text: '截单报文', //"打印", + text: 'ESI', //"打印", iconCls: "btnexportexcel", handler: function (button, event) { this.onCreateEDIClick('E'); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index a8469099..b4e9c94c 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -5606,6 +5606,9 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { if (me.CheckBillYT.checked) IsBill = 1; me.onSendYT(FILETYPE.FILETYPE, FILEROLE.FILEROLE, IsBill, CARRIER.CARRIER); + + + saveQuerySetting(me.formname + 'YT', me.formYTShow, false, true); } @@ -9783,6 +9786,70 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { } } + if (BSNOStr == '') { + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.MeiYouYaoCaoZuoDeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + } else { + if (filetype == 'E' && carrier == 'ZIM') { + Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu); + Ext.Ajax.request({ + waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu, + url: '/MvcShipping/MsOpSeae/IsCreateYTList', + params: { + bsnos: BSNOStr, + mblno: Mblno, + filetype: filetype, + filerole: filerole, + isbill: isbill, + carrier: carrier + }, + callback: function (options, success, response) { + if (success) { + var result = Ext.JSON.decode(response.responseText); + if (!result.Success) { + Ext.MessageBox.confirm('提示', result.Message, function (btn) { + if (btn == 'yes') { + _this.onSendYTfn(filetype, filerole, isbill, carrier); + } + } + ); + } else { + _this.onSendYTfn(filetype, filerole, isbill, carrier); + } + + } else { + Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); + } + }, + scope: this + }); + } else { + _this.onSendYTfn(filetype, filerole, isbill, carrier); + } + } + }, + + onSendYTfn: function (filetype, filerole, isbill, carrier) { + var GidStr = ''; + var selections = this.GridCheckBoxModel.selected.items; + if (selections.length == 0) { + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要生成的业务 + return; + } + var BSNOStr = ''; + var j = 0; + var Mblno = ''; + for (var i = 0; i < selections.length; i++) { + var rec = selections[i]; + Mblno = rec.data.MBLNO; + var BSNO = rec.data.BSNO; + if (BSNOStr == '') + BSNOStr = BSNO; + else { + BSNOStr = BSNOStr + ',' + BSNO; + } + } + if (BSNOStr == '') { Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.MeiYouYaoCaoZuoDeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); return; @@ -9823,6 +9890,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { }); } }, + onSaveYT: function (filetype, filerole, isbill, carrier) { var GidStr = ''; var selections = this.GridCheckBoxModel.selected.items; @@ -9845,6 +9913,68 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { } } + if (BSNOStr == '') { + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.MeiYouYaoCaoZuoDeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + } else { + if (filetype == 'E' && carrier == 'ZIM') { + Ext.Ajax.request({ + waitMsg: Zi.LAN.Changing, + url: '/MvcShipping/MsOpSeae/IsCreateYTList', + params: { + bsnos: BSNOStr, + mblno: Mblno, + filetype: filetype, + filerole: filerole, + isbill: isbill, + carrier: carrier + }, + callback: function (options, success, response) { + if (success) { + var result = Ext.JSON.decode(response.responseText); + if (!result.Success) { + Ext.MessageBox.confirm('提示', result.Message, function (btn) { + if (btn == 'yes') { + _this.onSaveYTfn(filetype, filerole, isbill, carrier); + } + } + ); + } else { + _this.onSaveYTfn(filetype, filerole, isbill, carrier); + } + } else { + Ext.MessageBox.alert('The Server Response Error, Please Try Again', response.responseText); + } + }, + scope: this + }); + } else { + _this.onSaveYTfn(filetype, filerole, isbill, carrier); + } + } + }, + onSaveYTfn: function (filetype, filerole, isbill, carrier) { + var GidStr = ''; + var selections = this.GridCheckBoxModel.selected.items; + if (selections.length == 0) { + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要生成的业务 + return; + } + + var BSNOStr = ''; + var j = 0; + var Mblno = ''; + for (var i = 0; i < selections.length; i++) { + var rec = selections[i]; + Mblno = rec.data.MBLNO; + var BSNO = rec.data.BSNO; + if (BSNOStr == '') + BSNOStr = BSNO; + else { + BSNOStr = BSNOStr + ',' + BSNO; + } + } + if (BSNOStr == '') { Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.MeiYouYaoCaoZuoDeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); return; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js index a6f30b24..bff4075b 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js @@ -913,7 +913,8 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { } } } - }, { + }, + this.comboxCustCode, { fieldLabel: '从开船日期', format: 'Y-m-d', xtype: 'datefield', @@ -939,7 +940,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { } } } - }, this.comboxOpType, this.comboxDOC, this.comboxISSUETYPE, this.comboxFSTATUS, this.comboxBLSTATUS,{ + },{ text: "查询", width: 60, xtype: 'button', @@ -948,98 +949,10 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { this.onRefreshClick(button, event); }, scope: this - }] - }, { - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [ - this.comboxOpLb, - this.comboxCustCode - //, this.comboxF_CustCode - //, this.comboxBLSTATUS - , { - fieldLabel: '船名', - name: 'VESSEL', - labelWidth: 40, - flex: 1.4, - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }, { - fieldLabel: '航次', - name: 'VOYNO', - labelWidth: 40, - flex: 0.6, - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }, { - fieldLabel: '从签入日期', - format: 'Y-m-d', - xtype: 'datefield', - name: 'QR_BGN', - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }, { - fieldLabel: '到签入日期', - format: 'Y-m-d', - xtype: 'datefield', - name: 'QR_END', - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } }, { - fieldLabel: '从签出日期', - format: 'Y-m-d', - xtype: 'datefield', - name: 'QC_BGN', - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }, { - fieldLabel: '到签出日期', - format: 'Y-m-d', - xtype: 'datefield', - name: 'QC_END', - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }, { - text: "高级", - width: 60, - xtype: 'button', + text: "高级", + width: 60, + xtype: 'button', iconCls: "btnmore", handler: function (button, event) { var sql = this.getCondition(); @@ -1053,17 +966,109 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { return; }, scope: this - }//, { xtype: 'hiddenfield', flex: 1 } - ] + }, { + text: "更多", + width: 60, + xtype: 'button', + handler: function (button, event) { + if (this.panelTop.height == 75) this.panelTop.setHeight(125); + else this.panelTop.setHeight(75); + }, + scope: this + }] }, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', items: [ - //, this.comboxFeeNameRef - //, { xtype: 'hiddenfield', flex: 2 } + this.comboxOpType, this.comboxDOC, this.comboxISSUETYPE, this.comboxFSTATUS, this.comboxBLSTATUS,this.comboxOpLb ] - } + }, , { + xtype: 'container', + layout: 'hbox', + defaultType: 'textfield', + items: [ + { + fieldLabel: '船名', + name: 'VESSEL', + labelWidth: 40, + flex: 1.4, + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { + fieldLabel: '航次', + name: 'VOYNO', + labelWidth: 40, + flex: 0.6, + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { + fieldLabel: '从签入日期', + format: 'Y-m-d', + xtype: 'datefield', + name: 'QR_BGN', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { + fieldLabel: '到签入日期', + format: 'Y-m-d', + xtype: 'datefield', + name: 'QR_END', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { + fieldLabel: '从签出日期', + format: 'Y-m-d', + xtype: 'datefield', + name: 'QC_BGN', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { + fieldLabel: '到签出日期', + format: 'Y-m-d', + xtype: 'datefield', + name: 'QC_END', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + } + ] + } ]//end items(fieldset 1) }//end fieldset 1 ]//end root items @@ -1459,11 +1464,11 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { }); this.panelBlInfoList = new Ext.Panel({ - title: '欠费信息', // + //title: '欠费信息', // layout: "border", region: 'center', //width: 600, - height: 180, + height: 160, split: true, //margin: '5 10', frame: true, @@ -1472,7 +1477,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { this.formInfo = Ext.widget('form', { region: 'north', - height:120, + height:100, frame: true, split: true, bodyPadding: 2, @@ -1656,7 +1661,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { this.panelTop = new Ext.Panel({ layout: "border", region: "north", - height: 100, + height: 75, items: [this.formSearch, this.panelBtn] }); @@ -1664,8 +1669,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { //title: '', layout: "border", region: 'center', - height: 800, - margin: '1 2', + margin: '1 2', split: true, items: [this.gridList, this.panelDoc] }); @@ -1694,7 +1698,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { //title: '销售单关联明细', layout: "border", region: 'south', - height: 360, + height: 260, margin: '1 1', split: true, items: [this.panelSalesList, this.panelSalesAddList @@ -1733,7 +1737,16 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { //window.open(openUrl, openType, openSet); }, this); - + var now = new Date(); //当前日期 + var mydateendstr = Ext.util.Format.date(now, 'Y-m-d'); + now.setTime(now.getTime() - 30 * 24 * 60 * 60 * 1000); + var nowDay = now.getDate(); //当前日 + var nowMonth = now.getMonth(); //当前月 + var nowYear = now.getFullYear(); //当前年 + var mydatestr = new Date(nowYear, nowMonth, nowDay); + + this.formSearch.getForm().findField('ETD_BGN').setValue(mydatestr); + this.formSearch.getForm().findField('ETD_END').setValue(mydateendstr); this.LoadInitData();