Skip to content

L
leaf-hlcm
Commit 828bae68 authored by Darming's avatar Darming
Browse files
Options

Merge branch 'feature/before_incept_bugs' into develop

parents a36a47a3 43923303
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 33 deletions
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ 828bae68
...@@ -57,23 +57,13 @@ ...@@ -57,23 +57,13 @@
record.set('write_off_flag', 'DISABLED'); record.set('write_off_flag', 'DISABLED');
var paid_byother_flag = record.get('paid_byother_flag'); if (record.get('collection_classes') == 'DEPOSIT') {
if (paid_byother_flag == 'T') { record.set('transaction_type', 'DEPOSIT');
//代付非保证金类 --> 直接从银行过账到预收科目 } else {
if (record.get('collection_classes') == 'DEPOSIT') { record.set('transaction_type', 'RECEIPT');
record.set('transaction_type', 'DEPOSIT');
} else {
record.set('transaction_type', 'ADVANCE_RECEIPT');
}
} else if (paid_byother_flag == 'F') {
if (record.get('collection_classes') == 'DEPOSIT') {
record.set('transaction_type', 'DEPOSIT');
} else {
record.set('transaction_type', 'RECEIPT');
}
} }
if(!record.get('transaction_type')){ if (!record.get('transaction_type')) {
continue; continue;
} }
...@@ -100,10 +90,10 @@ ...@@ -100,10 +90,10 @@
//关闭该导入的界面 //关闭该导入的界面
backBtn(); backBtn();
}, },
failure:function(){ failure: function () {
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
}, },
error:function(){ error: function () {
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
} }
}); });
...@@ -115,22 +105,7 @@ ...@@ -115,22 +105,7 @@
} }
function update_import_data(ds, record, name, value, oldvalue) { function update_import_data(ds, record, name, value, oldvalue) {
if (name == 'paid_byother_flag') {
if (value == 'T') {
//代付非保证金类 --> 直接从银行过账到预收科目
if (record.get('collection_classes') == 'DEPOSIT') {
record.set('transaction_type', 'DEPOSIT');
} else {
record.set('transaction_type', 'ADVANCE_RECEIPT');
}
} else if (value == 'F') {
if (record.get('collection_classes') == 'DEPOSIT') {
record.set('transaction_type', 'DEPOSIT');
} else {
record.set('transaction_type', 'RECEIPT');
}
}
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment