diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index 6571a917..58f6b3e2 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -2050,7 +2050,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }, scope: this }, '-', { - text: 'VGM', //'打开vgm窗口', + text: 'VGM(支持双报)', //'打开vgm窗口', handler: function (button, event) { _this.onCreateDSVGMClick(button, event); }, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpVgmSend/MsOpVgmSendEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpVgmSend/MsOpVgmSendEdit.js index 5065db39..a0527e4e 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpVgmSend/MsOpVgmSendEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpVgmSend/MsOpVgmSendEdit.js @@ -301,13 +301,68 @@ Ext.extend(Shipping.MsOpVgmSendEdit, Ext.Panel, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', - items: [ { - fieldLabel: 'VGM申报', - readOnly: true, - hidden: false, - name: 'VGMSTATUS' - } - , { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' } + items: [ + { + fieldLabel: '发送状态', + id: "VGMSTATUS", + flex:0.4, + //hidden: true, + html: "", + } + , + { + xtype: 'checkboxgroup', + flex:2, + fieldLabel: '发送方', //'文件功能', + items: [{ + xtype: "checkbox", //checkbox控件 + name: "ISCARRIER", + boxLabel: "", + fieldLabel: "船公司", + labelWidth:50, + inputValue: true, //选中的值 + uncheckedValue: false, //未选中的值 + checked: true //绘制时的选中状态 + }, { + xtype: "checkbox", //checkbox控件 + name: "ISYGT", + labelWidth: 50, + boxLabel: "", + fieldLabel: "云港通", + inputValue: true, //选中的值 + uncheckedValue: false, //未选中的值 + checked: true //绘制时的选中状态 + } + + ] + } + , {xtype:'hiddenfield',flex:0.6}, + { + xtype: 'radiogroup', + flex: 2, + fieldLabel: '操作类型', //'文件功能', + id: 'vGMFILEROLE', + defaults: { flex: 1 }, + layout: 'hbox', + items: [{ + boxLabel: "新增", //'原始', + name: 'FILEROLE', + inputValue: '9', + checked: true + }, { + boxLabel: "修改", //'更新', + name: 'FILEROLE', + inputValue: '5' + } + + //, { + //boxLabel: "删除", //'删除', + //name: 'FILEROLE', + //inputValue: '4' + //} + ] + } + ] }, { @@ -320,13 +375,19 @@ Ext.extend(Shipping.MsOpVgmSendEdit, Ext.Panel, { }, { fieldLabel: 'BSNO', name: 'BSNO', flex: 0, hidden: true, margins: '0' - }, { - fieldLabel: 'ISCARRIER', - name: 'ISCARRIER', flex: 0, hidden: true, margins: '0' - }, { - fieldLabel: 'ISYGT', - name: 'ISYGT', flex: 0, hidden: true, margins: '0' - }, { + } + + //, { + // fieldLabel: 'ISCARRIER', + //name: 'ISCARRIER', flex: 0, hidden: true, margins: '0' + //} + + //, { + // fieldLabel: 'ISYGT', + //name: 'ISYGT', flex: 0, hidden: true, margins: '0' + //} + + , { fieldLabel: 'SENDTYPE', name: 'SENDTYPE', flex: 0, hidden: true, margins: '0' }, { @@ -417,6 +478,10 @@ Ext.extend(Shipping.MsOpVgmSendEdit, Ext.Panel, { layout: 'hbox', defaultType: 'textfield', items: [ + { + name: "LINKURL", + hidden: true + }, { fieldLabel: '链接地址', id: "LINKURL", @@ -447,13 +512,51 @@ Ext.extend(Shipping.MsOpVgmSendEdit, Ext.Panel, { this.ShowHistory(this.bsno); }, scope: this - }, '-', { - text: "发送/获取链接", - handler: function (button, event) { - this.winVGMShow.show(); - }, - scope: this - }] + } + + , { + xtype: 'button', + width: 90, + text: "复制链接", + id:"LINKURLbtn",hidden:true, + iconCls: "btnrefresh", + handler: function (button, event) { + var url = _this.formEdit.getForm().findField('LINKURL').getValue(); + copyToClipboard(url); + }, + scope: this + } + , '-', + + { + text: "发送VGM", //"生成并发送VGM报文", + minWidth: 70, + handler: function () { + var cgFILEROLE = Ext.getCmp('vGMFILEROLE'); + var FILEROLE = cgFILEROLE.getValue(); + var ISCARRIER = _this.formEdit.getForm().findField('ISCARRIER').getValue(); + var ISYGT = _this.formEdit.getForm().findField('ISYGT').getValue(); + + _this.onSendVGM(ISCARRIER, ISYGT, FILEROLE.FILEROLE); + } + }, { + text: "获取链接", + handler: function (button, event) { + _this.GetVgmLink(); + }, + scope: this + } + + //, { + //text: "发送/获取链接", + //handler: function (button, event) { + // this.winVGMShow.show(); + //} + //, + //scope: this + //} + + ] }); //end 按钮Toolbar @@ -507,16 +610,21 @@ Ext.extend(Shipping.MsOpVgmSendEdit, Ext.Panel, { xtype: "checkbox", //checkbox控件 name: "ISYGT", boxLabel: "", - fieldLabel: "运港通", + fieldLabel: "云港通", inputValue: true, //选中的值 uncheckedValue: false, //未选中的值 checked: true //绘制时的选中状态 - }] - },{ + } + + ] + }, + {xtype:'hiddenfield',flex:0.2} + , { xtype: 'container', layout: 'hbox', defaultType: 'textfield', - items: [{ + items: [ + { xtype: 'radiogroup', fieldLabel:'操作类型', //'文件功能', id: 'vGMFILEROLE', @@ -531,12 +639,17 @@ Ext.extend(Shipping.MsOpVgmSendEdit, Ext.Panel, { boxLabel: "修改", //'更新', name: 'FILEROLE', inputValue: '5' - }, { - boxLabel: "删除", //'删除', - name: 'FILEROLE', - inputValue: '4' - }] - }] + } + + //, { + //boxLabel: "删除", //'删除', + //name: 'FILEROLE', + //inputValue: '4' + //} + + ] + } + ] } ]//end items(fieldset 1) }]//end root items @@ -671,6 +784,15 @@ Ext.extend(Shipping.MsOpVgmSendEdit, Ext.Panel, { Ext.getCmp("LINKURL").show(); Ext.getCmp("LINKURL").getEl().dom.innerHTML = url; + this.formEdit.getForm().findField('LINKURL').setValue(data.LINKURL); + Ext.getCmp("LINKURLbtn").show(); + } + if (data.VGMSTATUS) { + + var url2 = `` + data.VGMSTATUS + ``; + + Ext.getCmp("VGMSTATUS").show(); + Ext.getCmp("VGMSTATUS").getEl().dom.innerHTML = url2; }