diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js b/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js
index d0eb103e..ab8853f5 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js
@@ -939,7 +939,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
this.StoreOpLb.load({ params: { enumTypeId: 96005} });
this.comboxOpLb = Ext.create('DsExt.ux.RefTableCombox', {
- fieldLabel: Zi.LAN.BusinessType,//业务类型
+ fieldLabel: '业务类型',//业务类型
store: this.StoreOpLb,
name: 'PS_OPLB',
valueField: 'EnumValueName',
@@ -2140,7 +2140,12 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
dataIndex: 'RMBSTR',
align: 'right',
header: 'RMBSTR',
- width: 50
+ width: 60,
+ renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
+ if (value == 'RATE:') return 'EXRATE:';
+
+ return value;
+ }
}, {
sortable: true,
dataIndex: 'RMBAMOUNT',
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChSettlementBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChSettlementBLEdit.js
index d5a7a643..bf958c8d 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChSettlementBLEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChSettlementBLEdit.js
@@ -4385,7 +4385,7 @@ Ext.extend(Shipping.MsChSettlementBLEdit, Ext.Panel, {
this.formEdit.getForm().findField('SETTLEUSER').setDisabled(false);
this.formEdit.getForm().findField('COMPANYID').setDisabled(false);
this.formEdit.getForm().findField('SETTLEMODE').setDisabled(false);
- this.formEdit.getForm().findField('BILLTYPE').setDisabled(false);
+ //this.formEdit.getForm().findField('BILLTYPE').setDisabled(false);
var field = this.formEdit.getForm().findField('SETTLEMODE');
field.setValue(2);
var BILLTYPE = this.formEdit.getForm().findField('BILLTYPE').getValue();
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChSettlementRecvDuiEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChSettlementRecvDuiEdit.js
index fb1c13ff..9d955781 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChSettlementRecvDuiEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChSettlementRecvDuiEdit.js
@@ -164,10 +164,10 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
this.StoreDateCurr.load({ params: { condition: ""} });
this.comboxCurr = Ext.create('DsExt.ux.RefTableCombox', {
- fieldLabel: Zi.LAN.Currency,
+ fieldLabel:'折算币别',
store: this.StoreCurr,
forceSelection: true,
- allowBlank: false,
+ labelWidth: 60,
flex: 0.5,
name: 'CURR',
valueField: 'CURR',
@@ -244,7 +244,7 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
fieldLabel: Zi.LAN.SettlementType,
store: this.StoreStlMode,
forceSelection: true,
- flex: 0.5,
+ //flex: 0.5,
name: 'SETTLETYPE',
valueField: 'STLCODE',
displayField: 'STLNAME'
@@ -254,7 +254,7 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
model: 'BANK',
proxy: { url: '/MvcShipping/MsBaseInfo/GetBANKList' }
});
- //this.StoreBANK.load({ params: { condition: ""} });
+ this.StoreBANK.load({ params: { condition: "CURRENCY='RMB'"} });
this.StoreBANK.on('beforeload', function (store) {
var companyid = this.formEdit.getForm().findField('SALECORPID').getValue();
@@ -265,11 +265,63 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
fieldLabel: Zi.LAN.BankAccount,
store: this.StoreBANK,
forceSelection: true,
- name: 'ACCOUNT',
+ name: 'ACCOUNTRMB',
+ valueField: 'GID',
+ displayField: 'BANKACCOUNT'
+ });
+ this.StoreBANKUSD = Ext.create('DsExt.ux.RefTableStore', {
+ model: 'BANK',
+ proxy: { url: '/MvcShipping/MsBaseInfo/GetBANKList' }
+ });
+ this.StoreBANKUSD.load({ params: { condition: "CURRENCY='USD'" } });
+
+ this.StoreBANKUSD.on('beforeload', function (store) {
+ var companyid = this.formEdit.getForm().findField('SALECORPID').getValue();
+ Ext.apply(store.proxy.extraParams, { companyid: companyid });
+ }, this);
+ this.comboxBANKUSD = Ext.create('DsExt.ux.RefTableCombox', {
+ fieldLabel: 'USD银行账号',
+ store: this.StoreBANKUSD,
+ //flex: 1.5,
+ labelWidth: 80,
+ forceSelection: true,
+ name: 'ACCOUNTUSD',
valueField: 'GID',
displayField: 'BANKACCOUNT'
});
+ this.storeBILLTYPE = Ext.create('Ext.data.Store', {
+ fields: ['FSTATUS', 'NAME']
+ });
+ this.storeBILLTYPE.add({ "FSTATUS": 1, "NAME": '应收' });
+ this.storeBILLTYPE.add({ "FSTATUS": 2, "NAME": '应付' });
+
+ this.comboxBILLTYPE = Ext.create('DsExt.ux.RefTableCombox', {
+ fieldLabel: '收付',
+ store: this.storeBILLTYPE,
+ valueField: 'FSTATUS',
+ displayField: 'NAME',
+ flex: 0.5,
+ labelWidth: 70,
+ // flex: 0.7,
+ // labelWidth: 55,
+ forceSelection: true,
+ name: 'BILLTYPE',
+ value: 2,
+ listeners: {
+ scope: this,
+ 'select': function (combo, records, eOpts) {
+ if (records.length > 0) {
+ if (combo.value == 1)
+ this.formSearch.getForm().findField('DC').setValue('1');
+ else
+ this.formSearch.getForm().findField('DC').setValue('2');
+
+ }
+
+ }
+ }
+ });
this.storeSTLCATEGROY = Ext.create('DsExt.ux.RefEnumStore', {});
@@ -301,23 +353,6 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
- var CURR = this.formEdit.getForm().findField('CURR').getValue();
- this.StoreBANK.load({
- params: {condition: "" },
- callback: function (r, options, success) {
- if (success) {
- if (this.StoreBANK.getCount() > 0) {
- for (var i = 0; i < this.StoreBANK.getCount(); i += 1) {
- var member = this.StoreBANK.getAt(i);
- if (member.data.CURRENCY == CURR && member.data.ISDEF == 'True') {
- this.formEdit.getForm().findField('ACCOUNT').setValue(member.data.GID);
- }
- }
- }
- }
- },
- scope: this
- });
}
@@ -337,7 +372,7 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
margins: '2 2 2 2',
labelAlign: 'right',
flex: 1,
- labelWidth: 90,
+ labelWidth: 70,
msgTarget: 'qtip'
},
@@ -371,9 +406,6 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
}, {
fieldLabel: 'SETTLEMODE',
name: 'SETTLEMODE', flex: 0, hidden: true, margins: '0'
- }, {
- fieldLabel: 'BILLTYPE',
- name: 'BILLTYPE', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'ISEXPORT',
name: 'ISEXPORT', flex: 0, hidden: true, margins: '0'
@@ -389,7 +421,13 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
}, {
fieldLabel: 'BUYRATE',
name: 'BUYRATE', flex: 0, hidden: true, margins: '0'
- }, {
+ }, {
+ fieldLabel: Zi.LAN.ExchangeRate,
+ flex: 0.5,
+ labelWidth: 50,
+ hidden: true,
+ name: 'RATE'
+ }, {
fieldLabel: 'SELLRATE',
name: 'SELLRATE', flex: 0, hidden: true, margins: '0'
}, {
@@ -416,45 +454,59 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
fieldLabel: Zi.LAN.SettlementUser,
readOnly: true,
name: 'SETTLEUSERREF'
- }
+ }, this.comboxSaleCompany
]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
- items: [this.comboxCurr, {
- fieldLabel: Zi.LAN.Money,
- readOnly: true,
- flex: 0.5,
- labelWidth: 40,
- name: 'AMOUNT',
- renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
- try {
- var lsValue = usMoney(value, 2, '', false);
- if (lsValue != "NaN") {
- value = lsValue; if (parseFloat(lsValue) < 0) {
- return '' + lsValue + '';
+ items: [this.comboxBILLTYPE, this.comboxCurr, this.comboxStlMode, {
+ fieldLabel: 'RMB金额',
+ //flex: 0.6,
+ //labelWidth: 60,
+ readOnly: true,
+ name: 'AMOUNTRMB',
+ renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
+ try {
+ var lsValue = usMoney(value, 2, '', false);
+ if (lsValue != "NaN") {
+ value = lsValue; if (parseFloat(lsValue) < 0) {
+ return '' + lsValue + '';
+ }
+ }
+ else {
+ return value;
}
}
- else {
+ catch (e) {
return value;
}
- }
- catch (e) {
return value;
}
- return value;
- }
- }, this.comboxStlMode, {
- fieldLabel: Zi.LAN.ExchangeRate,
- flex: 0.5,
- labelWidth: 50,
- name: 'RATE'
- }, this.comboxBANK, {
- fieldLabel: Zi.LAN.SettlementNo,
- flex: 1,
- name: 'SETTLENO'
- },this.comboxSaleCompany]
+ }, {
+ fieldLabel: 'USD金额',
+ //flex: 0.6,
+ //labelWidth: 60,
+ readOnly: true,
+ name: 'AMOUNTUSD',
+ renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
+ try {
+ var lsValue = usMoney(value, 2, '', false);
+ if (lsValue != "NaN") {
+ value = lsValue; if (parseFloat(lsValue) < 0) {
+ return '' + lsValue + '';
+ }
+ }
+ else {
+ return value;
+ }
+ }
+ catch (e) {
+ return value;
+ }
+ return value;
+ }
+ }, this.comboxBANK, this.comboxBANKUSD]
}, {
xtype: 'container',
@@ -463,10 +515,12 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
items: [{
fieldLabel: Zi.LAN.JSDanWeiBank,
flex: 1,
+ labelWidth: 80,
name: 'CUSTBANK'
}, {
fieldLabel: Zi.LAN.JSDanWeiAccount ,
flex: 1,
+ labelWidth: 80,
name: 'CUSTACCOUNT'
}, this.comboxSTLCATEGROY, {
fieldLabel: Zi.LAN.Remark,
@@ -475,7 +529,11 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
}, {
fieldLabel: Zi.LAN.VoucherNo,
name: 'VOUCHERNO'
- }]
+ }, {
+ fieldLabel: Zi.LAN.SettlementNo,
+ flex: 1,
+ name: 'SETTLENO'
+ }]
}
]//end items(fieldset 1)
@@ -3673,11 +3731,11 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
this.formEdit.getForm().findField('SETTLEUSER').setDisabled(false);
this.formEdit.getForm().findField('COMPANYID').setDisabled(false);
this.formEdit.getForm().findField('SETTLEMODE').setDisabled(false);
- this.formEdit.getForm().findField('BILLTYPE').setDisabled(false);
+ //this.formEdit.getForm().findField('BILLTYPE').setDisabled(false);
var field = this.formEdit.getForm().findField('SETTLEMODE');
field.setValue(2);
- var field = this.formEdit.getForm().findField('BILLTYPE');
- field.setValue(1);
+ //var field = this.formEdit.getForm().findField('BILLTYPE');
+ //field.setValue(1);
var data = basicForm.getValues();
var accountsdata = this.formACCOUNTS.getForm().getValues();
@@ -3692,7 +3750,7 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
this.formEdit.getForm().findField('SETTLEUSER').setDisabled(true);
this.formEdit.getForm().findField('COMPANYID').setDisabled(true);
this.formEdit.getForm().findField('SETTLEMODE').setDisabled(true);
- this.formEdit.getForm().findField('BILLTYPE').setDisabled(true);
+ //this.formEdit.getForm().findField('BILLTYPE').setDisabled(true);
Ext.Msg.wait(Zi.LAN.Msg_SavingAndWait);
Ext.Ajax.request({
@@ -3905,11 +3963,11 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
this.formEdit.getForm().findField('SETTLEUSER').setDisabled(false);
this.formEdit.getForm().findField('COMPANYID').setDisabled(false);
this.formEdit.getForm().findField('SETTLEMODE').setDisabled(false);
- this.formEdit.getForm().findField('BILLTYPE').setDisabled(false);
+ //this.formEdit.getForm().findField('BILLTYPE').setDisabled(false);
var field = this.formEdit.getForm().findField('SETTLEMODE');
field.setValue(2);
- var field = this.formEdit.getForm().findField('BILLTYPE');
- field.setValue(1);
+ //var field = this.formEdit.getForm().findField('BILLTYPE');
+ //field.setValue(1);
var data = basicForm.getValues();
var accountsdata = this.formACCOUNTS.getForm().getValues();
@@ -3923,7 +3981,7 @@ Ext.extend(Shipping.ChSettlementRecvDuiEdit, Ext.Panel, {
this.formEdit.getForm().findField('SETTLEUSER').setDisabled(true);
this.formEdit.getForm().findField('COMPANYID').setDisabled(true);
this.formEdit.getForm().findField('SETTLEMODE').setDisabled(true);
- this.formEdit.getForm().findField('BILLTYPE').setDisabled(true);
+ //this.formEdit.getForm().findField('BILLTYPE').setDisabled(true);
Ext.Msg.wait(Zi.LAN.Msg_SavingAndWait);
Ext.Ajax.request({