dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

20240726

Browse Source
ShenZhenCHJY
dengyu 5 months ago
parent fcc1176d6a
commit b19e4a338c
2 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File

85
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
Unescape Escape View File

@ -522,7 +522,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
name: 'LANE', name: 'LANE',
valueField: 'LANE', valueField: 'LANE',
displayField: 'LANE', displayField: 'LANE',
flex: 1.34, flex: 1,
listeners: { listeners: {
scope: this, scope: this,
'select': function (combo, records, eOpts) { 'select': function (combo, records, eOpts) {
@ -1221,7 +1221,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
fieldLabel: '运输条款', fieldLabel: '运输条款',
store: this.storeSERVICE, store: this.storeSERVICE,
forceSelection: true, forceSelection: true,
flex: 1, flex: 1.34,
name: 'SERVICE', name: 'SERVICE',
valueField: 'SERVICE', valueField: 'SERVICE',
displayField: 'SERVICE' displayField: 'SERVICE'
@ -2107,7 +2107,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
region: 'north', region: 'north',
frame: true, frame: true,
bodyPadding: 5, bodyPadding: 5,
height: 270, height: 295,
layout: 'anchor', layout: 'anchor',
trackResetOnLoad: true, trackResetOnLoad: true,
fieldDefaults: { fieldDefaults: {
@ -2141,29 +2141,22 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.comboxCARRIER, this.comboxCARRIER,
this.comboxVoyVeg, this.comboxVoyVeg,
{
fieldLabel: '驳船ETD',
format: 'Y-m-d',
xtype: 'datefield',
name: 'ETD2'
}
,
this.comboxPORTLOAD, this.comboxPORTLOAD,
{ {
fieldLabel: '装港代码', fieldLabel: '装港代码',
flex:0.66, flex:0.66,
readOnly:true, readOnly:true,
name: 'PORTLOADID' name: 'PORTLOADID'
},
{
fieldLabel: Zi.LAN.ORDERETD,
format: 'Y-m-d',
xtype: 'datefield',
name: 'ETD',
listeners: {
scope: this,
change: function (field, newValue, oldValue, eOpts) {
if (newValue) {
var ACCDATEvalue = newValue.toISOString().substring(0, 7).replace('T', ' ');
var accdate = Ext.getCmp("ACCDATE");
accdate.setValue(ACCDATEvalue);
}
}
}
}, },
// //
] ]
@ -2181,6 +2174,22 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
flex: 1, flex: 1,
name: 'VOYNO' name: 'VOYNO'
}, },
{
fieldLabel: Zi.LAN.ORDERETD,
format: 'Y-m-d',
xtype: 'datefield',
name: 'ETD',
listeners: {
scope: this,
change: function (field, newValue, oldValue, eOpts) {
if (newValue) {
var ACCDATEvalue = newValue.toISOString().substring(0, 7).replace('T', ' ');
var accdate = Ext.getCmp("ACCDATE");
accdate.setValue(ACCDATEvalue);
}
}
}
},
this.comboxPORTDISCHARGE, this.comboxPORTDISCHARGE,
{ {
fieldLabel: '卸港代码', fieldLabel: '卸港代码',
@ -2189,14 +2198,6 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
name: 'PORTDISCHARGEID' name: 'PORTDISCHARGEID'
}, },
{
fieldLabel: '驳船ETD',
format: 'Y-m-d',
xtype: 'datefield',
name: 'ETD2'
},
] ]
}, { }, {
xtype: 'container', xtype: 'container',
@ -2205,13 +2206,8 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
items: [ items: [
this.comboxBSSOURCE this.comboxBSSOURCE
, { , this.comboxLANE,
fieldLabel: Zi.LAN.ORDER_CUSTCODE, this.comboxTRANSPORT,
labelWidth: 70,
// flex: 0.8,
name: "ORDER_CUSTCODE"
},
this.comboxDESTINATION, this.comboxDESTINATION,
{ {
fieldLabel: '目的代码', fieldLabel: '目的代码',
@ -2220,7 +2216,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
name: 'DESTINATIONID' name: 'DESTINATIONID'
}, },
this.comboxTRANSPORT,
// , this.comboxPKGTYPE, // , this.comboxPKGTYPE,
// { // {
@ -2259,17 +2255,22 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
// flex: 0.8, // flex: 0.8,
name: "ORDER_CUSTNAME", name: "ORDER_CUSTNAME",
flex:2, flex:2,
}, {
fieldLabel: Zi.LAN.ORDER_CUSTCODE,
labelWidth: 70,
flex: 1,
name: "ORDER_CUSTCODE"
}, },
this.comboxSERVICE,
//{ xtype: 'hiddenfield' }, //{ xtype: 'hiddenfield' },
this.comboxLANE,
{ {
fieldLabel: '目的地免箱天数', fieldLabel: '目的地免箱天数',
flex: 0.66, flex: 0.66,
labelWidth: 100, labelWidth: 100,
// flex: 0.8, // flex: 0.8,
name: 'DESTFBP' name: 'DESTFBP'
}, }
this.comboxSERVICE
//{ xtype: 'hiddenfield' }, //{ xtype: 'hiddenfield' },
//{ xtype: 'hiddenfield' } //{ xtype: 'hiddenfield' }
] ]
@ -2286,7 +2287,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
grow: true, grow: true,
flex: 3, flex: 3,
fieldLabel: '订舱备注', fieldLabel: '订舱备注',
height: 55, height: 70,
name: 'REMARK', name: 'REMARK',
anchor: '100%' anchor: '100%'
}, { }, {
@ -2294,7 +2295,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
grow: true, grow: true,
flex: 2, flex: 2,
fieldLabel: '驳回原因', fieldLabel: '驳回原因',
height: 55, height: 70,
name: 'ORREASON', name: 'ORREASON',
anchor: '100%' anchor: '100%'
}] }]
@ -3180,7 +3181,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
xtype: 'container', xtype: 'container',
defaultType: 'textfield', defaultType: 'textfield',
layout: 'hbox', layout: 'hbox',
height: 295, height: 290,
defaults: { defaults: {
anchor: '96%' anchor: '96%'
}, },

15
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js
Unescape Escape View File

@ -483,6 +483,21 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
dataIndex: 'ORDER_CUSTNAME', dataIndex: 'ORDER_CUSTNAME',
header: Zi.LAN.ORDER_CUSTNAME, header: Zi.LAN.ORDER_CUSTNAME,
width: 80 width: 80
}, {
sortable: true,
dataIndex: 'ISSUETYPE',
header: Zi.LAN.ISSUETYPE,
width: 80
}, {
sortable: true,
dataIndex: 'SHIPPER',
header: 'Shipper (发货人)',
width: 200
}, {
sortable: true,
dataIndex: 'SERVICE',
header: '运输条款',
width: 140
} }

Write Preview
Loading…
Cancel
Save