diff --git a/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs index f16c0240..fcd2f4c0 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs @@ -4542,7 +4542,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL if (bill.OPTYPE == "更改单") { if (SUBMITFEEBLFEELOCK == "1") - _Comm = "UPDATE OP_AMEND SET BillFeeStatus=1,BILLFEESTATUSTIME=GETDATE(),FEESTATUS=1 WHERE BSNO=@BSNO"; + _Comm = "UPDATE OP_AMEND SET BillFeeStatus=1,BILLFEESTATUSTIME=GETDATE() WHERE BSNO=@BSNO"; else _Comm = "UPDATE OP_AMEND SET BillFeeStatus=1,BILLFEESTATUSTIME=GETDATE() WHERE BSNO=@BSNO"; } else @@ -4568,7 +4568,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL else { if (SUBMITFEEBLFEELOCK == "1") - _Comm = "UPDATE " + bill.OPLB + " SET BillFeeStatus=1,BILLFEESTATUSTIME=GETDATE(),FEESTATUS=1 WHERE BSNO=@BSNO"; + _Comm = "UPDATE " + bill.OPLB + " SET BillFeeStatus=1,BILLFEESTATUSTIME=GETDATE() WHERE BSNO=@BSNO"; else _Comm = "UPDATE " + bill.OPLB + " SET BillFeeStatus=1,BILLFEESTATUSTIME=GETDATE() WHERE BSNO=@BSNO"; } } @@ -4691,7 +4691,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL } else { - _Comm = "UPDATE " + bill.OPLB + " SET BillFeeStatus=0,FEESTATUS=0,BILLFEESTATUSTIME=null WHERE BSNO=@BSNO"; + _Comm = "UPDATE " + bill.OPLB + " SET BillFeeStatus=0,FEESTATUS=0,BILLFEESTATUSTIME=null,FEESTATUS=0 WHERE BSNO=@BSNO"; } } _feeComm = "update ch_fee set FEESTATUS=1 where FEESTATUS=2 AND BSNO=@BSNO"; @@ -4785,7 +4785,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL //string strCwACCDATE = period.PERIOD; if (bill.OPTYPE == "更改单") { - _Comm = "UPDATE OP_AMEND SET BillFeeStatus=2 WHERE BSNO=@BSNO"; + _Comm = "UPDATE OP_AMEND SET BillFeeStatus=2,FEESTATUS=1 WHERE BSNO=@BSNO"; } else { @@ -4803,7 +4803,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL } else { - _Comm = "UPDATE " + bill.OPLB + " SET BillFeeStatus=2 WHERE BSNO=@BSNO"; + _Comm = "UPDATE " + bill.OPLB + " SET BillFeeStatus=2,FEESTATUS=1 WHERE BSNO=@BSNO"; } } _feeComm = "update ch_fee set FEESTATUS=0 where FEESTATUS=2 AND BSNO=@BSNO"; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js index 526fbc0d..1a7b8b1f 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js @@ -5282,6 +5282,8 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { var FeeStatus = record.data.FeeStatus; var CustomerName = record.data.CustomerName; + var CUSTID = record.data.CUSTID; + var CustomerFullName = record.data.CustomerFullName; var GId = record.data.GId; if (FeeStatus == 3) { this.NewFeeShowDr.setVisible(true); @@ -5334,6 +5336,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { CustCode: CustomerName, CustName: CustomerName, CodeAndName: CustomerName, + CodeAndFull: CUSTID + '-' + custname + '★' + CustomerFullName, DESCRIPTION: CustomerName }); _thisfee.storeCustomerNameRefM.add(recordCustCode); @@ -5395,6 +5398,8 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { var FeeStatus = record.data.FeeStatus; var CustomerName = record.data.CustomerName; + var CUSTID = record.data.CUSTID; + var CustomerFullName = record.data.CustomerFullName; var GId = record.data.GId; if (FeeStatus == 3) { this.NewFeeShowCr.setVisible(true); @@ -5441,6 +5446,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { CustCode: CustomerName, CustName: CustomerName, CodeAndName: CustomerName, + CodeAndFull: CUSTID + '-' + custname + '★' + CustomerFullName, DESCRIPTION: CustomerName }); _thisfee.storeCustomerNameRefM.add(recordCustCode); @@ -5466,14 +5472,17 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { } else { var rec = selections[0]; var custname = rec.data.CustomerName; + var CUSTID = rec.data.CUSTID; + var CustomerFullName = rec.data.CustomerFullName; var selectrecords = DsStoreQueryBy(_thisfee.storeCustomerNameRefDr, 'CustName', custname); if (selectrecords.getCount() == 0) { var custname = rec.data.CustomerName; var recordCustCode = Ext.create('DsShipping.ux.CustomRefModel', { GId: NewGuid(), - CustCode: custname, + CustCode: CUSTID, CustName: custname, CodeAndName: custname, + CodeAndFull: CUSTID + '-' + custname + '★' + CustomerFullName, DESCRIPTION: custname }); _thisfee.storeCustomerNameRefDr.add(recordCustCode); @@ -5543,13 +5552,16 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { } else { var rec = selections[0]; var custname = rec.data.CustomerName; + var CUSTID = rec.data.CUSTID; + var CustomerFullName = rec.data.CustomerFullName; var selectrecords = DsStoreQueryBy(_thisfee.storeCustomerNameRefCr, 'CustName', custname); if (selectrecords.getCount() == 0) { var recordCustCode = Ext.create('DsShipping.ux.CustomRefModel', { GId: NewGuid(), - CustCode: custname, + CustCode: CUSTID, CustName: custname, CodeAndName: custname, + CodeAndFull: CUSTID + '-' + custname + '★' + CustomerFullName, DESCRIPTION: custname }); _thisfee.storeCustomerNameRefCr.add(recordCustCode); @@ -7012,7 +7024,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, { } //DsOpenEditWin("/MvcShipping/MsFeeTemplate/AddFeeIndex", "模板引入费用"); - window.open('/MvcShipping/MsFeeTemplate/AddFeeIndex', "模板引入费用", "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2); + window.open('/MvcShipping/MsFeeTemplate/AddFeeIndex', "模板引入费用", "height=500, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top=550 " + ",Left= " + (screen.width - 1100) / 2); // DsOpenEditWin("/MvcShipping/MsFeeTemplate/AddFeeIndex", "模板引入费用"); }, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsFeeTemplate/FeeTemplateAdd.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsFeeTemplate/FeeTemplateAdd.js index 3eb8ad4f..91921109 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsFeeTemplate/FeeTemplateAdd.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsFeeTemplate/FeeTemplateAdd.js @@ -7,7 +7,7 @@ Shipping.FeeTemplateAdd = function (config) { }; Ext.extend(Shipping.FeeTemplateAdd, Ext.Panel, { - PageSize: 100, + PageSize: 20, ParentWin: null, feeType: 0, feeTypeRef: '', @@ -52,7 +52,7 @@ Ext.extend(Shipping.FeeTemplateAdd, Ext.Panel, { store: this.storeList, enableHdMenu: false, region: 'north', - height: 350, + height: 150, loadMask: { msg: "数据加载中，请稍等..." }, trackMouseOver: true, disableSelection: false, @@ -750,6 +750,11 @@ Ext.extend(Shipping.FeeTemplateAdd, Ext.Panel, { if (this.stroplb != 'op_truck') { this.parentWin.onPostDetailClick(NaN, NaN, this.feeType); + this.parentWin.feeDrGridCheckBoxModel.selectAll(); + this.parentWin.feeCrGridCheckBoxModel.selectAll(); + + this.parentWin.feeDrGridCheckBoxModel.deselectAll(); + this.parentWin.feeCrGridCheckBoxModel.deselectAll(); this.parentWin.calcDetailTotal(); } else { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEdit.js index 70924f68..f292926b 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEdit.js @@ -203,49 +203,49 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, { if (records.length > 0) { var data = combo.value; this.formHead.getForm().findField('SALE').setValue(records[0].data.SALE); - var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; - this.storeInfoClientContact.load({ params: { condition: s }, - callback: function (r, options, success) { - if (success) { - if (this.storeInfoClientContact.getCount() > 0) { - var member = this.storeInfoClientContact.getAt(0); - this.comboxInfoClientContact.setValue(member.data.SHOWNAME); - // this.formHead.getForm().findField('OPERATOREMAIL').setValue(member.data.EMAIL); - this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL); - // this.formHead.getForm().findField('OPERATORFAX').setValue(member.data.FAX); - } else { - this.comboxInfoClientContact.setValue(''); - // this.formHead.getForm().findField('OPERATOREMAIL').setValue(''); - this.formHead.getForm().findField('OPERATORTEL').setValue(''); - // this.formHead.getForm().findField('OPERATORFAX').setValue(''); - - } - } - }, - scope: this - }); - - var sF = " ISFINANCIALSTAFF=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; - this.storeInfoClientContactFF.load({ params: { condition: sF }, - callback: function (r, options, success) { - if (success) { - if (this.storeInfoClientContactFF.getCount() > 0) { - var member = this.storeInfoClientContactFF.getAt(0); - this.comboxClientFCContact.setValue(member.data.SHOWNAME); - // this.formHead.getForm().findField('FINANCIALSTAFFEMAIL').setValue(member.data.EMAIL); - this.formHead.getForm().findField('FINANCIALSTAFFTEL').setValue(member.data.TEL); - // this.formHead.getForm().findField('FINANCIALSTAFFFAX').setValue(member.data.FAX); - } else { - this.comboxClientFCContact.setValue(''); - // this.formHead.getForm().findField('FINANCIALSTAFFEMAIL').setValue(''); - this.formHead.getForm().findField('FINANCIALSTAFFTEL').setValue(''); - // this.formHead.getForm().findField('FINANCIALSTAFFFAX').setValue(''); - - } - } - }, - scope: this - }); + //var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; + //this.storeInfoClientContact.load({ params: { condition: s }, + // callback: function (r, options, success) { + // if (success) { + // if (this.storeInfoClientContact.getCount() > 0) { + // var member = this.storeInfoClientContact.getAt(0); + // this.comboxInfoClientContact.setValue(member.data.SHOWNAME); + // // this.formHead.getForm().findField('OPERATOREMAIL').setValue(member.data.EMAIL); + // this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL); + // // this.formHead.getForm().findField('OPERATORFAX').setValue(member.data.FAX); + // } else { + // this.comboxInfoClientContact.setValue(''); + // // this.formHead.getForm().findField('OPERATOREMAIL').setValue(''); + // this.formHead.getForm().findField('OPERATORTEL').setValue(''); + // // this.formHead.getForm().findField('OPERATORFAX').setValue(''); + + // } + // } + // }, + // scope: this + //}); + + //var sF = " ISFINANCIALSTAFF=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; + //this.storeInfoClientContactFF.load({ params: { condition: sF }, + // callback: function (r, options, success) { + // if (success) { + // if (this.storeInfoClientContactFF.getCount() > 0) { + // var member = this.storeInfoClientContactFF.getAt(0); + // this.comboxClientFCContact.setValue(member.data.SHOWNAME); + // // this.formHead.getForm().findField('FINANCIALSTAFFEMAIL').setValue(member.data.EMAIL); + // this.formHead.getForm().findField('FINANCIALSTAFFTEL').setValue(member.data.TEL); + // // this.formHead.getForm().findField('FINANCIALSTAFFFAX').setValue(member.data.FAX); + // } else { + // this.comboxClientFCContact.setValue(''); + // // this.formHead.getForm().findField('FINANCIALSTAFFEMAIL').setValue(''); + // this.formHead.getForm().findField('FINANCIALSTAFFTEL').setValue(''); + // // this.formHead.getForm().findField('FINANCIALSTAFFFAX').setValue(''); + + // } + // } + // }, + // scope: this + //}); this.storeShipper.load({ params: { condition: "shippertype=2 AND (ISPUBLIC=1 OR CODENAME IN (SELECT CODENAME FROM info_client WHERE SHORTNAME='" + combo.value + "') )"} }); this.storeConsignee.load({ params: { condition: "shippertype=1 AND (ISPUBLIC=1 OR CODENAME IN (SELECT CODENAME FROM info_client WHERE SHORTNAME='" + combo.value + "') )"} }); @@ -2993,10 +2993,10 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, { if (success) { var result = Ext.JSON.decode(response.responseText); if (result.Success) { - _this.formHead.getForm().findField('HBLNO').setDisabled(false); + //_this.formHead.getForm().findField('HBLNO').setDisabled(false); btnGetHblNo.setDisabled(false); } else { - _this.formHead.getForm().findField('HBLNO').setDisabled(true); + //_this.formHead.getForm().findField('HBLNO').setDisabled(true); btnGetHblNo.setDisabled(true); } } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriEdit.js index 7cea0ea5..b9ae2399 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriEdit.js @@ -196,49 +196,49 @@ Ext.extend(Shipping.MsOpAiriEdit, Ext.Panel, { if (records.length > 0) { var data = combo.value; this.formHead.getForm().findField('SALE').setValue(records[0].data.SALE); - var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; - this.storeInfoClientContact.load({ params: { condition: s }, - callback: function (r, options, success) { - if (success) { - if (this.storeInfoClientContact.getCount() > 0) { - var member = this.storeInfoClientContact.getAt(0); - this.comboxInfoClientContact.setValue(member.data.SHOWNAME); - // this.formHead.getForm().findField('OPERATOREMAIL').setValue(member.data.EMAIL); - this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL); - // this.formHead.getForm().findField('OPERATORFAX').setValue(member.data.FAX); - } else { - this.comboxInfoClientContact.setValue(''); - // this.formHead.getForm().findField('OPERATOREMAIL').setValue(''); - this.formHead.getForm().findField('OPERATORTEL').setValue(''); - // this.formHead.getForm().findField('OPERATORFAX').setValue(''); - - } - } - }, - scope: this - }); - - var sF = " ISFINANCIALSTAFF=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; - this.storeInfoClientContactFF.load({ params: { condition: sF }, - callback: function (r, options, success) { - if (success) { - if (this.storeInfoClientContactFF.getCount() > 0) { - var member = this.storeInfoClientContactFF.getAt(0); - this.comboxClientFCContact.setValue(member.data.SHOWNAME); - // this.formHead.getForm().findField('FINANCIALSTAFFEMAIL').setValue(member.data.EMAIL); - this.formHead.getForm().findField('FINANCIALSTAFFTEL').setValue(member.data.TEL); - // this.formHead.getForm().findField('FINANCIALSTAFFFAX').setValue(member.data.FAX); - } else { - this.comboxClientFCContact.setValue(''); - // this.formHead.getForm().findField('FINANCIALSTAFFEMAIL').setValue(''); - this.formHead.getForm().findField('FINANCIALSTAFFTEL').setValue(''); - // this.formHead.getForm().findField('FINANCIALSTAFFFAX').setValue(''); - - } - } - }, - scope: this - }); + //var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; + //this.storeInfoClientContact.load({ params: { condition: s }, + // callback: function (r, options, success) { + // if (success) { + // if (this.storeInfoClientContact.getCount() > 0) { + // var member = this.storeInfoClientContact.getAt(0); + // this.comboxInfoClientContact.setValue(member.data.SHOWNAME); + // // this.formHead.getForm().findField('OPERATOREMAIL').setValue(member.data.EMAIL); + // this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL); + // // this.formHead.getForm().findField('OPERATORFAX').setValue(member.data.FAX); + // } else { + // this.comboxInfoClientContact.setValue(''); + // // this.formHead.getForm().findField('OPERATOREMAIL').setValue(''); + // this.formHead.getForm().findField('OPERATORTEL').setValue(''); + // // this.formHead.getForm().findField('OPERATORFAX').setValue(''); + + // } + // } + // }, + // scope: this + //}); + + //var sF = " ISFINANCIALSTAFF=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; + //this.storeInfoClientContactFF.load({ params: { condition: sF }, + // callback: function (r, options, success) { + // if (success) { + // if (this.storeInfoClientContactFF.getCount() > 0) { + // var member = this.storeInfoClientContactFF.getAt(0); + // this.comboxClientFCContact.setValue(member.data.SHOWNAME); + // // this.formHead.getForm().findField('FINANCIALSTAFFEMAIL').setValue(member.data.EMAIL); + // this.formHead.getForm().findField('FINANCIALSTAFFTEL').setValue(member.data.TEL); + // // this.formHead.getForm().findField('FINANCIALSTAFFFAX').setValue(member.data.FAX); + // } else { + // this.comboxClientFCContact.setValue(''); + // // this.formHead.getForm().findField('FINANCIALSTAFFEMAIL').setValue(''); + // this.formHead.getForm().findField('FINANCIALSTAFFTEL').setValue(''); + // // this.formHead.getForm().findField('FINANCIALSTAFFFAX').setValue(''); + + // } + // } + // }, + // scope: this + //}); this.storeShipper.load({ params: { condition: "shippertype=2 AND (ISPUBLIC=1 OR CODENAME IN (SELECT CODENAME FROM info_client WHERE SHORTNAME='" + combo.value + "') )"} }); this.storeConsignee.load({ params: { condition: "shippertype=1 AND (ISPUBLIC=1 OR CODENAME IN (SELECT CODENAME FROM info_client WHERE SHORTNAME='" + combo.value + "') )"} }); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/HistryFeeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/HistryFeeIndex.js index 1587a71e..11d3d9df 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/HistryFeeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/HistryFeeIndex.js @@ -1065,6 +1065,11 @@ Ext.extend(Shipping.SeaeHistryFee, Ext.Panel, { this.parentWin.onPostDetailClick(NaN, NaN, this.feeType); this.parentWin.calcDetailTotal(); + this.parentWin.feeDrGridCheckBoxModel.selectAll(); + this.parentWin.feeCrGridCheckBoxModel.selectAll(); + + this.parentWin.feeDrGridCheckBoxModel.deselectAll(); + this.parentWin.feeCrGridCheckBoxModel.deselectAll(); // this.StoreFee.selected.selectAll(); //if (this.feeType == 1) { // this.parentWin.gridDrChFee.getSelectionModel().selectAll(); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index 5f4c8773..d40ee642 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -310,24 +310,24 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (selectdata.BSSOURCE != '') { this.formHead.getForm().findField('BSSOURCE').setValue(selectdata.BSSOURCE); } - var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + selectdata.CustName + "')"; - this.storeInfoClientContact.load({ - params: { condition: s }, - callback: function (r, options, success) { - if (success) { - if (this.storeInfoClientContact.getCount() > 0) { - var member = this.storeInfoClientContact.getAt(0); - this.comboxInfoClientContact.setValue(member.data.SHOWNAME); - this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL); - } else { - this.comboxInfoClientContact.setValue(''); - this.formHead.getForm().findField('OPERATORTEL').setValue(''); - - } - } - }, - scope: this - }); + //var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + selectdata.CustName + "')"; + //this.storeInfoClientContact.load({ + // params: { condition: s }, + // callback: function (r, options, success) { + // if (success) { + // if (this.storeInfoClientContact.getCount() > 0) { + // var member = this.storeInfoClientContact.getAt(0); + // this.comboxInfoClientContact.setValue(member.data.SHOWNAME); + // this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL); + // } else { + // this.comboxInfoClientContact.setValue(''); + // this.formHead.getForm().findField('OPERATORTEL').setValue(''); + + // } + // } + // }, + // scope: this + //}); } @@ -352,9 +352,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { _this.storeOpCode2.add(recordCustCode); this.formHead.getForm().findField('SALE').setValue(records[0].data.SALE); - if (records[0].data.OP != '') { - this.formHead.getForm().findField('OP').setValue(records[0].data.OP); - } + //if (records[0].data.OP != '') { + // this.formHead.getForm().findField('OP').setValue(records[0].data.OP); + //} if (this.formHead.getForm().findField('SERVICECONTRACTNO').getValue() == '' && records[0].data.CONTRACTNO != '') { this.formHead.getForm().findField('SERVICECONTRACTNO').setValue(records[0].data.CONTRACTNO); @@ -374,55 +374,55 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { BSSOURCEDETAIL.setValue(''); } } - var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; - this.storeInfoClientContact.load({ - params: { condition: s }, - callback: function (r, options, success) { - if (success) { - if (this.storeInfoClientContact.getCount() > 0) { - var member = this.storeInfoClientContact.getAt(0); - this.comboxInfoClientContact.setValue(member.data.SHOWNAME); - this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL); - } else { - this.comboxInfoClientContact.setValue(''); - this.formHead.getForm().findField('OPERATORTEL').setValue(''); - - } - } - }, - scope: this - }); + //var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; + //this.storeInfoClientContact.load({ + // params: { condition: s }, + // callback: function (r, options, success) { + // if (success) { + // if (this.storeInfoClientContact.getCount() > 0) { + // var member = this.storeInfoClientContact.getAt(0); + // this.comboxInfoClientContact.setValue(member.data.SHOWNAME); + // this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL); + // } else { + // this.comboxInfoClientContact.setValue(''); + // this.formHead.getForm().findField('OPERATORTEL').setValue(''); + + // } + // } + // }, + // scope: this + //}); - var sF = " ISFINANCIALSTAFF=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; - this.storeInfoClientContactFF.load({ - params: { condition: sF }, - callback: function (r, options, success) { - if (success) { - if (this.storeInfoClientContactFF.getCount() > 0) { - var member = this.storeInfoClientContactFF.getAt(0); - this.comboxClientFCContact.setValue(member.data.SHOWNAME); - } else { - this.comboxClientFCContact.setValue(''); - } - } - }, - scope: this - }); - var sF = " ISINSURANCE=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; - this.storeInfoClientContactIN.load({ - params: { condition: sF }, - callback: function (r, options, success) { - if (success) { - if (this.storeInfoClientContactIN.getCount() > 0) { - var member = this.storeInfoClientContactIN.getAt(0); - this.comboxClientContactIN.setValue(member.data.SHOWNAME); - } else { - this.comboxClientContactIN.setValue(''); - } - } - }, - scope: this - }); + //var sF = " ISFINANCIALSTAFF=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; + //this.storeInfoClientContactFF.load({ + // params: { condition: sF }, + // callback: function (r, options, success) { + // if (success) { + // if (this.storeInfoClientContactFF.getCount() > 0) { + // var member = this.storeInfoClientContactFF.getAt(0); + // this.comboxClientFCContact.setValue(member.data.SHOWNAME); + // } else { + // this.comboxClientFCContact.setValue(''); + // } + // } + // }, + // scope: this + //}); + //var sF = " ISINSURANCE=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')"; + //this.storeInfoClientContactIN.load({ + // params: { condition: sF }, + // callback: function (r, options, success) { + // if (success) { + // if (this.storeInfoClientContactIN.getCount() > 0) { + // var member = this.storeInfoClientContactIN.getAt(0); + // this.comboxClientContactIN.setValue(member.data.SHOWNAME); + // } else { + // this.comboxClientContactIN.setValue(''); + // } + // } + // }, + // scope: this + //}); if (this.formEdit.getForm().findField('SHIPPER').getValue() == '') { this.storeShipper.load({ @@ -15621,10 +15621,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (success) { var result = Ext.JSON.decode(response.responseText); if (result.Success) { - _this.formHead.getForm().findField('HBLNO').setDisabled(false); + // _this.formHead.getForm().findField('HBLNO').setDisabled(false); btnGetHblNo.setDisabled(false); } else { - _this.formHead.getForm().findField('HBLNO').setDisabled(true); +// _this.formHead.getForm().findField('HBLNO').setDisabled(true); btnGetHblNo.setDisabled(true); } }