diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js index 6a060ddb..e5594977 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js @@ -704,7 +704,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' } }); this.comboxPORTDISCHARGE = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: Zi.LAN.PORTDISCHARGE, //'卸货港', + fieldLabel: '卸货港', //'卸货港', store: this.storeCodeDisport, name: 'PORTDISCHARGE', matchFieldWidth: false, @@ -2498,6 +2498,8 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { data = result.data; + this.LoadInit(data); + this.formEdit.getForm().reset(); this.formEdit.getForm().setValues(data); this.formHead.getForm().reset(); @@ -2539,6 +2541,17 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { this.storeCtnBodyList.load({ params: { condition: condition} }); }, + + LoadInit: function (data) { + + var newrec1 = { PORT: data.PORTLOAD, CodeAndName: data.PORTLOAD }; + this.storeCodeLoadport.add(newrec1); + + var newrec2 = { PORT: data.PORTDISCHARGE, CodeAndName: data.PORTDISCHARGE }; + this.storeCodeDisport.add(newrec2); + + }, + LoadCopyData: function (bsno, CopyFee) { this.serialNo = 0; Ext.Ajax.request({ diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js index 45df8d45..1ce85ec8 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js @@ -450,7 +450,7 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, { proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' } }); this.comboxPORTDISCHARGE = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: Zi.LAN.PORTDISCHARGE, //'卸货港', + fieldLabel: '卸货港', //'卸货港', store: this.storeCodeDisport, name: 'PORTDISCHARGE', matchFieldWidth: false, @@ -1279,6 +1279,9 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, { return; } data = result.data; + + this.LoadInit(data); + this.formHead.getForm().reset(); this.formHead.getForm().setValues(data); this.formEdit.getForm().reset(); @@ -1352,6 +1355,16 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, { } + }, + + LoadInit: function (data) { + + var newrec1 = { PORT: data.PORTLOAD, CodeAndName: data.PORTLOAD }; + this.storeCodeLoadport.add(newrec1); + + var newrec2 = { PORT: data.PORTDISCHARGE, CodeAndName: data.PORTDISCHARGE }; + this.storeCodeDisport.add(newrec2); + }, LoadPeriod: function (opstatus) { Ext.Ajax.request({ diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js index c7747f00..11801e70 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js @@ -3262,6 +3262,8 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 this.formBill.getForm().reset(); this.formBill.getForm().setValues(data); + + if (data.ORSTATUS == 9 || data.ORSTATUS == 2) { this.panelFee.setSaveBtnStatus(true); } else { @@ -3631,6 +3633,22 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 //#region LoadInit: function (data) { + + //装货港 卸货港 如果下拉框中不存在此条数据 则增加当前数据 + //var containsLOADPORT = this.storeCodeLoadport.data.items.some(function (item) { + // return item.data.PORT === data.PORTLOAD; + //}); + //if (!containsLOADPORT) { + // var newrec = { PORT: data.PORTLOAD, CodeAndName: data.PORTLOAD }; + // this.storeCodeLoadport.add(newrec); + //} + var newrec1 = { PORT: data.PORTLOAD, CodeAndName: data.PORTLOAD }; + this.storeCodeLoadport.add(newrec1); + + var newrec2 = { PORT: data.PORTDISCHARGE, CodeAndName: data.PORTDISCHARGE }; + this.storeCodeDisport.add(newrec2); + + var CUSTOMERNAME = data.CUSTOMERNAME;