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

'海运出口销售订舱模块改造_未完成'

Browse Source
临时发布20240103
ddlucky 2 years ago
parent 8bf86ddf14
commit 2c794c3fea
3 changed files with 392 additions and 4742 deletions
Show Stats Download Patch File Download Diff File

4579
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleEdit - 复制.js
View File

File diff suppressed because it is too large Load Diff

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

@ -181,6 +181,23 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
displayField: 'CodeAndName'
});
//确认订舱
//AUDITOPERATOR2
this.storeAUDITOPERATOR2 = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.UserRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetUserRefList' }
});
this.storeAUDITOPERATOR2.load();
this.comboxAUDITOPERATOR2 = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '确认订舱',
store: this.storeAUDITOPERATOR2,
forceSelection: true,
name: 'AUDITOPERATOR2',
valueField: 'UserName',
displayField: 'CodeAndName'
});
//单证
this.storeFRCUSTSERVICECode = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.UserRefModel',
@ -228,7 +245,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
//委托单位
this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '委托单位',
fieldLabel: '下单客户',
store: this.storeCustCode,
queryMode: 'remote',
forceSelection: true,
@ -494,6 +511,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.comboxCargoid = Ext.create('DsExt.ux.RefTableCombox', {
store: this.StoreCargoid,
fieldLabel: '货物标示',
flex:2,
forceSelection: true,
name: 'CARGOID',
valueField: 'ID',
@ -568,10 +586,11 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
});
this.storeCodeGoodsList.load();
this.comboxGOODSNAME = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: 'Description of Goods （包装种类与货名）',
//fieldLabel: 'Description of Goods （包装种类与货名）',
fieldLabel: '品名类型',
store: this.storeCodeGoodsList,
flex: 1.5,
labelWidth: 250,
flex: 2,
//labelWidth: 250,
// forceSelection: true,
name: 'GOODSNAME',
valueField: 'GOODNAME',
@ -590,7 +609,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.comboxStlName = Ext.create('DsExt.ux.RefTableCombox', {
store: this.StoreStlName,
fieldLabel: '结算方式',
fieldLabel: 'M付款方式',
forceSelection: true,
name: 'STLNAME',
valueField: 'STLNAME',
@ -598,7 +617,14 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
});
this.comboxStlName2 = Ext.create('DsExt.ux.RefTableCombox', {
store: this.StoreStlName,
fieldLabel: 'H付款方式',
forceSelection: true,
name: 'STLNAME',
valueField: 'STLNAME',
displayField: 'STLNAME'
});
//件数包装
@ -902,6 +928,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
fieldLabel: '运输条款',
store: this.storeSERVICE,
forceSelection: true,
flex:2,
name: 'SERVICE',
valueField: 'SERVICE',
displayField: 'SERVICE'
@ -939,7 +966,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
proxy: { url: '/CommMng/BasicDataRef/GetSourceDetail2' }
});
this.comboxBSSOURCE = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '业务来源', //'业务来源',
fieldLabel: '合约类型', //'业务来源',
store: this.storeSource,
// forceSelection: true,
name: 'BSSOURCE',
@ -964,7 +991,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
});
this.storeSourceDetail.load();
this.comboxBSSOURCEDETAIL = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '贸易条款', //'来源明细',
fieldLabel: '交易类型', //'来源明细',贸易条款
store: this.storeSourceDetail,
// forceSelection: true,
name: 'BSSOURCEDETAIL',
@ -1012,9 +1039,6 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
items: [{
fieldLabel: '业务编号',
name: 'BSNO', hidden: true
}, {
fieldLabel: 'INPUTBY',
name: 'INPUTBY', hidden: true
}, {
fieldLabel: 'ORSTATUS',
name: 'ORSTATUS', hidden: true
@ -1033,94 +1057,124 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
disabled: true,
name: 'ORDNO'
}, {
fieldLabel: '订舱状态',
readOnly: true,
name: 'ORSTATUSREF'
}, {
fieldLabel: '主提单号',
name: 'MBLNO'
}, this.comboxBLTYPE, this.comboxCargoid, this.comboxBLFRT]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '委托编号',
readOnly: true,
disabled: true,
name: 'CUSTNO'
}, this.comboxSALE, this.comboxOP, this.comboxCUSTSERVICE, this.comboxDOC, this.comboxFRCUSTSERVICE]
}, this.myCheckboxService, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [this.comboxCustCode, this.comboxInfoClientContact, {
fieldLabel: '电话',
name: 'OPERATORTEL'
}, {
fieldLabel: '邮箱',
name: 'OPERATOREMAIL'
}, {
fieldLabel: '结算方式',
fieldLabel: '订舱状态',
readOnly: true,
disabled: true,
name: 'STLNAME'
}, {
fieldLabel: '结算日期',
disabled: true,
name: 'STLDATE'
}]
name: 'ORSTATUSREF'
},
//{
//fieldLabel: '主提单号',
//name: 'MBLNO'
//},
this.comboxBLTYPE
, this.comboxBSSOURCEDETAIL
, this.comboxSaleCompany
,this.comboxAUDITOPERATOR
//, this.comboxBLFRT
]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [this.comboxCARRIER, this.comboxInfoClientContactCARRIER, {
fieldLabel: '电话',
name: 'CARRIERTEL'
}, {
fieldLabel: '邮箱',
name: 'CARRIEREMAIL'
}, this.comboxAUDITOPERATOR, {
fieldLabel: '审核日期',
readOnly: true,
name: 'AUDITDATE'
}]
}, {
items: [this.comboxSALE, this.comboxDept, this.comboxOP, this.comboxCUSTSERVICE, this.comboxDOC
, {
fieldLabel: '录入人',
readOnly: true,
name: 'INPUTBY'
}, this.comboxAUDITOPERATOR2
//, this.comboxFRCUSTSERVICE
]
}, this.myCheckboxService, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [this.comboxFORWARDER, this.comboxInfoClientContactFORWARDER, {
items: [this.comboxCustCode,
{
fieldLabel: '客户单号',
name: 'SERVICECONTRACTNO'
},
this.comboxInfoClientContact,
{
fieldLabel: '电话',
name: 'FORWARDERTEL'
}, {
fieldLabel: '发票号',
name: 'INVNO'
}, {
fieldLabel: '参考号',
name: 'SERVICECONTRACTNO'
name: 'OPERATORTEL'
}, {
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [{
fieldLabel: '合约号',
name: 'CONTRACTNO'
}, {
xtype: 'button',
iconCls: "btnedit",
handler: function (button, event) {
this.GetContractFee();
},
scope: this
}]
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [this.comboxBSSOURCE, this.comboxBSSOURCEDETAIL, this.comboxDept, this.comboxSaleCompany, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }]
}
fieldLabel: '邮箱',
name: 'OPERATOREMAIL',
flex:3
}
// ,
// {
// fieldLabel: '结算方式',
// readOnly: true,
// disabled: true,
// name: 'STLNAME'
//}, {
// fieldLabel: '结算日期',
// disabled: true,
// name: 'STLDATE'
// }
]
},
// {
// xtype: 'container',
// layout: 'hbox',
// defaultType: 'textfield',
// items: [this.comboxCARRIER, this.comboxInfoClientContactCARRIER, {
// fieldLabel: '电话',
// name: 'CARRIERTEL'
// }, {
// fieldLabel: '邮箱',
// name: 'CARRIEREMAIL'
// }, this.comboxAUDITOPERATOR, {
// fieldLabel: '审核日期',
// readOnly: true,
// name: 'AUDITDATE'
// }]
//}, {
// xtype: 'container',
// layout: 'hbox',
// defaultType: 'textfield',
// items: [this.comboxFORWARDER, this.comboxInfoClientContactFORWARDER, {
// fieldLabel: '电话',
// name: 'FORWARDERTEL'
// }, {
// fieldLabel: '发票号',
// name: 'INVNO'
// }, {
// fieldLabel: '参考号',
// name: 'SERVICECONTRACTNO'
// }, {
// xtype: 'container',
// layout: 'hbox',
// flex: 1,
// defaultType: 'textfield',
// items: [{
// fieldLabel: '合约号',
// name: 'CONTRACTNO'
// }, {
// xtype: 'button',
// iconCls: "btnedit",
// handler: function (button, event) {
// this.GetContractFee();
// },
// scope: this
// }]
// }]
// },
// {
// xtype: 'container',
// layout: 'hbox',
// defaultType: 'textfield',
// items: [this.comboxBSSOURCE, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }]
// }
]//end items(fieldset 1)
@ -1158,7 +1212,19 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
plugins: [this.gridListCellEditing],
selType: 'cellmodel',
tbar: [{
tbar: [
{
xtype: 'label',
text: '集装箱信息', //'应收费用',
style: 'font-size:14px',
labelColor: '#000',
//style:'background-color: #4b9bf5',
x: '5%',
y: '5%'
},
{
text: '增加明细',
tooltip: '增加明细',
id: "btnadddetail",
@ -1218,7 +1284,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.panelBodyCtn = new Ext.Panel({
title: '集装箱信息',
//title: '集装箱信息',
layout: "border",
height: 130,
//margin: '5 10',
@ -1340,7 +1406,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
store: this.storeVoyVeg,
name: 'VESSEL',
valueField: 'VESSEL',
flex: 2,
flex: 1,
displayField: 'VESSEL',
listeners: {
scope: this,
@ -1398,7 +1464,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.storeCodeLoadport.load();
this.comboxPORTLOAD = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '装货港',
fieldLabel: '起运港',
store: this.storeCodeLoadport,
// queryMode: 'remote',
// minChars: 1,
@ -1467,7 +1533,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
});
this.comboxDESTINATION = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '目的地',
fieldLabel: '目的港',
store: this.storeCodeDisport2,
name: 'DESTINATION',
queryMode: 'remote',
@ -1608,7 +1674,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.storeISSUETYPE.load({ params: { condition: ""} });
this.comboxISSUETYPE = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '签单方式',
fieldLabel: 'M签单方式',
store: this.storeISSUETYPE,
forceSelection: true,
name: 'ISSUETYPE',
@ -1616,6 +1682,20 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
displayField: 'BLTYPE'
});
this.storeISSUETYPE2 = Ext.create('DsExt.ux.RefTableStore', {
model: 'CODE_BLTYPE',
proxy: { url: '/CommMng/BasicDataRef/GetCodeBLTYPEList' }
});
this.storeISSUETYPE2.load({ params: { condition: "" } });
this.comboxISSUETYPE2 = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: 'H签单方式',
store: this.storeISSUETYPE2,
forceSelection: true,
name: 'ISSUETYPE',
valueField: 'BLTYPE',
displayField: 'BLTYPE'
});
this.StoreBLNUM = Ext.create('Ext.data.Store', {
fields: ['NUM']
});
@ -1640,15 +1720,26 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
displayField: 'NUM'
});
this.StoreTIDANLEIXING = Ext.create('Ext.data.Store', {
fields: ['value', 'text']
});
this.StoreTIDANLEIXING.add({ 'value': 'MBL', 'text': 'MBL' });
this.StoreTIDANLEIXING.add({ 'value': 'HBL', 'text': 'HBL' });
this.comboxTIDANLEIXING = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '提单类型',
store: this.StoreTIDANLEIXING,
forceSelection: true,
name: 'TIDANLEIXING',
valueField: 'value',
displayField: 'text'
});
//#region 编辑formEdit 基本信息
this.formEdit = Ext.widget('form', {
region: 'north',
frame: true,
bodyPadding: 5,
height: 180,
height: 240,
layout: 'anchor',
trackResetOnLoad: true,
fieldDefaults: {
@ -1659,12 +1750,14 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
msgTarget: 'qtip'
},
items: [{
xtype: 'fieldset',
items: [
{
xtype: 'container',//fieldset 小框线
defaultType: 'textfield',
layout: 'hbox',
defaults: {
anchor: '96%'
anchor: '100%'
},
items: [{
xtype: 'container',
@ -1675,65 +1768,87 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [{
fieldLabel: '开船日期',
format: 'Y-m-d',
xtype: 'datefield',
name: 'ETD'
}, this.comboxPORTLOAD, this.comboxPORTDISCHARGE, this.comboxDESTINATION]
items: [
this.comboxCARRIER,
this.comboxVoyVeg,
this.comboxPORTLOAD,
this.comboxTRANSPORT,
//
{
fieldLabel: '大船ETD',
format: 'Y-m-d',
xtype: 'datefield',
name: 'ETD'
},
//
]
}, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [ this.comboxPLACEDELIVERY,{
fieldLabel: '总件数',
labelWidth: 70,
name: 'PKGS',
listeners: {
scope: this,
blur: function (field, The, eOpts) {
var str_num = this.formEdit.getForm().findField('PKGS').getValue();
var KINDPKGS = this.formEdit.getForm().findField('KINDPKGS').getValue();
this.formBill.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(str_num).toUpperCase() + ' ' + KINDPKGS + ' ONLY.');
items: [
{
fieldLabel: '合约号',
name: 'CONTRACTNO'
},
{
fieldLabel: '航次',
flex: 1,
name: 'VOYNO'
},
this.comboxDESTINATION,
this.comboxPORTDISCHARGE,
{
fieldLabel: '驳船ETD',
format: 'Y-m-d',
xtype: 'datefield',
name: 'ETD2'
},
}
}
}, this.comboxKINDPKGS, {
labelWidth: 70,
fieldLabel: '总重量',
name: 'KGS'
}, {
labelWidth: 70,
fieldLabel: '总尺码',
name: 'CBM'
}]
]
}, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [this.comboxISSUETYPE, this.comboxPKGTYPE, {
fieldLabel: '免箱天数',
// flex: 0.5,
name: 'FBP'
}, {
fieldLabel: '目的港免箱天数',
labelWidth: 100,
// flex: 0.8,
name: 'DESTFBP'
}, {
fieldLabel: '限重',
// flex: 0.7,
name: 'MAXWEIGHT'
}]
items: [
this.comboxFORWARDER,
this.comboxLANE,
{
fieldLabel: '目的港免箱天数',
labelWidth: 100,
// flex: 0.8,
name: 'DESTFBP'
},
this.comboxSERVICE
// , this.comboxPKGTYPE,
// {
// fieldLabel: '免箱天数',
// // flex: 0.5,
// name: 'FBP'
// }, {
// fieldLabel: '限重',
//// flex: 0.7,
// name: 'MAXWEIGHT'
// }
]
}, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [{
fieldLabel: '预计利润',
name: 'PLANPROFIT'
}, this.comboxAgent, this.comboxLANE, this.comboxTRANSPORT, this.comboxYARD]
items: [
//{
//fieldLabel: '预计利润',
//name: 'PLANPROFIT'
//}
//, this.comboxAgent
//, this.comboxYARD
]
}, {
xtype: 'container',
defaultType: 'textfield',
@ -1741,7 +1856,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
items: [{
xtype: 'textareafield',
grow: true,
flex: 2,
flex: 3,
fieldLabel: '订舱备注',
height: 40,
name: 'REMARK',
@ -1749,6 +1864,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
}, {
xtype: 'textareafield',
grow: true,
flex: 2,
fieldLabel: '驳回原因',
height: 40,
name: 'ORREASON',
@ -1761,12 +1877,132 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
layout: 'anchor',
flex: 1,
defaultType: 'textfield',
items: [this.panelBodyCtn
items: [
this.panelBodyCtn
]
}
]
}]
},
{
xtype: 'container',//fieldset 小框线
defaultType: 'textfield',
layout: 'hbox',
defaults: {
anchor: '100%'
},
items: [
{
xtype: 'container',
layout: 'anchor',
flex: 3,
defaultType: 'textfield',
items: [
{
//一行
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [
this.comboxBSSOURCE,
this.comboxISSUETYPE,
this.comboxStlName
]
}, {
//一行
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [
this.comboxTIDANLEIXING,
this.comboxISSUETYPE2,
this.comboxStlName2
]
}, {
//一行
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [
]
}
]
},
{
xtype: 'container',
layout: 'anchor',
flex: 3,
defaultType: 'textfield',
items: [
{
//一行
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [
this.comboxCargoid,
this.comboxGOODSNAME
]
}
,
{
xtype: 'textareafield',
grow: true,
fieldLabel: '英文品名',
labelSeparator: '',
//labelWidth: 20,
height: 40,
name: 'DESCRIPTION',
anchor: '100%'
}
, {
//一行
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [
{
labelWidth: 70,
xtype: 'numberfield',
fieldLabel: '体积',
name: 'CBM'
},
//this.comboxPLACEDELIVERY,
{
fieldLabel: '总件数',
labelWidth: 70,
xtype: 'numberfield',
name: 'PKGS',
listeners: {
scope: this,
blur: function (field, The, eOpts) {
var str_num = this.formEdit.getForm().findField('PKGS').getValue();
var KINDPKGS = this.formEdit.getForm().findField('KINDPKGS').getValue();
this.formBill.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(str_num).toUpperCase() + ' ' + KINDPKGS + ' ONLY.');
}
}
},
this.comboxKINDPKGS,
{
labelWidth: 70,
xtype: 'numberfield',
fieldLabel: '总重量',
name: 'KGS'
}
]
}
]
}
]
}
]
}); //end this.formEdit
//#endregion
@ -1835,11 +2071,10 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
xtype: 'container',
defaultType: 'textfield',
layout: 'hbox',
items: [this.comboxVoyVeg, {
fieldLabel: '航次',
flex: 1,
name: 'VOYNO'
}]
items: [
//this.comboxVoyVeg,
]
}, {
xtype: 'container',
defaultType: 'textfield',
@ -1874,7 +2109,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
items: [{
fieldLabel: '目的代码',
name: 'DESTINATIONID'
}, this.comboxSERVICE]
}]
}, {
xtype: 'container',
defaultType: 'textfield',
@ -1934,17 +2169,12 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
defaults: {
anchor: '100%'
},
items: [this.comboxGOODSNAME]
}, {
xtype: 'textareafield',
grow: true,
fieldLabel: '&nbsp&nbsp',
labelSeparator: '',
labelWidth: 20,
height: 250,
name: 'DESCRIPTION',
anchor: '100%'
}]
items: [
]
}
]
}, {
xtype: 'container',
layout: 'anchor',

1
DSWeb/DSWeb.csproj
Unescape Escape View File

@ -1617,7 +1617,6 @@
<Content Include="Areas\MvcShipping\Viewsjs\MsFeeTemplate\FeeTemplatePLAdd.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsOpSeae\FeeIndex.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsOpSeae\MsOpSeaeFeeIndex.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsOpSeae\MsOpSeaeSaleEdit - 复制.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsOpSocCtn\CtnEdit.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsOpSocCtn\BsEdit.js" />
<Content Include="Areas\MvcShipping\Viewsjs\MsOpSocCtn\CtnIndex.js" />

Write Preview
Loading…
Cancel
Save