From b24d15a309a1a8941df0c0b15c90eb67a2f4a01b Mon Sep 17 00:00:00 2001 From: ddlucky Date: Thu, 29 Feb 2024 10:42:24 +0800 Subject: [PATCH] 1 --- DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs | 2 + .../MvcShipping/Viewsjs/MainForm/MainForm.js | 11 ++ .../Viewsjs/MsOpSeae/MsOpSeaeEdit.js | 15 +- .../Viewsjs/MsOpSeae/MsOpSeaeIndex.js | 177 +++++++++++++++++- DSWeb/Default.aspx | 1 + 5 files changed, 192 insertions(+), 14 deletions(-) diff --git a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs index 44532ebe..7bc70b61 100644 --- a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs @@ -7547,6 +7547,8 @@ namespace DSWeb.Areas.CommMng.DAL SetFieldValue(ref mailtopic, "CNTRTOTAL", OpseaeHead.CNTRTOTAL); //toMail = "ddlucky@sina.com"; + var PARAMVALUE = MsSysParamSetDAL.GetData("PARAMNAME='DONGSHENGMAILADDR'"); + if (PARAMVALUE.PARAMVALUE != "") toMail = PARAMVALUE.PARAMVALUE; SendEmail se = new SendEmail(toMail, fromemail, "", "", mailtopic, BaseHtmlStr, true); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js b/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js index 8a5e0f97..c79dff85 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MainForm/MainForm.js @@ -1035,6 +1035,13 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { }); this.PubStore_OpStatus.load(); + + + this.PubStore_DJYService = Ext.create('DsExt.ux.RefTableStore', { + model: 'DsExtEnumModel', + proxy: { url: '/CommMng/PubSys/GetEnumValueList' } + }); + this.PubStore_DJYService.load({ params: { enumTypeId: 81010 } }); //window.storeCustomerAll = Ext.create('DsExt.ux.RefTableStore', { // model: 'DsShipping.ux.CustomRefModel', @@ -1396,6 +1403,10 @@ Ext.extend(Shipping.MainForm, Ext.Panel, { result = this.PubStore_OpStatus; } + if (STORENAME == "DJYService") { + result = this.PubStore_DJYService; + } + return result; //if ((result != "") && (result.getCount() == 0) ) { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index 565e5af8..a50bf01e 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -5027,7 +5027,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { _this.ShengChengBaoDan(); } }, '-', { - text: '向大简云发送订舱邮件', + text: '向大简云发送订舱', handler: function (menu, event) { @@ -11808,12 +11808,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { return; } else { - Ext.Msg.show({ - title: '提示', - msg: resultData.Message, - icon: Ext.MessageBox.OK, - buttons: Ext.Msg.OK - }); + //Ext.Msg.show({ + // title: '提示', + // msg: resultData.Message, + // icon: Ext.MessageBox.OK, + // buttons: Ext.Msg.OK + //}); + MsgTip("提示", resultData.Message); me.GetLogic(); me.winDjyOrderShow.close(); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index 6daa7c26..27f1e96d 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -98,6 +98,13 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { } } }); + + + this.storeDJYService = Ext.create('DsExt.ux.RefTableStore', { + model: 'DsExtEnumModel', + proxy: { url: '/CommMng/PubSys/GetEnumValueList' } + }); + this.storeDJYService.loadData(mainWin.GetPubStore("DJYService").data.items); //#endregion //#region List列表显示信息 @@ -3117,12 +3124,21 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { handler: function (menu, event) { _this.onPiLiangZhengPiaoTiJiaoClick(menu, event, 0); } - }, '-', { - text: '查看罐箱业务成本核算', + }, '-' + //, { + // text: '查看罐箱业务成本核算', + // handler: function (menu, event) { + // _this.onCheckCtnApply(); + // } + //} + , { + text: '向大简云发送订舱', handler: function (menu, event) { - _this.onCheckCtnApply(); + _this.onSendDjyOrderClick(); } - }], + } + + ], scope: this }, '-', { iconCls: "btnotherinf", @@ -3614,8 +3630,6 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { } - - this.storeList.on('beforeload', function (store) { Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext }); @@ -6996,6 +7010,152 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { }); //#endregion + //#region 向大简云发订舱邮件 + this.formDjyOrder = Ext.widget('form', { + frame: true, + region: 'center', + id: "formDjyOrder", + bodyPadding: 2, + layout: 'hbox', + fieldDefaults: { + margins: '2 2 2 2', + labelAlign: 'right', + flex: 1, + labelWidth: 90, + msgTarget: 'qtip' + }, + items: [] + }); + + this.winDjyOrderShow = Ext.create('Ext.window.Window', { + title: Zi.LAN.winDjyOrderShow, //"生成INTTR", + width: 600, + id: "winDjyOrderShow", + //height :600, + //plain : true, + iconCls: "addicon", + resizable: false, + // 是否可以拖动 + // draggable:false, + collapsible: true, // 允许缩放条 + closeAction: 'close', + closable: true, + modal: 'true', + buttonAlign: "center", + bodyStyle: "padding:0 0 0 0", + items: [ + this.formDjyOrder + ], + buttons: [{ + text: Zi.LAN.QueDingFaSong, //"确定发送", + minWidth: 70, + handler: function () { + //var BSNO = me.editRecord.get('BSNO'); + + var selections = me.gridList.getSelectionModel().getSelection(); + 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 BSNOs = ""; + for (var i = 0; i < selections.length; i++) { + + var recored = selections[i]; + + if (BSNOs != "") BSNOs += ","; + BSNOs += recored.data.BSNO; + } + + var _form = Ext.getCmp("formDjyOrder"); + var data = _form.getForm().getValues(false, false, false); + var str = Ext.JSON.encode(data); + //Ext.Msg.show({ title: '提示', msg: str, icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK }); + Ext.Ajax.request({ + url: '/CommMng/BasicDataRef/SendOpseaeListEmailToDjy', + cors: true, + params: { + BSNOs: BSNOs, + str: str + }, + + //method: 'post', + success: function (response) { + var resultData = eval('(' + response.responseText + ')');//JSON字符串=>JSON对象 + if (!resultData.Success) { + //失败 + Ext.Msg.show({ + title: '提示', + msg: resultData.Message, + icon: Ext.MessageBox.ERROR, + buttons: Ext.Msg.OK + }); + return; + } + else { + //Ext.Msg.show({ + // title: '提示', + // msg: resultData.Message, + // icon: Ext.MessageBox.OK, + // buttons: Ext.Msg.OK + //}); + + MsgTip("提示", resultData.Message); + + me.winDjyOrderShow.close(); + } + } + }); + } + }, { + text: Zi.LAN.btndelete, //"删除", + minWidth: 70, + handler: function () { + + } + }, { + text: Zi.LAN.GuanBi, //"关闭", + minWidth: 70, + handler: function () { + me.winDjyOrderShow.close(); + } + }] + }); + + + var checkboxitems2 = ""; + checkboxitems2 = "["; + for (i = 0; i < this.storeDJYService.getCount(); i += 1) { + var memberyf = this.storeDJYService.getAt(i); + + if (memberyf.data.EnumValueName != "") { + + var checkboxSingleItem = "{boxLabel:'" + memberyf.data.EnumValueName + "',inputValue:true,name:'" + memberyf.data.EnumValueId + "',id:'" + memberyf.data.EnumValueId + "'"; + checkboxSingleItem += "}"; + + if (checkboxitems2 != "[") { + checkboxitems2 += ","; + } + checkboxitems2 += checkboxSingleItem; + } + }; + checkboxitems2 += "]"; + + _this.DjyServiceCheckboxGroup = new Ext.form.CheckboxGroup({ + id: 'DjyServiceGroup', + xtype: 'checkboxgroup', + fieldLabel: Zi.LAN.myService, //'大简云服务项目', + columns: 8, + items: eval(checkboxitems2) + }); + + this.formDjyOrder.add(_this.DjyServiceCheckboxGroup); + this.formDjyOrder.doLayout(); + this.winDjyOrderShow.doLayout(); + + //#endregion + + //#region 下载窗体 @@ -15698,7 +15858,10 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { ShowPublicINFO(title, model, proxyUrl, condition, columns); } - + + , onSendDjyOrderClick() { + this.winDjyOrderShow.show(); + } }); function fnSearch() { diff --git a/DSWeb/Default.aspx b/DSWeb/Default.aspx index 70213d54..aa7e2871 100644 --- a/DSWeb/Default.aspx +++ b/DSWeb/Default.aspx @@ -56,6 +56,7 @@ +