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

1

Browse Source
YingHang
hanxuntao 9 months ago
parent b58e5cad55
commit d0c4cc2eda
2 changed files with 62 additions and 53 deletions
Show Stats Download Patch File Download Diff File

102
DSWeb/Areas/MvcShipping/Viewsjs/BookingConfirm/BookingConfirmEdit.js
Unescape Escape View File

@ -1038,7 +1038,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
//this.comboxConsignee //this.comboxConsignee
,{ ,{
xtype: 'label', xtype: 'label',
text: 'Consignee(收货人)' text: Zi.LAN.CONSIGNEE
}, { }, {
xtype: 'textareafield', xtype: 'textareafield',
grow: true, grow: true,
@ -1051,7 +1051,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
//this.comboxNotifyParty //this.comboxNotifyParty
, { , {
xtype: 'label', xtype: 'label',
text: 'Notify Party(通知人)' text: Zi.LAN.NOTIFYPARTY
}, { }, {
xtype: 'textareafield', xtype: 'textareafield',
grow: true, grow: true,
@ -1093,7 +1093,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
layout: 'hbox', layout: 'hbox',
items: [ items: [
this.comboxVoyVeg, { this.comboxVoyVeg, {
fieldLabel: '航次', fieldLabel: Zi.LAN.VOYNO,
flex: 1, flex: 1,
name: 'VOYNO' name: 'VOYNO'
} }
@ -1157,7 +1157,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
fieldLabel: '', fieldLabel: '',
name: 'DESTINATION' name: 'DESTINATION'
}, { }, {
fieldLabel: '运输方式', fieldLabel: Zi.LAN.TRANSTYPE,
name: 'TRANSTYPE' name: 'TRANSTYPE'
}, },
{ {
@ -1181,22 +1181,22 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
defaultType: 'textfield', defaultType: 'textfield',
items: [ items: [
{ {
fieldLabel: '总件数', fieldLabel: Zi.LAN.PKGS,
labelWidth: 70, labelWidth: 70,
name: 'PKGS' name: 'PKGS'
}, },
{ {
fieldLabel: '包装', fieldLabel: Zi.LAN.KINDPKGS,
labelWidth: 70, labelWidth: 70,
name: 'KINDPKGS' name: 'KINDPKGS'
}, { }, {
labelWidth: 70, labelWidth: 70,
fieldLabel: '总重量', fieldLabel: Zi.LAN.zKGS,
name: 'KGS' name: 'KGS'
}, },
{ {
//labelWidth: 70, //labelWidth: 70,
fieldLabel: '总尺码', fieldLabel: Zi.LAN.zCBM,
name: 'CBM' name: 'CBM'
} }
] ]
@ -1210,16 +1210,16 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
defaultType: 'textfield', defaultType: 'textfield',
layout: 'hbox', layout: 'hbox',
items: [ { items: [ {
fieldLabel: '分提单号', hidden: true, fieldLabel: Zi.LAN.HBLNO, hidden: true,
name: 'HBLNO', readOnly: true name: 'HBLNO', readOnly: true
}, },
{ {
fieldLabel: '审核人', fieldLabel: Zi.LAN.AUDITOPERATOR,
readOnly: true,hidden:true, readOnly: true,hidden:true,
name: 'AUDITOPERATOR' name: 'AUDITOPERATOR'
}, },
{ {
fieldLabel: '审核日期', fieldLabel: Zi.LAN.AUDITDATE,
readOnly: true, hidden: true, readOnly: true, hidden: true,
name: 'AUDITDATE' name: 'AUDITDATE'
}] }]
@ -1227,7 +1227,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
{ {
xtype: 'textareafield', xtype: 'textareafield',
grow: true,hidden:true, grow: true,hidden:true,
fieldLabel: '备 注', fieldLabel: Zi.LAN.REMARK,
height: 60, height: 60,
name: 'REMARK', name: 'REMARK',
anchor: '100%' anchor: '100%'
@ -1274,7 +1274,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
defaultType: 'textfield', defaultType: 'textfield',
items: [{ items: [{
xtype: 'label', xtype: 'label',
html: '<html>Seal No.（封志号）<br> Marks & Nos.（标记与号码) </html>' html: Zi.LAN.MEASUREMENT
}, },
{ {
xtype: 'textareafield', xtype: 'textareafield',
@ -1300,7 +1300,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
//this.comboxGOODSNAME //this.comboxGOODSNAME
{ {
xtype: 'label', xtype: 'label',
html: '<html><br> Description of Goods(包装种类与货名)</html>' html: Zi.LAN.DESCRIPTIONSTR
//text:'Description of Goods(包装种类与货名)' //text:'Description of Goods(包装种类与货名)'
} }
] ]
@ -1349,11 +1349,11 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
defaultType: 'textfield', defaultType: 'textfield',
items: [ items: [
{ {
fieldLabel: '预付地点', fieldLabel: Zi.LAN.PREPARDAT,
name: 'PREPARDAT' name: 'PREPARDAT'
}, },
{ {
fieldLabel: '到付地点', fieldLabel: Zi.LAN.PAYABLEAT,
name: 'PAYABLEAT' name: 'PAYABLEAT'
} }
] ]
@ -1367,7 +1367,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
this.comboxBLNUM, this.comboxBLNUM,
{ {
fieldLabel: '副本份数', fieldLabel: Zi.LAN.COPYNOBILL,
name: 'COPYNOBILL' name: 'COPYNOBILL'
} }
] ]
@ -1375,7 +1375,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
, ,
{ {
xtype: 'label',hidden:true, xtype: 'label',hidden:true,
html: '<html>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspNo.of containers or pkgs.<br>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp（箱数或件数)</html>' html: Zi.LAN.NOPKGS
}, },
{ {
xtype: 'textareafield', hidden: true, xtype: 'textareafield', hidden: true,
@ -1423,7 +1423,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}, },
{ {
xtype: 'label', hidden: true, xtype: 'label', hidden: true,
html: '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp Gross Weight 毛重（公斤）' html: Zi.LAN.GROSSWEIGHT
}, },
{ {
xtype: 'textareafield', hidden: true, xtype: 'textareafield', hidden: true,
@ -1462,7 +1462,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}, },
{ {
xtype: 'label', hidden: true, xtype: 'label', hidden: true,
html: '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp Measurement 尺码（立方米)' html: Zi.LAN.MEASUREMENT
}, },
{ {
xtype: 'textareafield', hidden: true, xtype: 'textareafield', hidden: true,
@ -1522,13 +1522,13 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
layout: 'hbox', layout: 'hbox',
items: [ items: [
{ {
fieldLabel: '签单日期', fieldLabel: Zi.LAN.ISSUEDATE,
format: 'Y-m-d', format: 'Y-m-d',
xtype: 'datefield', xtype: 'datefield',
name: 'ISSUEDATE' name: 'ISSUEDATE'
}, },
{ {
fieldLabel: '签单地点', fieldLabel: Zi.LAN.ISSUEPLACEID,
name: 'ISSUEPLACE' name: 'ISSUEPLACE'
}] }]
}, },
@ -1558,7 +1558,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}); });
this.comboxSeaeOp = Ext.create('DsExt.ux.RefTableCombox', { this.comboxSeaeOp = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '操作', fieldLabel: Zi.LAN.OP,
store: this.storeUser, store: this.storeUser,
forceSelection: true, forceSelection: true,
name: 'OP', name: 'OP',
@ -1566,7 +1566,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
displayField: 'CodeAndName' displayField: 'CodeAndName'
}); });
this.comboxSeaeSale = Ext.create('DsExt.ux.RefTableCombox', { this.comboxSeaeSale = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '销售', fieldLabel: Zi.LAN.SALE,
store: this.storeUser, store: this.storeUser,
forceSelection: true, forceSelection: true,
name: 'SALE', name: 'SALE',
@ -1574,7 +1574,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
displayField: 'CodeAndName' displayField: 'CodeAndName'
}); });
this.comboxSeaeCustService = Ext.create('DsExt.ux.RefTableCombox', { this.comboxSeaeCustService = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '客服', fieldLabel: Zi.LAN.CUSTSERVICE ,
store: this.storeUser, store: this.storeUser,
forceSelection: true, forceSelection: true,
name: 'CUSTSERVICE', name: 'CUSTSERVICE',
@ -1640,11 +1640,11 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
items: [{ items: [{
fieldLabel: '会计期间', fieldLabel: Zi.LAN.ACCDATE ,
xtype: 'monthfield', xtype: 'monthfield',
name: 'ACCDATE' name: 'ACCDATE'
}, { }, {
fieldLabel: '指定销售', fieldLabel: Zi.LAN.SALE_NAME,
name: 'SALE_NAME', name: 'SALE_NAME',
readOnly: true readOnly: true
} }
@ -1674,7 +1674,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}); });
me = this; me = this;
this.winAuditShow = Ext.create('Ext.window.Window', { this.winAuditShow = Ext.create('Ext.window.Window', {
title: "接受订舱", title: Zi.LAN.ConfirmBook,
width: 450, width: 450,
//height : 120, //height : 120,
//plain : true, //plain : true,
@ -1691,7 +1691,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
bodyStyle: "padding:0 0 0 0", bodyStyle: "padding:0 0 0 0",
items: [this.formAudit], items: [this.formAudit],
buttons: [{ buttons: [{
text: "确认接受", text: Zi.LAN.ConfirmBook,
id:"btnConfirm", id:"btnConfirm",
minWidth: 70, minWidth: 70,
handler: function () { handler: function () {
@ -1701,7 +1701,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
if (ACCDATE == '' || ACCDATE == null || ACCDATE == undefined) { if (ACCDATE == '' || ACCDATE == null || ACCDATE == undefined) {
Ext.Msg.show({ Ext.Msg.show({
title: '提示', title: '提示',
msg: '会计期间为必填!', msg: Zi.LAN.ACCDATENMUST,
icon: Ext.Msg.INFO, icon: Ext.Msg.INFO,
buttons: Ext.Msg.OK buttons: Ext.Msg.OK
}); });
@ -1713,7 +1713,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
if (User == '' || User == null || User == undefined) { if (User == '' || User == null || User == undefined) {
Ext.Msg.show({ Ext.Msg.show({
title: '提示', title: '提示',
msg: '操作员为必填!', msg: Zi.LAN.OPMUST,
icon: Ext.Msg.INFO, icon: Ext.Msg.INFO,
buttons: Ext.Msg.OK buttons: Ext.Msg.OK
}); });
@ -1744,7 +1744,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
this.formAuditBack = Ext.widget('form', { this.formAuditBack = Ext.widget('form', {
frame: true, frame: true,
region: 'center', region: 'center',
title: "<a href='#'><font color='#FF0000'>驳回原因</font></a>", title: "<a href='#'><font color='#FF0000'>" + Zi.LAN.REJECTREASON+"</font></a>",
bodyPadding: 5, bodyPadding: 5,
fieldDefaults: { fieldDefaults: {
margins: '2 2 2 2', margins: '2 2 2 2',
@ -1758,7 +1758,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
{ {
xtype: 'textfield', xtype: 'textfield',
grow: true, grow: true,
fieldLabel: '邮箱', fieldLabel: Zi.LAN.tbWEIGHEM,
labelSeparator: '', labelSeparator: '',
labelWidth: 40, labelWidth: 40,
//height: 100, //height: 100,
@ -1798,7 +1798,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
bodyStyle: "padding:0 0 0 0", bodyStyle: "padding:0 0 0 0",
items: [this.formAuditBack], items: [this.formAuditBack],
buttons: [{ buttons: [{
text: "确认驳回", text: Zi.LAN.REJECTENTER,
minWidth: 70, minWidth: 70,
handler: function () { handler: function () {
@ -1807,7 +1807,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
if (isNullorEmpty(EMAIL)) { if (isNullorEmpty(EMAIL)) {
Ext.Msg.show({ Ext.Msg.show({
title: '提示', title: '提示',
msg: '邮箱为必填!', msg: Zi.LAN.EMAILMUST,
icon: Ext.Msg.INFO, icon: Ext.Msg.INFO,
buttons: Ext.Msg.OK buttons: Ext.Msg.OK
}); });
@ -1819,7 +1819,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
if (ORREASON == '' || ORREASON == null || ORREASON == undefined) { if (ORREASON == '' || ORREASON == null || ORREASON == undefined) {
Ext.Msg.show({ Ext.Msg.show({
title: '提示', title: '提示',
msg: '驳回原因为必填!', msg: Zi.LAN.REASONMUST,
icon: Ext.Msg.INFO, icon: Ext.Msg.INFO,
buttons: Ext.Msg.OK buttons: Ext.Msg.OK
}); });
@ -1831,7 +1831,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
} }
}, },
{ {
text: "关闭", text: Zi.LAN.GuanBi,
minWidth: 70, minWidth: 70,
handler: function () { handler: function () {
me.winAuditBackShow.close(); me.winAuditBackShow.close();
@ -1846,7 +1846,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
region: "north", region: "north",
tbar: [{ tbar: [{
id: 'btnESave', id: 'btnESave',
text: "保存", text: Zi.LAN.SaveGridPanel,
iconCls: "btnsave", iconCls: "btnsave",
handler: function (button, event) { handler: function (button, event) {
this.Save('0'); this.Save('0');
@ -1855,7 +1855,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}, },
{ {
id: 'btnESaveAndClose', id: 'btnESaveAndClose',
text: "保存并关闭", text: Zi.LAN.btnESaveAndClose,
handler: function (button, event) { handler: function (button, event) {
this.Save('1'); this.Save('1');
}, },
@ -1863,7 +1863,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}, },
{ {
id: 'btnESaveAndNew', id: 'btnESaveAndNew',
text: "保存并新建", text: Zi.LAN.btnESaveAndNew,
handler: function (button, event) { handler: function (button, event) {
this.Save('2'); this.Save('2');
}, },
@ -1871,7 +1871,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}, },
{ {
id: 'btnECopyNew', id: 'btnECopyNew',
text: "复制新建", text: Zi.LAN.copyadd,
handler: function (button, event) { handler: function (button, event) {
var basicForm = this.formHead.getForm(); var basicForm = this.formHead.getForm();
this.opStatus = 'add'; this.opStatus = 'add';
@ -1920,7 +1920,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}, },
{ {
id: 'btnENew', id: 'btnENew',
text: "新建", text: Zi.LAN.GuanBi,
handler: function (button, event) { handler: function (button, event) {
this.LoadData('add', ''); this.LoadData('add', '');
var basicForm = this.formEdit.getForm(); var basicForm = this.formEdit.getForm();
@ -1930,8 +1930,8 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}, },
'-', { '-', {
id: 'btnSubmitAudit', id: 'btnSubmitAudit',
text: '提交审核', text: Zi.LAN.TIJIAOSHENHE,
tooltip: '提交审核', tooltip: Zi.LAN.TIJIAOSHENHE,
handler: function (button, event) { handler: function (button, event) {
this.onSubmitAuditClick(); this.onSubmitAuditClick();
}, },
@ -1947,7 +1947,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
scope: this scope: this
}, },
{ {
text: "接受订舱", text: Zi.LAN.ConfirmBook,
id: 'btnAudit', id: 'btnAudit',
iconCls: "btnadd", iconCls: "btnadd",
handler: function (button, event) { handler: function (button, event) {
@ -1956,7 +1956,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
if (billstatus != 'Submit') { if (billstatus != 'Submit') {
Ext.Msg.show({ Ext.Msg.show({
title: '警告', title: '警告',
msg: '当前状态，无法接受订舱!', msg: Zi.LAN.DANGQIANWUFAJIESHOU,
icon: Ext.Msg.WARNING, icon: Ext.Msg.WARNING,
buttons: Ext.Msg.OK buttons: Ext.Msg.OK
}); });
@ -1980,7 +1980,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}, },
{ {
text: "驳回订舱", text: Zi.LAN.BOHUIDINGCHANG,
id: 'btnAuditBack', id: 'btnAuditBack',
iconCls: "btndelete", iconCls: "btndelete",
handler: function (button, event) { handler: function (button, event) {
@ -1989,7 +1989,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
if (billstatus != 'Confirm' && billstatus != 'Submit' ) { if (billstatus != 'Confirm' && billstatus != 'Submit' ) {
Ext.Msg.show({ Ext.Msg.show({
title: '警告', title: '警告',
msg: '当前状态，无法驳回!', msg: Zi.LAN.DANGQIANWUFABOHUI,
icon: Ext.Msg.WARNING, icon: Ext.Msg.WARNING,
buttons: Ext.Msg.OK buttons: Ext.Msg.OK
}); });
@ -2006,7 +2006,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}, },
{ {
id: 'btnEPrint', id: 'btnEPrint',
text: "打印", text: Zi.LAN.btnprint,
iconCls: "btnprint", iconCls: "btnprint",
handler: function (button, event) { handler: function (button, event) {
this.Print(); this.Print();
@ -2018,7 +2018,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
//#region 框架结构 //#region 框架结构
this.panelpage = new Ext.Panel({ this.panelpage = new Ext.Panel({
title: '订舱详细信息', title: Zi.LAN.panelpage ,
layout: "border", layout: "border",
region: 'center', region: 'center',
animate: true, animate: true,
@ -2029,7 +2029,7 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
}); });
this.panelSeae = new Ext.Panel({ this.panelSeae = new Ext.Panel({
title: '订舱信息', title: Zi.LAN.panelSeae,
id: 'pnlmodSeaeOrderInfo', id: 'pnlmodSeaeOrderInfo',
layout: "border", layout: "border",
region: 'center', region: 'center',

13
DSWeb/Areas/MvcShipping/Viewsjs/BookingConfirm/Zi_zh-cn.js
Unescape Escape View File

@ -420,8 +420,8 @@ Zi.LAN.panelBodyRf = "冻柜信息";
Zi.LAN.panelEDIpage = "EDI及其他信息"; Zi.LAN.panelEDIpage = "EDI及其他信息";
Zi.LAN.panelManifest = "舱单分票信息"; Zi.LAN.panelManifest = "舱单分票信息";
Zi.LAN.panelMBL = "MASTER单信息"; Zi.LAN.panelMBL = "MASTER单信息";
Zi.LAN.panelpage = "委托详细信息"; Zi.LAN.panelpage = "订舱详细信息";
Zi.LAN.panelSeae = "委托信息"; Zi.LAN.panelSeae = "订舱信息";
Zi.LAN.tabtree = "业务信息"; Zi.LAN.tabtree = "业务信息";
Zi.LAN.JiangDiuShiWeiBaoCunDeGengGai = "未保存,如果离开此页，将丢失未保存的更改 ！！！"; Zi.LAN.JiangDiuShiWeiBaoCunDeGengGai = "未保存,如果离开此页，将丢失未保存的更改 ！！！";
@ -841,6 +841,15 @@ Zi.LAN.REASONMUST = "驳回原因为必填!！";
Zi.LAN.QUEDINGYINRU = "确定引入"; Zi.LAN.QUEDINGYINRU = "确定引入";
Zi.LAN.QUEDINGYINRUWEN = "确定要引入该记录吗？本地业务中的相应数据项会被SI中的数据所覆盖"; Zi.LAN.QUEDINGYINRUWEN = "确定要引入该记录吗？本地业务中的相应数据项会被SI中的数据所覆盖";
Zi.LAN.TUIHUI = "此票提单确认将被退回，确定吗？"; Zi.LAN.TUIHUI = "此票提单确认将被退回，确定吗？";
Zi.LAN.TRANSTYPE = "运输方式";
Zi.LAN.AUDITOPERATOR = "审核人";
Zi.LAN.AUDITDATE = "审核日期";
Zi.LAN.ConfirmBook = "接受订舱";
Zi.LAN.ACCDATENMUST = "会计期间为必填!！";
Zi.LAN.OPMUST = "操作为必填!！";
Zi.LAN.DANGQIANWUFAJIESHOU = "当前状态，无法接受订舱!";
Zi.LAN.BOHUIDINGCHANG = "驳回订舱";
Zi.LAN.DANGQIANWUFABOHUI = "当前状态，无法驳回订舱!";
//Zi.LAN. = ""; //Zi.LAN. = "";

Write Preview
Loading…
Cancel
Save