From 4028f618c55ad2d83b4b6a2291ab96691828be38 Mon Sep 17 00:00:00 2001 From: hanxuntao <641739520@qq.com> Date: Wed, 12 Jul 2023 14:16:53 +0800 Subject: [PATCH] 1 --- DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs | 2 +- DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs | 6 +++--- DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js | 2 +- DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js | 2 ++ DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js | 3 ++- DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js | 2 +- DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js | 4 ++-- DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js | 4 +++- DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js | 2 ++ .../Viewsjs/MsRptOpProfitZou/MsRptOpProfitZouIndex.js | 2 +- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs index b8c30e4f..8b6926a6 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs @@ -354,7 +354,7 @@ namespace DSWeb.MvcShipping.Controllers return new ContentResult() { Content = json }; } - public ContentResult GetGainData(string bsno,string USERID, string SHOWNAME, string COMPANYID, string bltype = "", string optype = "") + public ContentResult GetGainData2(string bsno,string USERID, string SHOWNAME, string COMPANYID, string bltype = "", string optype = "") { var dataList = new List(); diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs index 5aa8d530..9e9d6cdb 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs @@ -3726,7 +3726,7 @@ namespace DSWeb.MvcShipping.Controllers error = MsOpSeaeEdiPortDAL.IsCreateINTTR(headList, filetype, filerole, isbill, "YML", 0, "", ""); } - else if (type == "EVERGREENEDI") { + else if (type == "EVERGREEN") { error = MsOpSeaeEdiPortDAL.IsCreateEVERGREEN(headList, filetype, filerole, isbill); } @@ -3856,7 +3856,7 @@ namespace DSWeb.MvcShipping.Controllers error = MsOpSeaeEdiPortDAL.IsCreateINTTR(headList, filetype, filerole, isbill, "YML", 0, "", ""); } - else if (type == "EVERGREENEDI") + else if (type == "EVERGREEN") { error = MsOpSeaeEdiPortDAL.IsCreateEVERGREEN(headList, filetype, filerole, isbill); @@ -3879,7 +3879,7 @@ namespace DSWeb.MvcShipping.Controllers filename = MsOpSeaeEdiPortDAL.CreateEdiYMSI(headEdiList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, filetype); } - else if (type == "EVERGREENEDI") + else if (type == "EVERGREEN") { if (filetype == "B") filename = MsOpSeaeEdiPortDAL.CreateEdiEVERGREEN(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, filetype); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js index e642e031..8a9e6da5 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js @@ -7638,7 +7638,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { return; } - Ext.MessageBox.confirm(Zi.LAN.FEE.TiShi, '确定要删除选中的(' + selectedRecords.length+'条)费用吗？', function (btn) { + Ext.MessageBox.confirm(Zi.LAN.FEE.TiShi, Zi.LAN.QueshiYaoShanChu1 + selectedRecords.length + Zi.LAN.QueshiYaoShanChu2 , function (btn) { if (btn == 'yes') { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js index 60029291..56af5fa7 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js @@ -286,6 +286,8 @@ Zi.LAN.ZHENGPIAOTIJIAO = "整票提交"; Zi.LAN.SHENHETONGGUO = "审核通过"; Zi.LAN.ZHENGPIAOBOHUI = "整票驳回"; Zi.LAN.DELETECHENGGONG = '删除成功！'; +Zi.LAN.QueshiYaoShanChu1 = '确定要删除选中的(！'; +Zi.LAN.QueshiYaoShanChu2 = '条)费用吗？'; //#endregion //Zi.LAN.FEE. = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js index d9648cf3..34a6408e 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js @@ -291,7 +291,8 @@ Zi.LAN.SHENHETONGGUO = "审核通过"; Zi.LAN.ZHENGPIAOBOHUI = "整票驳回"; Zi.LAN.YES = "是"; Zi.LAN.DELETECHENGGONG = '删除成功！'; - +Zi.LAN.QueshiYaoShanChu1 = '确定要删除选中的(！'; +Zi.LAN.QueshiYaoShanChu2 = '条)费用吗？'; //#endregion //Zi.LAN.FEE. = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index c003d59e..24f61f29 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -4969,7 +4969,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { id: 'EDI-EVERGREENEDI', hidden: true, handler: function (menu, event) { - _this.onCreateEDIClick(menu, event, 'EVERGREENEDI'); + _this.onCreateEDIClick(menu, event, 'EVERGREEN'); } }, { text: Zi.LAN.NBPORTEDI, //"宁波电子口岸", diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index 86704d4c..c1b9ee76 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -2546,7 +2546,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { id: 'EDI-EVERGREENEDI', hidden: true, handler: function (menu, event) { - _this.onCreateEDIClick(menu, event, 'EVERGREENEDI'); + _this.onCreateEDIClick(menu, event, 'EVERGREEN'); } }, { text: Zi.LAN.NBPORTEDI, //"宁波电子口岸", @@ -8978,7 +8978,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { - Ext.MessageBox.confirm(Zi.LAN.TiShi, "确实要删除选中的【" + icount.toString() + "】票业务吗？", function (btn) { + Ext.MessageBox.confirm(Zi.LAN.TiShi, Zi.LAN.QueshiYaoShanChu1 + icount.toString() + Zi.LAN.QueshiYaoShanChu2, function (btn) { if (btn == 'yes') { var jsonbodyAddDatas = ConvertRecordsToJsonAll(bodyAddDatas); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js index 7d7531c9..264bdfea 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js @@ -794,4 +794,6 @@ Zi.LAN.YINRUTJZHONGYUANBC = "引入天津中远BC"; Zi.LAN.YINRUEVERGREENBC = "引入长荣BC"; Zi.LAN.YINRUMSKBC = "引入马士基BC"; Zi.LAN.LOCK = "锁定"; -Zi.LAN.UNLOCK = "未锁定"; \ No newline at end of file +Zi.LAN.UNLOCK = "未锁定"; +Zi.LAN.QueshiYaoShanChu1 = "确实要删除选中的【"; +Zi.LAN.QueshiYaoShanChu2 = "】票业务吗？"; \ No newline at end of file diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js index cb46509c..473babac 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js @@ -823,6 +823,8 @@ Zi.LAN.YINRUEVERGREENBC = "引入长荣BC"; Zi.LAN.YINRUMSKBC = "引入马士基BC"; Zi.LAN.LOCK = "锁定"; Zi.LAN.UNLOCK = "未锁定"; +Zi.LAN.QueshiYaoShanChu1 = "确实要删除选中的【"; +Zi.LAN.QueshiYaoShanChu2 = "】票业务吗？"; //Zi.LAN. = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitZou/MsRptOpProfitZouIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitZou/MsRptOpProfitZouIndex.js index 643dd011..9a292aa5 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitZou/MsRptOpProfitZouIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitZou/MsRptOpProfitZouIndex.js @@ -746,7 +746,7 @@ Ext.extend(Shipping.MsRptOpProfitZouIndex, Ext.Panel, { var OBJTYPE = rdOBJTYPE.getValue(); var form = this.formSearch.getForm(); - if (OBJTYPE.OBJTYPE == Zi.LAN.OPDATE) { + if (OBJTYPE.OBJTYPE =='业务日期') { var expDate_Min = form.findField('PS_EXPDATEBGN').getRawValue(); var expDate_Max = form.findField('PS_EXPDATEEND').getRawValue(); if (expDate_Min == '' || expDate_Min == null || expDate_Min == undefined) {