From 77405a37bc7c50695ba2b75c457718491fa630fe Mon Sep 17 00:00:00 2001 From: dengyu Date: Tue, 14 Nov 2023 17:35:35 +0800 Subject: [PATCH] 20231114 --- .../Controllers/BasicDataRefController.cs | 5 + .../Controllers/MsOpSeaeController.cs | 2 + .../Controllers/MsSeaeOrderController.cs | 3 - .../Viewsjs/MsOpApply/MsOpApplyEdit.js | 8 +- .../Viewsjs/MsOpSeae/MsOpBillLSEdit.js | 8 +- .../Viewsjs/MsOpSeae/MsOpSeaeEdit.js | 88 +++++++++- .../MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js | 5 +- .../MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js | 5 +- .../Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js | 6 + .../Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js | 155 +++++++++++------- DSWeb/Web.config | 12 +- 11 files changed, 215 insertions(+), 82 deletions(-) diff --git a/DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs b/DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs index d5843920..62412026 100644 --- a/DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs +++ b/DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs @@ -1212,6 +1212,11 @@ namespace DSWeb.Areas.CommMng.Controllers } } + /// + /// 卸货港 + /// + /// + /// public JsonResult GetCodeDisportListRm(string PORT) { diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs index 36abcf2e..ce2ba549 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs @@ -2916,6 +2916,8 @@ namespace DSWeb.MvcShipping.Controllers var headData = JsonConvert.Deserialize(data); var bodyList = JsonConvert.Deserialize>(body); + BasicDataRefDAL.SaveLog(data, opstatus, "海运出口", "提单信息保存"); + if (opstatus == "add") { headData.INPUTBY = Convert.ToString(Session["SHOWNAME"]); diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs index f2713338..8a3cced4 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs @@ -1288,9 +1288,6 @@ namespace DSWeb.MvcShipping.Controllers if (PARAMVALUE.PARAMVALUE == "1") { - - - var mailtitle = "NEW BOOKING:" + headData.CUSTNO+ " 销售已提交订舱"; var Body = new StringBuilder(); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js index 8833be87..023581f5 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js @@ -264,6 +264,9 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { var ENTERP = this.formEdit.getForm().findField('ENTERP'); ENTERP.setValue(combo.value); } + + this.formHead.getForm().findField('SALE').setValue(records[0].data.SALE); + if (records[0].data.BSSOURCE != '') { this.formHead.getForm().findField('BSSOURCE').setValue(records[0].data.BSSOURCE); var recs = DsStoreQueryBy(this.storeSource, 'SourceName', records[0].data.BSSOURCE); @@ -762,10 +765,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { ]//end items(fieldset 1) }//end fieldset 1 ]//end root items - }); //end this.formEdit - - - + }); //end this.formEdit //编辑form diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js index 0c58c3ad..2bbde6a3 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js @@ -1661,10 +1661,10 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, { handler: function (button, event) { var basicForm = this.formEdit.getForm(); this.opStatus = 'add'; - basicForm.findField('AS_ID').setDisabled(false); + //basicForm.findField('AS_ID').setDisabled(false); var field = basicForm.findField('AS_ID'); field.setValue('*'); - basicForm.findField('AS_ID').setDisabled(true); + //basicForm.findField('AS_ID').setDisabled(true); field = basicForm.findField('INPUTBY'); field.setValue(SHOWNAME); for (var j = 0; j < this.storeBodyList.getCount(); j += 1) { @@ -3486,9 +3486,9 @@ this.storeConsignee.on('beforeload', function (store) { //this.formEdit.getForm().findField('NOTIFYPARTYNAME').setValue(this.formcd.getForm().findField('NOTIFYPARTYNAME').getValue()); //this.formEdit.getForm().findField('NOTIFYPARTYADDR1').setValue(this.formcd.getForm().findField('NOTIFYPARTYADDR1').getValue()); //this.formEdit.getForm().findField('SCACCODE').setValue(this.formcd.getForm().findField('SCACCODE').getValue()); - this.formEdit.getForm().findField('BSNO').setDisabled(false); + //this.formEdit.getForm().findField('BSNO').setDisabled(false); var data = this.formEdit.getForm().getValues(false, false, false); - this.formEdit.getForm().findField('BSNO').setDisabled(true); + //this.formEdit.getForm().findField('BSNO').setDisabled(true); var data2 = this.formcd.getForm().getValues(false, false, false); data.BSNO = this.MainEditRecord.data.BSNO; Object.assign(data, data2); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index 2d7f9b2e..64bfa613 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -439,6 +439,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 BSSOURCEDETAIL.setValue(''); } } + var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; this.storeInfoClientContact.load({ params: { condition: s }, @@ -2210,7 +2211,25 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 }, '-', { text: Zi.LAN.setPackage, //'批量设置包装', handler: function (button, event) { - this.onsetPackageClick( 1); + this.onsetCtnClick(1,"KINDPKGS"); + }, + scope: this + }, { + text: Zi.LAN.setPkgs, //'批量设置件数', + handler: function (button, event) { + this.onsetCtnClick(1, "PKGS"); + }, + scope: this + }, { + text: Zi.LAN.setKgs, //'批量设置重量', + handler: function (button, event) { + this.onsetCtnClick(1, "KGS"); + }, + scope: this + }, { + text: Zi.LAN.setCbm, //'批量设置体积', + handler: function (button, event) { + this.onsetCtnClick(1, "CBM"); }, scope: this }], @@ -2680,7 +2699,9 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 // this.formEdit.getForm().findField('PREPARDAT').setValue(''); // this.formEdit.getForm().findField('PAYABLEAT').setValue(records[0].data.PORT); // } + var selectrecords = DsStoreQueryBy(this.storeLANE, 'LANE', records[0].data.LANE); + if (selectrecords.getCount() > 0) { var selectdata = selectrecords.getAt(0).data; if (selectdata.OP != '') @@ -11967,7 +11988,25 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 }, '-', { text: Zi.LAN.setPackage, //'批量设置包装', handler: function (button, event) { - this.onsetPackageClick(2); + this.onsetCtnClick(2, "KINDPKGS"); + }, + scope: this + }, { + text: Zi.LAN.setPkgs, //'批量设置件数', + handler: function (button, event) { + this.onsetCtnClick(2, "PKGS"); + }, + scope: this + }, { + text: Zi.LAN.setKgs, //'批量设置重量', + handler: function (button, event) { + this.onsetCtnClick(2, "KGS"); + }, + scope: this + }, { + text: Zi.LAN.setCbm, //'批量设置体积', + handler: function (button, event) { + this.onsetCtnClick(2, "CBM"); }, scope: this }, { @@ -14161,6 +14200,10 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 stringObj = data2js.toString(); var data2js = stringObj.replace(reg, "❥"); + if (data.HAVEFEN == "on") { + data.HAVEFEN = 'True'; + } else data.HAVEFEN = 'False'; + // Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu); Ext.Ajax.request({ @@ -14747,6 +14790,47 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 }; } + }, + onsetCtnClick: function (type,fieldname) { + + var BSSTATUS = this.formHead.getForm().findField('BSSTATUSREF').getValue(); + if (BSSTATUS == '锁定') { + Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.YeWuYiSuoDingBuYunXuShanChu, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'业务已锁定，不允许操作!' + return; + } + if (type == 1) + var selectedRecords = this.gridList.selModel.getSelection(); + else + var selectedRecords = this.gridListshow.selModel.getSelection(); + + if (selectedRecords.length == 0) { + Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'请先选择要操作的业务!!' + return; + } else { + + var rec = selectedRecords[0].data; + for (i = 0; i < this.storeBodyList.getCount(); i += 1) { + var memberyf = this.storeBodyList.getAt(i); + if (fieldname == "KINDPKGS") { + memberyf.set("KINDPKGS", rec.KINDPKGS); + } + if (fieldname == "PKGS") { + memberyf.set("PKGS", rec.PKGS); + } + if (fieldname == "KGS") { + memberyf.set("KGS", rec.KGS); + memberyf.set("TAREWEIGHT", rec.TAREWEIGHT); + memberyf.set("TTLWEIGHT", rec.TTLWEIGHT); + memberyf.set("WEIGHKGS", rec.WEIGHKGS); + } + if (fieldname == "CBM") { + memberyf.set("CBM", rec.CBM); + } + + + }; + } + }, onaddyarddataClick: function () { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js index 7600fe30..0d053c66 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js @@ -606,7 +606,10 @@ Zi.LAN.PORTSTATUS = '码头'; Zi.LAN.EXPSTATUS = '出运'; Zi.LAN.HGYDSTATUS = '运抵'; Zi.LAN.updatectntruck = '同步车队'; -Zi.LAN.setPackage = '批量设置包装'; +Zi.LAN.setPackage = '批量设置:包装'; +Zi.LAN.setPkgs = '件数'; +Zi.LAN.setKgs = '重量'; +Zi.LAN.setCbm = '体积'; Zi.LAN.ISGAIQIAN = '是否改签'; Zi.LAN.TRUCKSTATUS = '派车'; Zi.LAN.ImportMSCBill = 'MSC EXCEL导入'; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js index bc875703..e8f7143f 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js @@ -622,7 +622,10 @@ Zi.LAN.PORTSTATUS = '码头'; Zi.LAN.EXPSTATUS = '出运'; Zi.LAN.HGYDSTATUS = '运抵'; Zi.LAN.updatectntruck = '同步车队'; -Zi.LAN.setPackage = '批量设置包装'; +Zi.LAN.setPackage = '批量设置:包装'; +Zi.LAN.setPkgs = '件数'; +Zi.LAN.setKgs = '重量'; +Zi.LAN.setCbm = '体积'; Zi.LAN.CheckRuleNames = '规则名称'; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js index 9ba80195..dc85dc86 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js @@ -208,6 +208,12 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, { header: '卸货港', width: 100 }, + { + sortable: true, + dataIndex: 'LANE', + header: '航线', + width: 100 + }, { sortable: true, dataIndex: 'CUSTOMSER', diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js index e61a5375..bc67d5fb 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js @@ -1166,6 +1166,17 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 displayField: 'ZHUFEN' }); + this.comboxTRANSPORT = Ext.create('DsExt.ux.RefTableCombox', { + fieldLabel: '中转港', + store: this.storeCodeDisport5, + name: 'TRANSPORT', + valueField: 'PORT', + queryMode: 'remote', + minChars: 1, + queryParam: 'PORT', + displayField: 'PORT' + }); + //#region 编辑formHead 基本信息 @@ -1317,6 +1328,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 xtype: 'checkboxfield', name: 'HAVEFEN' } + , { xtype: 'hiddenfield' } , { xtype: 'hiddenfield' } , { xtype: 'hiddenfield' } @@ -1604,6 +1616,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 store: this.storeCodeLoadport, // queryMode: 'remote', // minChars: 1, + flex:1.5, name: 'PORTLOAD', valueField: 'PORT', displayField: 'CodeAndName', @@ -1627,6 +1640,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 this.comboxPORTDISCHARGE = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: '卸货港', store: this.storeCodeDisport, + flex: 2.5, name: 'PORTDISCHARGE', valueField: 'PORT', queryMode: 'remote', @@ -1641,11 +1655,11 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 var selectrecords = DsStoreQueryBy(this.storeCodeDisport, 'PORT', combo.value); if (selectrecords.getCount() > 0) { var selectdata = selectrecords.getAt(0).data; - this.formBill.getForm().findField('PORTDISCHARGEID').setValue(selectdata.EDICODE); - var DESTINATION = this.formBill.getForm().findField('DESTINATIONID').getValue(); + this.formEdit.getForm().findField('PORTDISCHARGEID').setValue(selectdata.EDICODE); + var DESTINATION = this.formEdit.getForm().findField('DESTINATIONID').getValue(); if (DESTINATION == null || DESTINATION == '') { this.formEdit.getForm().findField('DESTINATION').setValue(combo.value); - this.formBill.getForm().findField('DESTINATIONID').setValue(selectdata.EDICODE); + this.formEdit.getForm().findField('DESTINATIONID').setValue(selectdata.EDICODE); } var PLACEDELIVERY = this.formBill.getForm().findField('PLACEDELIVERYID').getValue(); if (PLACEDELIVERY == null || PLACEDELIVERY == '') { @@ -1656,13 +1670,13 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 this.formEdit.getForm().findField('LANE').setValue(records[0].data.LANE); } else { - this.formBill.getForm().findField('PORTDISCHARGEID').setValue(''); + this.formEdit.getForm().findField('PORTDISCHARGEID').setValue(''); } } }, change: function (field, newValue, oldValue, eOpts) { if (newValue == null || newValue == '') { - this.formBill.getForm().findField('PORTDISCHARGEID').setValue(''); + this.formEdit.getForm().findField('PORTDISCHARGEID').setValue(''); } } } @@ -1671,6 +1685,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 this.comboxDESTINATION = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: '目的地', store: this.storeCodeDisport2, + flex: 2.5, name: 'DESTINATION', queryMode: 'remote', minChars: 1, @@ -1685,20 +1700,20 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 var selectrecords = DsStoreQueryBy(this.storeCodeDisport2, 'PORT', combo.value); if (selectrecords.getCount() > 0) { var selectdata = selectrecords.getAt(0).data; - this.formBill.getForm().findField('DESTINATIONID').setValue(selectdata.EDICODE); + this.formEdit.getForm().findField('DESTINATIONID').setValue(selectdata.EDICODE); var PLACEDELIVERY = this.formBill.getForm().findField('PLACEDELIVERYID').getValue(); - if (PLACEDELIVERY == null || PLACEDELIVERY == '') { + //if (PLACEDELIVERY == null || PLACEDELIVERY == '') { this.formEdit.getForm().findField('PLACEDELIVERY').setValue(combo.value); this.formBill.getForm().findField('PLACEDELIVERYID').setValue(selectdata.EDICODE); - } + //} } else { - this.formBill.getForm().findField('DESTINATIONID').setValue(''); + this.formEdit.getForm().findField('DESTINATIONID').setValue(''); } } }, change: function (field, newValue, oldValue, eOpts) { if (newValue == null || newValue == '') { - this.formBill.getForm().findField('DESTINATIONID').setValue(''); + this.formEdit.getForm().findField('DESTINATIONID').setValue(''); } } } @@ -1707,6 +1722,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 this.comboxPLACEDELIVERY = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: '交货地', store: this.storeCodeDisport3, + flex: 1.5, name: 'PLACEDELIVERY', matchFieldWidth: false, queryMode: 'remote', @@ -1766,16 +1782,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 } }); - this.comboxTRANSPORT = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '中转港', - store: this.storeCodeDisport5, - name: 'TRANSPORT', - valueField: 'PORT', - queryMode: 'remote', - minChars: 1, - queryParam: 'PORT', - displayField: 'PORT' - }); + this.comboxISSUEPLACE = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: '签单地点', @@ -1882,12 +1889,31 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 format: 'Y-m-d', xtype: 'datefield', name: 'ETD' - }, this.comboxPORTLOAD, this.comboxPORTDISCHARGE, this.comboxDESTINATION] + }, this.comboxPORTLOAD + + , this.comboxPORTDISCHARGE + , { + fieldLabel: '卸港代码', + name: 'PORTDISCHARGEID' + } + ] + }, { + xtype: 'container', + defaultType: 'textfield', + layout: 'hbox', + items: [ + this.comboxISSUETYPE, + this.comboxDESTINATION, + { + fieldLabel: '目的代码', + name: 'DESTINATIONID' + }, + this.comboxPLACEDELIVERY] }, { xtype: 'container', defaultType: 'textfield', layout: 'hbox', - items: [ this.comboxPLACEDELIVERY,{ + items: [ { fieldLabel: '总件数', labelWidth: 70, name: 'PKGS', @@ -1901,19 +1927,14 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 } } }, this.comboxKINDPKGS, { - labelWidth: 70, - fieldLabel: '总重量', - name: 'KGS' - }, { - labelWidth: 70, - fieldLabel: '总尺码', - name: 'CBM' - }] - }, { - xtype: 'container', - defaultType: 'textfield', - layout: 'hbox', - items: [this.comboxISSUETYPE, this.comboxPKGTYPE, { + labelWidth: 70, + fieldLabel: '总重量', + name: 'KGS' + }, { + labelWidth: 70, + fieldLabel: '总尺码', + name: 'CBM' + }, { fieldLabel: '免箱天数', // flex: 0.5, @@ -1923,10 +1944,6 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 labelWidth: 100, // flex: 0.8, name: 'DESTFBP' - }, { - fieldLabel: '限重', -// flex: 0.7, - name: 'MAXWEIGHT' }] }, { xtype: 'container', @@ -1935,7 +1952,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 items: [{ fieldLabel: '预计利润', name: 'PLANPROFIT' - }, this.comboxAgent, this.comboxLANE, this.comboxTRANSPORT, this.comboxYARD] + }, this.comboxAgent, this.comboxLANE, this.comboxYARD] }, { xtype: 'container', defaultType: 'textfield', @@ -2042,6 +2059,20 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 flex: 1, name: 'VOYNO' }] + }, { + xtype: 'container', + defaultType: 'textfield', + layout: 'hbox', + items: [ + { + fieldLabel: '装港代码', + name: 'PORTLOADID' + }, + { + fieldLabel: '交货代码', + name: 'PLACEDELIVERYID' + } + ] }, { xtype: 'container', defaultType: 'textfield', @@ -2054,30 +2085,32 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 xtype: 'container', defaultType: 'textfield', layout: 'hbox', - items: [ { - fieldLabel: '交货代码', - name: 'PLACEDELIVERYID' - }, { xtype: 'hiddenfield' }] + items: [ + + + + ] }, { xtype: 'container', defaultType: 'textfield', layout: 'hbox', - items: [{ - fieldLabel: '装港代码', - name: 'PORTLOADID' + items: [ this.comboxSERVICE] }, { - fieldLabel: '卸港代码', - name: 'PORTDISCHARGEID' - }] - }, { - xtype: 'container', - defaultType: 'textfield', - layout: 'hbox', + xtype: 'container', + defaultType: 'textfield', + layout: 'hbox', + items: [ this.comboxPKGTYPE + , this.comboxTRANSPORT] + }, { + xtype: 'container', + defaultType: 'textfield', + layout: 'hbox', items: [{ - fieldLabel: '目的代码', - name: 'DESTINATIONID' - }, this.comboxSERVICE] - }, { + fieldLabel: '限重', + // flex: 0.7, + name: 'MAXWEIGHT' + }, { xtype: 'hiddenfield' }] + }, { xtype: 'container', defaultType: 'textfield', layout: 'hbox', @@ -2601,11 +2634,11 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 var basicForm = this.formHead.getForm(); var editForm = this.formEdit.getForm(); this.opStatus = 'add'; - basicForm.findField('BSNO').setDisabled(false); + //basicForm.findField('BSNO').setDisabled(false); var field = basicForm.findField('BSNO'); var BSNO = NewGuid(); field.setValue(BSNO); - basicForm.findField('BSNO').setDisabled(true); + //basicForm.findField('BSNO').setDisabled(true); field = basicForm.findField('ORDNO'); field.setValue(''); field = basicForm.findField('INPUTBY'); @@ -2674,7 +2707,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 handler: function (button, event) { this.LoadData('add', ''); var basicForm = this.formEdit.getForm(); - basicForm.findField('BsNo').setDisabled(false); + //basicForm.findField('BsNo').setDisabled(false); this.panelOcr.hide(); }, scope: this diff --git a/DSWeb/Web.config b/DSWeb/Web.config index d9c1cf8e..662ec821 100644 --- a/DSWeb/Web.config +++ b/DSWeb/Web.config @@ -92,18 +92,18 @@ --> - + + + + - +