diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js index 6a384c97..9bf9991f 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js @@ -857,6 +857,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, { var BsNo = form.findField('BsNo').getValue(); sql = sql + getAndConSql(sql, BsNo, "BILLNO IN (SELECT BILLNO FROM CH_FEE_DO WHERE BSNO IN (SELECT BSNO FROM V_OP_BILL b WHERE b.CUSTNO like '%" + BsNo + "%' or b.MBLNO like '%" + BsNo + "%' or b.HBLNO like '%" + BsNo + "%' or b.CUSTOMNO like '%" + BsNo + "%' or b.ORDERNO like '%" + BsNo + "%'))"); + var custName = form.findField('CustName').getValue(); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeCtnEdi/MsCodeCtnEdiIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeCtnEdi/MsCodeCtnEdiIndex.js index 10112d66..90b44d4f 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeCtnEdi/MsCodeCtnEdiIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeCtnEdi/MsCodeCtnEdiIndex.js @@ -858,6 +858,106 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { //#endregion + //#region 航线 + + this.storeLANE = Ext.create('DsExt.ux.RefTableStore', { + model: 'DsShipping.ux.Lane', + proxy: { url: '/CommMng/BasicDataRef/GetCodeLaneList' } + }); + this.storeLANE.load(); + this.comboxLANE = Ext.create('DsExt.ux.RefTableCombox', { + fieldLabel: Zi.LAN.LANE, //'航线', + store: this.storeLANE, + forceSelection: true, + name: 'LANE', + valueField: 'LANE', + displayField: 'LANE', + listeners: { + scope: this, + 'select': function (combo, records, eOpts) { + //if (records.length > 0) { + // if (records[0].data.OP != '') + // this.formHead.getForm().findField('OP').setValue(records[0].data.OP); + // if (records[0].data.DOC != '') + // this.formHead.getForm().findField('DOC').setValue(records[0].data.DOC); + // if (records[0].data.CUSTSERVICE != '') + // this.formHead.getForm().findField('CUSTSERVICE').setValue(records[0].data.CUSTSERVICE); + //} + } + } + }); + // + this.storeListLANE = Ext.create('Ext.data.Store', { + model: 'MsCodeCtnEdi', + remoteSort: true, + proxy: { + type: 'ajax', + url: '/MvcShipping/MsCodeCtnEdi/GetLANEList', + reader: { + id: 'GID', + root: 'data', + totalProperty: 'totalCount' + } + } + }); + this.gridListLANECellEditing = Ext.create('Ext.grid.plugin.CellEditing', { + clicksToEdit: 1 + }); + + //定义Grid + this.gridListLANE = new Ext.grid.GridPanel({ + store: this.storeListLANE, + enableHdMenu: false, + region: 'center', + loadMask: { msg: "数据加载中，请稍等..." }, + trackMouseOver: true, + disableSelection: false, + plugins: [this.gridListLANECellEditing], + selType: 'cellmodel', + columns: [{ + sortable: true, + dataIndex: 'GID', + header: 'GID', + hidden: true, + width: 120 + }, { + sortable: true, + dataIndex: 'CTN', + header: '航线', + width: 160, + editor: this.comboxLANE + }, { + sortable: true, + dataIndex: 'EDINAME', + header: 'EDI类别', + width: 100, + editor: this.comboxEdiType, + renderer: function (value, p, record) { + return record.data.EDINAMEREF; + } + }, { + sortable: true, + dataIndex: 'EDICODE', + header: 'EDI代码', + width: 160, + editor: { + xtype: 'textfield', + selectOnFocus: true + } + }, { + sortable: true, + dataIndex: 'REMARK', + header: '备注', + width: 160, + editor: { + xtype: 'textfield', + selectOnFocus: true + } + }] + }); + //#endregion + + //#region formSearch this.formSearch = Ext.widget('form', { frame: true, @@ -1007,6 +1107,14 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { region: "center", items: [this.gridListReeferf] }); + + this.panelLANE = new Ext.Panel({ + layout: "border", + title: '航线', + id: 'pnlLANE', + region: "center", + items: [this.gridListLANE] + }); this.MainCenter = new Ext.TabPanel({ @@ -1018,7 +1126,7 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { enableTabScroll: true, items: [ - this.panelCtn, this.panelCust, this.panelPkgs, this.panelSERVICE, this.panelPORTDISCHARGE, this.panelVESSEL, this.panelISSUETYPE, this.panelFeeName, this.panelReeferf + this.panelCtn, this.panelCust, this.panelPkgs, this.panelSERVICE, this.panelPORTDISCHARGE, this.panelVESSEL, this.panelISSUETYPE, this.panelFeeName, this.panelReeferf, this.panelLANE ] }); @@ -1093,6 +1201,15 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { }, this); + this.storeListLANE.on('beforeload', function (store) { + var sql = this.getCondition(); + Ext.apply(store.proxy.extraParams, { condition: sql }); + }, this); + this.gridListLANE.on('edit', function (editor, e, eOpts) { + this.gridListAfterEdit(editor, e, eOpts); + }, this); + + this.onRefreshClick(); //#endregion }, //end initUIComponents @@ -1135,17 +1252,19 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { waitMsg: "正在查询数据...", scope: this }); + this.storeListFeeName.load({ params: { start: 0, limit: 500, sort: '', condition: sql }, waitMsg: "正在查询数据...", scope: this }); - this.storeListFeeName.load({ + this.storeListReeferf.load({ params: { start: 0, limit: 500, sort: '', condition: sql }, waitMsg: "正在查询数据...", scope: this }); - this.storeListReeferf.load({ + + this.storeListLANE.load({ params: { start: 0, limit: 500, sort: '', condition: sql }, waitMsg: "正在查询数据...", scope: this @@ -1216,6 +1335,10 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { this.storeListReeferf.add(record); var n = this.storeListReeferf.getCount(); this.gridListReeferfCellEditing.startEditByPosition({ row: n - 1, column: 1 }); + } else if (this.MainCenter.activeTab.id == 'pnlLANE') { + this.storeListLANE.add(record); + var n = this.storeListLANE.getCount(); + this.gridListLANECellEditing.startEditByPosition({ row: n - 1, column: 1 }); } }, //#endregion @@ -1340,6 +1463,20 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { } var n = this.storeListReeferf.getCount(); this.gridListReeferfCellEditing.startEditByPosition({ row: n - 1, column: 1 }); + } else if (this.MainCenter.activeTab.id == 'pnlLANE') { + for (i = 0; i < this.storeLANE.getCount(); i += 1) { + var memberyf = this.storeLANE.getAt(i); + var record = Ext.create('MsCodeCtnEdi', { + GID: '*', + EDICODE: '', + EDINAME: '', + CTN: '', + REMARK: '' + }); + this.storeListLANE.add(record); + } + var n = this.storeListLANE.getCount(); + this.gridListLANECellEditing.startEditByPosition({ row: n - 1, column: 1 }); } }, //#endregion @@ -1368,6 +1505,8 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { this.onPostDetailFeeNameClick(button, event); } else if (this.MainCenter.activeTab.id == 'pnlReeferf') { this.onPostDetailReeferfClick(button, event); + } else if (this.MainCenter.activeTab.id == 'pnlLANE') { + this.onPostDetailLANEClick(button, event); } }, onPostCtnDetailClick: function (button, event) { @@ -1709,6 +1848,44 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { } } }); + }, //end save + + onPostDetailLANEClick: function (button, event) { + var bodyDrChFeeDatas = []; + var i; + for (i = 0; i < this.storeListLANE.getCount(); i += 1) { + var memberyf = this.storeListLANE.getAt(i); + bodyDrChFeeDatas.push(memberyf); + }; + var jsonChFeeBody = ConvertGIDRecordsToJson(bodyDrChFeeDatas); + + _thisfee = this; + Ext.Msg.wait('正在保存数据, 请稍侯..'); + Ext.Ajax.request({ + waitMsg: '正在保存数据...', + url: '/MvcShipping/MsCodeCtnEdi/SaveLANEDetail', + scope: this, + params: { + body: jsonChFeeBody + }, + callback: function (options, success, response) { + if (success) { + Ext.MessageBox.hide(); + var jsonresult = Ext.JSON.decode(response.responseText); + if (jsonresult.Success) { + this.onRefreshClick(); + } else { + Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); + } + } else { + Ext.Msg.show({ + title: '请重试', + msg: '服务器响应出错', + icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK + }); + } + } + }); }, //end save //#endregion @@ -1737,6 +1914,8 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { this.onDeleteFeeNameClick(button, event); } else if (this.MainCenter.activeTab.id == 'pnlReeferf') { this.onDeleteReeferfClick(button, event); + } else if (this.MainCenter.activeTab.id == 'pnlLANE') { + this.onDeleteLANEClick(button, event); } }, onDeleteCtnClick: function (button, event) { @@ -2104,6 +2283,47 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, { }, this); }, //onDeleteClick + onDeleteLANEClick: function (button, event) { + var selections = this.gridListLANE.getSelectionModel().getSelection(); + if (selections.length == 0) { + Ext.Msg.show({ title: '提示', msg: '请先选择单据!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + } + + var record = selections[0]; + Ext.MessageBox.confirm('提示', '确定删除该记录吗？', function (btn) { + if (btn == 'yes') { + Ext.Msg.wait('正在删除数据...'); + Ext.Ajax.request({ + waitMsg: '正在删除数据...', + url: '/MvcShipping/MsCodeCtnEdi/DeleteLANE', + params: { + data: Ext.JSON.encode(record.data) + }, + callback: function (options, success, response) { + if (success) { + var jsonresult = Ext.JSON.decode(response.responseText); + if (jsonresult.Success) { + this.storeListLANE.remove(record); + //Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + Ext.Msg.hide(); + } + else { + Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); + } + } + }, + failure: function (response, options) { + Ext.Msg.show({ title: '警告', msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + }, + success: function (response, options) { + }, + scope: this + }); + } + }, this); + }, //onDeleteClick + //#endregion //#region 修改 diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireFenEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireFenEdit.js index 0c386a88..bb338521 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireFenEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireFenEdit.js @@ -1182,6 +1182,7 @@ Ext.extend(Shipping.MsOpSeaeFenEdit, Ext.Panel, { displayField: 'NAME', listeners: { scope: this, + 'select': function (combo, records, eOpts) { if (records.length > 0) { if (combo.value == 'R') { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index 123a3161..6ad7ac18 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -1651,11 +1651,18 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 layout: 'hbox', defaultType: 'textfield', items: [{ - fieldLabel: Zi.LAN.IRCODE, //'发票号', + fieldLabel: Zi.LAN.IRCODE, //'CSR/IR号', //labelWidth: 50, //flex: 0.5, name: 'IRCODE' - }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' } + }, { + fieldLabel: '起运港箱使', + flex: 1, + name: 'PORTLOAD_OVER_DAYS_AMT' + } + , { xtype: 'hiddenfield' } + , { xtype: 'hiddenfield' } + , { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' } ] } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index 67f2fe45..befd9073 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -609,7 +609,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { sortable: true, id: '', dataIndex: 'OP_OVERSEA', - header: Zi.LAN.OP_OVERSEA, //'操作员', + header: Zi.LAN.OP_OVERSEA, //'海外操作', width: 80, filter: true }, @@ -1448,26 +1448,35 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { } } }, { - sortable: false, - dataIndex: 'RCVESTATUS', - text: Zi.LAN.RCVESTATUS, - width: 56, - renderer: function (value, meta, record) { - var openSet = "height=230, width=750, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 250) / 2 + ",Left= " + (screen.width - 700) / 2 - var openType = "_blank"; - var openUrl = ""; - openUrl = "../../MvcShipping/MsOpBill/CtnStatusView?handle=check&mblno=" + record.data.MBLNO + "&bsno=" + record.data.BSNO; - var winstr = "window.open(this.href,'" + openType + "','" + openSet + "')"; - - if (record.data.RCVESTATUS == 1) { - return '  ●' - } else if (record.data.RCVESTATUS == 2) { - return '  ●' - } else { - return ""; + sortable: false, + dataIndex: 'RCVESTATUS', + text: Zi.LAN.RCVESTATUS, + width: 56, + renderer: function (value, meta, record) { + var openSet = "height=230, width=750, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 250) / 2 + ",Left= " + (screen.width - 700) / 2 + var openType = "_blank"; + var openUrl = ""; + openUrl = "../../MvcShipping/MsOpBill/CtnStatusView?handle=check&mblno=" + record.data.MBLNO + "&bsno=" + record.data.BSNO; + var winstr = "window.open(this.href,'" + openType + "','" + openSet + "')"; + + if (record.data.RCVESTATUS == 1) { + return '  ●' + } else if (record.data.RCVESTATUS == 2) { + return '  ●' + } else { + return ""; + } } } - }]; + , + { + sortable: true, + id: '', + dataIndex: 'PORTLOAD_OVER_DAYS_AMT', + header: "起运港箱使", //'箱型3', + width: 120 + } + ]; this.girdcolums = this.initgirdcolums; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js index 2796af35..825d9431 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js @@ -154,8 +154,8 @@ { name: 'SERVICE9', type: 'boolean' }, { name: 'SERVICE10', type: 'boolean' }, { name: 'ISPRINTPR', type: 'string' }, - { name: 'DOC', type: 'string' }, - { name: 'ORDEROP', type: 'string' }, + { name: 'DOC', type: 'string' }, + { name: 'ORDEROP', type: 'string' }, { name: 'PACKINGTYPE', type: 'string' }, { name: 'WAREHOUSE', type: 'string' }, { name: 'CLOSEDOCDATE', type: 'string' }, @@ -231,7 +231,9 @@ { name: 'BillFeeStatus', type: 'string' }, { name: 'SaleMailInfo', type: 'string' }, { name: 'HAVEFEN', type: 'string' }, - { name: 'ZHUFEN', type: 'string' } + { name: 'ZHUFEN', type: 'string' }, + { name: 'OP_OVERSEA', type: 'string' }, + { name: 'PORTLOAD_OVER_DAYS_AMT', type: 'string' } ] }); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js index 6aec880c..46f6be8f 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js @@ -2033,6 +2033,9 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, { this.storeList.on('beforeload', function (store) { // var sql = this.getCondition(); + _this.PageSize = this.Pagenum.getValue(); + _this.storeList.pageSize = this.PageSize; + Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext }); }, this); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js index 8836d0e9..7431b286 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js @@ -471,6 +471,12 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { dataIndex: 'TTLNODR', header: '未收合计', width: 80 + }, + { + sortable: true, style: 'text-align:center;', align: 'left', + dataIndex: 'BSSOURCE', + header: '业务来源', + width: 100 } ]; /* diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEIndex.js index 61ad0a37..143ad48e 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEIndex.js @@ -531,6 +531,12 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { dataIndex: 'TTLNODR', header: '未收合计', width: 80 + }, + { + sortable: true, style: 'text-align:center;', align: 'left', + dataIndex: 'BSSOURCE', + header: '业务来源', + width: 100 } ]; /* diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEModel.js index 99b03bf1..6da3e9e9 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEModel.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEModel.js @@ -62,7 +62,8 @@ { name: 'QRDATE', type: 'string' }, { name: 'QCDATE', type: 'string' }, { name: 'ISCHAOQI', type: 'string' }, - { name: 'ISGAIQIAN', type: 'string' } + { name: 'ISGAIQIAN', type: 'string' }, + { name: 'BSSOURCE', type: 'string' } ] }); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js index dc85dc86..d4eb7c37 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js @@ -567,7 +567,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', - items: [this.comboxCustCode, this.comboxOP, this.comboxSALE, this.comboxGOODSNAME] + items: [this.comboxCustCode, this.comboxOP, this.comboxSALE, this.comboxCARRIER ] }]//end items(fieldset 1) }]//end root items }); @@ -597,7 +597,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', - items: [this.comboxCARRIER, { + items: [this.comboxGOODSNAME, { fieldLabel: '集装箱', name: 'CNTRTOTAL' }, this.comboxBLTYPE, { @@ -632,6 +632,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, { fieldLabel: '操作', store: this.storeUser, name: 'OP', + forceSelection: true, valueField: 'UserName', displayField: 'CodeAndName' }); @@ -646,6 +647,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, { this.comboxSeaeCustService = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: '客服', store: this.storeCustService, + forceSelection: true, name: 'CUSTSERVICE', valueField: 'UserName', displayField: 'CodeAndName' @@ -661,6 +663,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, { this.comboxFORWARDER = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: '订舱代理', store: this.storeFORWARDER, + forceSelection: true, queryMode: 'remote', minChars: 1, queryParam: 'CODENAME', @@ -1389,11 +1392,12 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, { sql = sql + getAndConSql(sql, VOYNO, "VOYNO like '%" + VOYNO + "%'"); //船公司 - var CARRIER = form2.findField('CARRIER').getValue(); + var CARRIER = form.findField('CARRIER').getValue(); sql = sql + getAndConSql(sql, CARRIER, "CARRIER='" + CARRIER + "'"); - + var GOODSNAME = form2.findField('GOODSNAME').getValue(); + sql = sql + getAndConSql(sql, GOODSNAME, "GOODSNAME like '%" + GOODSNAME + "%'"); //装运方式 diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js index 435b90d4..ad60c16a 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js @@ -666,32 +666,32 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 scope: this, 'select': function (combo, records, eOpts) { if (records.length > 0) { + this.SetOtherInfo(combo.value); + //var TEMPSET = Ext.getCmp("TEMPSET"); + //var TEMPID = Ext.getCmp("TEMPID"); - var TEMPSET = Ext.getCmp("TEMPSET"); - var TEMPID = Ext.getCmp("TEMPID"); - - if (combo.value == 'R') { - this.panelBodyDr.setVisible(false); - this.panelBodyRf.setVisible(true); + //if (combo.value == 'R') { + // this.panelBodyDr.setVisible(false); + // this.panelBodyRf.setVisible(true); - if (!TEMPSET.getValue() || TEMPSET.getValue() == "") - { - TEMPSET.setValue("999"); - TEMPID.setValue("C"); - } - } else if (combo.value == 'D') { - this.panelBodyDr.setVisible(true); - this.panelBodyRf.setVisible(false); - - TEMPSET.setValue(""); - TEMPID.setValue(""); - } else { - this.panelBodyDr.setVisible(false); - this.panelBodyRf.setVisible(false); - - TEMPSET.setValue(""); - TEMPID.setValue(""); - } + // if (!TEMPSET.getValue() || TEMPSET.getValue() == "") + // { + // TEMPSET.setValue("999"); + // TEMPID.setValue("C"); + // } + //} else if (combo.value == 'D') { + // this.panelBodyDr.setVisible(true); + // this.panelBodyRf.setVisible(false); + + // TEMPSET.setValue(""); + // TEMPID.setValue(""); + //} else { + // this.panelBodyDr.setVisible(false); + // this.panelBodyRf.setVisible(false); + + // TEMPSET.setValue(""); + // TEMPID.setValue(""); + //} } } @@ -1564,6 +1564,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 defaultType: 'textfield', items: [{ fieldLabel: '冷藏通风量', + id: "REEFERF", name: 'REEFERF' }, { fieldLabel: '设置温度', @@ -3622,18 +3623,21 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 // this.panelORREASON.hide(); // } - var CARGOID = this.formHead.getForm().findField('CARGOID').getValue(); + //var CARGOID = this.formHead.getForm().findField('CARGOID').getValue(); + + //if (CARGOID == 'R') { + // this.panelBodyDr.setVisible(false); + // this.panelBodyRf.setVisible(true); + //} else if (CARGOID == 'D') { + // this.panelBodyDr.setVisible(true); + // this.panelBodyRf.setVisible(false); + //} else { + // this.panelBodyDr.setVisible(false); + // this.panelBodyRf.setVisible(false); + //} + + this.SetOtherInfo(data.CARGOID); - if (CARGOID == 'R') { - this.panelBodyDr.setVisible(false); - this.panelBodyRf.setVisible(true); - } else if (CARGOID == 'D') { - this.panelBodyDr.setVisible(true); - this.panelBodyRf.setVisible(false); - } else { - this.panelBodyDr.setVisible(false); - this.panelBodyRf.setVisible(false); - } if (data.CUSTOMERNAME != '') { var recordCustCode = Ext.create('DsShipping.ux.CustomRefModel', { GId: NewGuid(), @@ -4942,6 +4946,8 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 Ext.getCmp("TEMPSET").setValue("999"); Ext.getCmp("TEMPID").setValue("C"); + Ext.getCmp("REEFERF").setValue("0"); + } } else { @@ -4973,6 +4979,35 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人 } //#endregion + //通过货物标识 判断额外的项目是否显示 + , SetOtherInfo(CARGOID) + { + + var TEMPSET = Ext.getCmp("TEMPSET"); + var TEMPID = Ext.getCmp("TEMPID"); + + if (CARGOID == 'R') { + this.panelBodyDr.setVisible(false); + this.panelBodyRf.setVisible(true); + + if (!TEMPSET.getValue() || TEMPSET.getValue() == "") { + TEMPSET.setValue("999"); + TEMPID.setValue("C"); + } + } else if (CARGOID == 'D') { + this.panelBodyDr.setVisible(true); + this.panelBodyRf.setVisible(false); + + TEMPSET.setValue(""); + TEMPID.setValue(""); + } else { + this.panelBodyDr.setVisible(false); + this.panelBodyRf.setVisible(false); + + TEMPSET.setValue(""); + TEMPID.setValue(""); + } + } }); diff --git a/DSWeb/Web.config b/DSWeb/Web.config index f404f7c5..9fc982a2 100644 --- a/DSWeb/Web.config +++ b/DSWeb/Web.config @@ -88,14 +88,14 @@ --> - + + + + -