Skip to content

L
leaf-hlcm
Commit c8ab0da5 authored by niminmin's avatar niminmin
Browse files
Options

Merge branch 'feature/收款维护开发' into develop

parents cc615461 f2011154
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 110 deletions
src/main/webapp/WEB-INF/classes/acr/ACR610/acr_invoice_apply_detail.lwm
View file @ c8ab0da5
......@@ -57,6 +57,7 @@
Where ctr.transaction_id = cw.csh_transaction_id
and al.cashflow_id = cw.cashflow_id
and cw.reversed_flag='N'
and cw.cf_item<>2
and ctr.paid_byother_flag='T'),0,'F','T') paid_byother_flag,
(Select v.code_value_name
From sys_code_values_v v
......@@ -67,6 +68,7 @@
Where ctr.transaction_id = cw.csh_transaction_id
and al.cashflow_id = cw.cashflow_id
and cw.reversed_flag='N'
and cw.cf_item<>2
and ctr.paid_byother_flag='T'),0,'F','T')) paid_byother_flag_n,
(case when al.cf_item<>'9' then cwo.received_amount else
al.total_amount end)received_amount,
......@@ -77,6 +79,7 @@
Where ctr.transaction_id = cw.csh_transaction_id
and al.cashflow_id = cw.cashflow_id
and cw.reversed_flag='N'
and cw.cf_item<>2
and nvl(ctr.guarantor_name_duty,'N')='Y'),0,'N','Y') guarantor_name_duty,
(Select to_char(max(cw.write_off_date),'yyyy-mm-dd')
From csh_transaction ctr,csh_write_off cw
......@@ -95,6 +98,7 @@
And alw.cashflow_id = cco.cashflow_id
and cw.reversed_flag='N'
and ctr.paid_byother_flag='T'
and cw.cf_item<>2
and nvl(ctr.guarantor_name_duty,'N')='N')paid_byother_sum_flag,
null attachment
From acr_invoice_apply aa,
......
src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm
View file @ c8ab0da5
......@@ -80,6 +80,6 @@
<bm:query-field field="write_off_id" queryOperator="="/>
<bm:query-field field="csh_transaction_id" queryOperator="="/>
<bm:query-field field="reversed_flag" queryOperator="="/>
<bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;)))"/>
<bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;,&apos;RECEIPT_DEPOSIT_POOL&apos;)))"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm
View file @ c8ab0da5
......@@ -58,20 +58,18 @@ select t.parent_company_id company_id
<bm:query-field field="dd_bank_account_name" queryOperator="="/>
<!--<bm:query-field name="bp_id"
queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id} or ((select bp_category from hls_bp_master where bp_id = ${@bp_id}) = 'VENDER'))"/>-->
<bm:query-field name="bp_id" queryExpression="(Exists (Select 1 From (Select h.bp_id From hls_bp_master h Where h.bp_name = (Select hbm.bp_name From hls_bp_master hbm Where hbm.bp_id = ${@bp_id})) t1 Where t1.bp_id = t.bp_id_tenant) Or Exists
(Select 1
From (Select h.bp_id
From hls_bp_master h
Where h.bp_name =
(Select hbm.bp_name
From hls_bp_master hbm
Where hbm.bp_id = ${@bp_id})) t2
Where t2.bp_id = t.bp_id_agent_level1) Or Exists
(Select 1
From con_contract_lease_item ccli, hls_lease_item hli
Where ccli.lease_item_id = hli.lease_item_id
And hli.vender_id = ${@bp_id}
And t.contract_id = ccli.contract_id))"/>
<bm:query-field name="bp_id" queryExpression="(Exists (Select 1
From hls_bp_master h, hls_bp_master_role hbr
Where h.bp_id = ${@bp_id}
and hbr.bp_id = h.bp_id
and hbr.bp_type = 'TENANT'
and h.bp_id = t.bp_id_tenant) Or not Exists
(Select 1
From hls_bp_master h, hls_bp_master_role hbr
Where h.bp_id = ${@bp_id}
and hbr.bp_id = h.bp_id
and hbr.bp_type = 'TENANT'
))"/>
<bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_plan_query.lwm
View file @ c8ab0da5
......@@ -16,7 +16,7 @@
<bm:field name="write_off_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="WRITE_OFF_AMOUNT" prompt="核销金额"/>
<bm:field name="write_off_date" databaseType="DATE" datatype="java.util.Date" physicalName="WRITE_OFF_DATE" prompt="CSH_TRANSACTION_PLAN.WRITE_OFF_DATE"/>
<bm:field name="company_id" databaseType="NUMBER" databasetype="java.lang.Long" physicalName="COMPANY_ID" prompt="CSH_TRANSACTION_PLAN.COMPANY_ID"/>
<bm:field name="create_wf_flag_desc" expression="(decode(t1.create_wf_flag,'Y','是','否'))"/>
<bm:field name="create_wf_flag_desc" expression="(decode(t1.create_wf_flag,'Y','是','否'))" forInsert="false" forceUpdate="false"/>
<bm:field name="create_wf_flag"/>
</bm:fields>
<bm:query-fields>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_transaction_miantain_query.lwm
View file @ c8ab0da5
......@@ -109,6 +109,7 @@
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.transaction_type in (&apos;DEPOSIT&apos;))"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is null)"/>
<bm:data-filter name="query" expression="(nvl(t1.reversed_flag,'N') = 'N')"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag not in('ACCAUDITING','NEW','CT_REJECTED'))"/>
<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
</bm:data-filters>
......
src/main/webapp/modules/acr/ACR610/acr_invoice_apply_detail.lview
View file @ c8ab0da5
......@@ -99,7 +99,6 @@
return '<a href="javascript:acr610_detail_grid_readonly(' + record.id + ',' + record.get('invoice_hd_wfl_id') + ');">' + value + '</a>';
}
if (name == 'attachment') {
if(record.get('cf_item') != '2') {
if (record.get('invoice_kind') == '0') {
if (record.get('paid_byother_flag') == 'T') {
if (record.get('guarantor_name_duty') != 'Y' || record.get('guarantor_name_duty') == 'NULL') {
......@@ -114,7 +113,6 @@
}
}
}
}
}
if (name == 'received_amount') {
debugger;
......
src/main/webapp/modules/acr/ACR610/acr_invoice_apply_detail_wfl.lview
View file @ c8ab0da5
......@@ -99,7 +99,6 @@
return '<a href="javascript:acr610_detail_grid_readonly(' + record.id + ',' + record.get('invoice_hd_wfl_id') + ');">' + value + '</a>';
}
if (name == 'attachment') {
if(record.get('cf_item') != '2') {
if (record.get('invoice_kind') == '0') {
if (record.get('paid_byother_flag') == 'T') {
if (record.get('guarantor_name_duty') != 'Y' || record.get('guarantor_name_duty') == 'NULL') {
......@@ -114,7 +113,6 @@
}
}
}
}
}
if (name == 'received_amount') {
if ((!Leaf.isEmpty(value) && value > 0)&&record.get('cf_item') != '9') {
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
View file @ c8ab0da5
......@@ -80,6 +80,12 @@
function csh511_receipt_save() {
var record=$('csh_transaction_receipt_head_ds').getAt(0);
if (record.get('collection_classes') == 'COMBINED') {
if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
return;
}
}
// Leaf.Masker.mask(Ext.getBody());
// Leaf.request({
// url: $('csh510_update_bp_info_link').getUrl(),
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ c8ab0da5
......@@ -55,6 +55,12 @@
//不将这条数据传递到数组中
continue;
}
if (record.get('collection_classes') == 'COMBINED') {
if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
return;
}
}
//否则的话添加必要的字段
record.set('receipt_type', 'IMPORT');
record.set('bank_account_num', record.get('attribute_1'));
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ c8ab0da5
......@@ -95,6 +95,14 @@
$('csh511_receipt_save').disable();
if ($('csh_transaction_receipt_head_ds').validate()) {
var record = $('csh_transaction_receipt_head_ds').getAt(0);
if (record.get('collection_classes') == 'COMBINED') {
if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
$('csh511_receipt_save').enable();
return;
}
}
if (flag != 'Y') {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.SAVING}');
}
......@@ -246,24 +254,24 @@
record.set('transaction_type', 'RECEIPT');
}
}
// else if(name == 'extra_nam'){
// //深圳美鹏
// // var extra_nam = record.get('extra_nam');
// var bp_code = record.get('bp_code');
// //bp_code == 'C00010168'
// if (bp_code == 'D00010001' || bp_code == 'D00000009'){
// record.getField('guarantor_name_duty_desc').setReadOnly(false);
// record.set('guarantor_name_duty_desc','是');
// record.set('guarantor_name_duty','Y');
// record.getField('guarantor_name_duty_desc').setRequired(true);
// }else if (bp_code != 'D00010001' || bp_code == 'D00000009'){
// record.getField('guarantor_name_duty_desc').setReadOnly(true);
// record.set('guarantor_name_duty_desc','否');
// record.set('guarantor_name_duty','N');
// record.getField('guarantor_name_duty_desc').setRequired(false);
// }
// else if(name == 'extra_nam'){
// //深圳美鹏
// // var extra_nam = record.get('extra_nam');
// var bp_code = record.get('bp_code');
// //bp_code == 'C00010168'
// if (bp_code == 'D00010001' || bp_code == 'D00000009'){
// record.getField('guarantor_name_duty_desc').setReadOnly(false);
// record.set('guarantor_name_duty_desc','是');
// record.set('guarantor_name_duty','Y');
// record.getField('guarantor_name_duty_desc').setRequired(true);
// }else if (bp_code != 'D00010001' || bp_code == 'D00000009'){
// record.getField('guarantor_name_duty_desc').setReadOnly(true);
// record.set('guarantor_name_duty_desc','否');
// record.set('guarantor_name_duty','N');
// record.getField('guarantor_name_duty_desc').setRequired(false);
// }
// }
else if (name =='bp_code') {
else if (name == 'bp_code') {
var bp_id = record.get('bp_id');
Leaf.request({
url: $('extra_nam_csh_transaction_receipt_data_link_id').getUrl(),
......@@ -291,12 +299,12 @@
success: function (res) {
var unit_code = res.result.unit_code;
if (unit_code == 241 || unit_code == 610) {
if(record.get('paid_byother_flag') == 'T'){
if (record.get('paid_byother_flag') == 'T') {
record.getField('guarantor_name_duty_desc').setReadOnly(false);
record.set('guarantor_name_duty_desc', '是');
record.set('guarantor_name_duty', 'Y');
record.getField('guarantor_name_duty_desc').setRequired(true);
}else if(record.get('paid_byother_flag') == 'F'){
} else if (record.get('paid_byother_flag') == 'F') {
record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc', '否');
record.set('guarantor_name_duty', 'N');
......@@ -333,10 +341,10 @@
Leaf.Masker.unmask(Ext.getBody());
}
});
}else if(name == 'paid_byother_flag'){
if(record.get('paid_byother_flag') =='T'){
} else if (name == 'paid_byother_flag') {
if (record.get('paid_byother_flag') == 'T') {
var extra_id = record.get('bp_id');
if (extra_id != null){
if (extra_id != null) {
Leaf.request({
url: $('get_extra_code_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id: extra_id},
......@@ -362,15 +370,15 @@
Leaf.Masker.unmask(Ext.getBody());
}
});
}else {
} else {
record.getField('guarantor_name_duty_desc').setReadOnly(false);
record.set('guarantor_name_duty_desc', '是');
record.set('guarantor_name_duty', 'Y');
record.getField('guarantor_name_duty_desc').setRequired(true);
}
}else if(record.get('paid_byother_flag') =='F'){
} else if (record.get('paid_byother_flag') == 'F') {
var extra_id = record.get('bp_id');
if (extra_id != undefined){
if (extra_id != undefined) {
Leaf.request({
url: $('get_extra_code_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id: extra_id},
......@@ -396,7 +404,7 @@
Leaf.Masker.unmask(Ext.getBody());
}
});
}else {
} else {
record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc', '否');
record.set('guarantor_name_duty', 'N');
......@@ -405,6 +413,7 @@
}
}
}
// function onAdd_csh511_receipt(ds, record) {
// record.set('precision',2);
// record.set('zero_amounts_allowed','N');
......@@ -426,8 +435,8 @@
record.set('currency_name', '人民币');
record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc','否');
record.set('guarantor_name_duty','N');
record.set('guarantor_name_duty_desc', '否');
record.set('guarantor_name_duty', 'N');
}
......@@ -525,7 +534,7 @@
});
} else {
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
return;
}
}
......@@ -590,7 +599,8 @@
</a:field>
<!--担保人履行担保义务-->
<a:field name="guarantor_name_duty_desc" displayField="code_value_name" options="yes_no_ds" prompt="担保人履行担保义务" returnField="guarantor_name_duty" valueField="code_value"/>
<a:field name="guarantor_name_duty_desc" displayField="code_value_name" options="yes_no_ds"
prompt="担保人履行担保义务" returnField="guarantor_name_duty" valueField="code_value"/>
<a:field name="guarantor_name_duty" required="true"/>
<!-- <a:field name="bank_slip_num" lovGridHeight="350" lovHeight="600" lovService="csh.CSH510.csh_transaction_contract_query" lovWidth="1200" title="合同编号">
......@@ -669,8 +679,9 @@
<a:field name="bp_bank_account_num"/>
<a:field name="bp_bank_account_name" required="true"/>
<a:field name="collection_classes" />
<a:field name="collection_classes_desc" required="true" options="ds_collection_classes_ds" prompt="款项用途"
<a:field name="collection_classes"/>
<a:field name="collection_classes_desc" required="true" options="ds_collection_classes_ds"
prompt="款项用途"
displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<a:field name="paid_byother_flag_n" options="PAID_BYOTHER_FLAG_DS" returnField="paid_byother_flag"
displayField="code_value_name" valueField="code_value" required="true"/>
......@@ -745,11 +756,11 @@
</a:box>
<a:hBox style="width:800px">
<a:textField width="300" name="description" bindTarget="csh_transaction_receipt_head_ds"/>
<a:textField width="300" name="description" bindTarget="csh_transaction_receipt_head_ds"/>
<!--代理店简称-->
<a:lov name="extra_nam" bindTarget="csh_transaction_receipt_head_ds"
prompt="代理店简称" width="180" readOnly="true" />
<!--代理店简称-->
<a:lov name="extra_nam" bindTarget="csh_transaction_receipt_head_ds"
prompt="代理店简称" width="180" readOnly="true"/>
</a:hBox>
<a:hBox style="width:800px">
......@@ -758,7 +769,7 @@
bindTarget="csh_transaction_receipt_head_ds"/>
<!--担保人履行担保义务-->
<a:comboBox name="guarantor_name_duty_desc" bindTarget="csh_transaction_receipt_head_ds"
prompt="担保人履行担保义务" width="180" />
prompt="担保人履行担保义务" width="180"/>
</a:hBox>
</a:fieldSet>
<!--删除下面的字段 currency_name,bank_account_name,banka,bank_branch_name,bank_account_num,bank_account_type_name,exchange_rate_type_display-->
......
src/main/webapp/modules/csh/CSH531C/csh_bank_transfer_confirme.lview
View file @ c8ab0da5
......@@ -390,6 +390,8 @@
readOnly: readOnly,
interfaceQueryFlag: interfaceQueryFlag,
approval_flag: approval_flag,
collection_classes:record.get('collection_classes'),
transaction_type:transaction_type||'RECEIPT',
winid: 'csh_write_off_window'
},
url: $('batch_detail_link').getUrl(),
......
src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview
View file @ c8ab0da5
......@@ -399,6 +399,8 @@
readOnly: readOnly,
interfaceQueryFlag: interfaceQueryFlag,
approval_flag: approval_flag,
collection_classes:record.get('collection_classes'),
transaction_type:transaction_type||'RECEIPT',
winid: 'csh_write_off_window'
},
url: $('batch_detail_link').getUrl(),
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ c8ab0da5
......@@ -9,7 +9,8 @@
<a:link id="csh531n_submit_link_id" model="csh.CSH531N.csh_data_confirm" modelaction="execute"/>
<a:link id="transaction_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="transaction_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="csh531n_submit_interface_link_id" model="csh.CSH531N.csh_write_off_interface" modelaction="batch_update"/>
<a:link id="csh531n_submit_interface_link_id" model="csh.CSH531N.csh_write_off_interface"
modelaction="batch_update"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<script type="text/javascript"><![CDATA[
......@@ -28,7 +29,7 @@
function init() {
if ('${/parameter/@depositDisplayFlag}' == 'Y') {
if ('${/parameter/@collection_classes}' == 'COMBINED' && '${/parameter/@transaction_type}' !== 'DEPOSIT') {
document.getElementById('write_off_deposit').style.display = 'block';
}
if ('${/parameter/@advanceDisplayFlag}' == 'Y') {
......@@ -38,6 +39,8 @@
if ('${/parameter/@readOnly}' == 'Y') {
$('csh_grid_add_bt').setVisible(false);
$('csh_grid_delete_bt').setVisible(false);
$('csh_grid_deposit_add_bt').setVisible(false);
$('csh_grid_deposit_delete_bt').setVisible(false);
$('csh_write_off_grid').hideColumn('left_amount');
$('csh_write_off_grid').hideColumn('left_principal');
$('csh_write_off_grid').hideColumn('left_interest');
......@@ -68,7 +71,7 @@
var readOnly = '${/parameter/@readOnly}';
var write_off_type = record.get('write_off_type');
if (batch_status == 'SUBMIT' || readOnly == 'Y') {
return;
} else {
if (name == 'contract_number') {
if (write_off_type != 'DEPOSIT_POOL_CREDIT') {
......@@ -112,7 +115,7 @@
if (name == 'write_off_classification_desc') {
return 'csh_write_off_grid_cb';
}
return;
}
}
......@@ -149,7 +152,7 @@
function csh531_update_fun(ds, record, name, value, oldValue) {
if (name == 'write_off_amount') {
if(!checkAmount()){
if (!checkAmount()) {
setTimeout(function () {//防止递归
record.set(name, oldValue);
});
......@@ -176,7 +179,7 @@
} else {
record.set('write_off_principal', null);
}
x_amount = minus(value,left_principal);
x_amount = minus(value, left_principal);
if (left_interest > 0) {
record.set('write_off_interest', x_amount);
} else {
......@@ -276,8 +279,8 @@
record.set('left_principal', '');
record.set('left_interest', '');
}
if (name == 'wirte_off_date'){
record.set('journal_date',value);
if (name == 'wirte_off_date') {
record.set('journal_date', value);
}
}
......@@ -377,29 +380,29 @@
for (var i = 0; i < write_off_recs.length; i++) {
var t = parseFloat(write_off_recs[i].get('write_off_amount'));
if (!isNaN(t)) {
sum = plus(sum,t);
sum = plus(sum, t);
}
}
var deposit_recs = $('csh_transaction_deposit_ds').getAll();
for (var i = 0; i < deposit_recs.length; i++) {
var t = parseFloat(deposit_recs[i].get('write_off_amount'));
if (!isNaN(t)) {
sum = plus(sum,t);
sum = plus(sum, t);
}
}
var advanced_recs = $('csh_transaction_advanced_ds').getAll();
for (var i = 0; i < advanced_recs.length; i++) {
var t = parseFloat(advanced_recs[i].get('write_off_amount'));
if (!isNaN(t)) {
sum = plus(sum,t);
sum = plus(sum, t);
}
}
var h_record = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
var for_allocate_amount = 0;
if(h_record.get('unwrite_off_amount') && h_record.get('unwrite_off_amount') > 0){
for_allocate_amount = minus(h_record.get('unwrite_off_amount'),sum);
if (h_record.get('unwrite_off_amount') && h_record.get('unwrite_off_amount') > 0) {
for_allocate_amount = minus(h_record.get('unwrite_off_amount'), sum);
}
h_record.set('for_allocate_amount',for_allocate_amount);
h_record.set('for_allocate_amount', for_allocate_amount);
}
function csh531n_write_off_return() {
......@@ -495,10 +498,10 @@
var record = ds.getCurrentRecord();
// var header_id = '${/parameter/@transaction_id}';
var header_id = record.get('transaction_id');
if(record.get('transaction_type') == 'ADVANCE_RECEIPT'||record.get('transaction_type') == 'DEPOSIT'){
if (record.get('transaction_type') == 'ADVANCE_RECEIPT' || record.get('transaction_type') == 'DEPOSIT') {
header_id = record.get('source_csh_trx_id');
}
if(header_id){
if (header_id) {
var url = $('transaction_downloadFile_id').getUrl() + '?table_name=CSH_TRANSACTION&header_id=' + header_id;
var win = new Leaf.Window({
url: url,
......@@ -515,7 +518,7 @@
// });
} else {
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
return;
}
}
......@@ -533,7 +536,7 @@
var datas = [];
var para = {};
var records = $('csh_write_off_interface_ds').getAll();
for (var i = 0;i < records.length;i++) {
for (var i = 0; i < records.length; i++) {
para = records[i].data;
para['_status'] = 'update';
datas.push(para);
......@@ -541,17 +544,17 @@
Leaf.request({
url: $('csh531n_submit_interface_link_id').getUrl(),
para: datas,
success: function(res) {
success: function (res) {
Leaf.Masker.unmask(Ext.getBody());
$('csh_transaction_deposit_ds').submit();
$('csh_transaction_advanced_ds').submit();
csh531_submitsuccess();
},
failure: function() {
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
csh531_submitfailed();
},
error: function() {
error: function () {
Leaf.Masker.unmask(Ext.getBody());
csh531_submitfailed();
},
......@@ -569,21 +572,21 @@
for (var i = 0; i < write_off_recs.length; i++) {
var t = parseFloat(write_off_recs[i].get('write_off_amount'));
if (!isNaN(t)) {
sum = plus(sum,t);
sum = plus(sum, t);
}
}
var deposit_recs = $('csh_transaction_deposit_ds').getAll();
for (var i = 0; i < deposit_recs.length; i++) {
var t = parseFloat(deposit_recs[i].get('write_off_amount'));
if (!isNaN(t)) {
sum = plus(sum,t);
sum = plus(sum, t);
}
}
var advanced_recs = $('csh_transaction_advanced_ds').getAll();
for (var i = 0; i < advanced_recs.length; i++) {
var t = parseFloat(advanced_recs[i].get('write_off_amount'));
if (!isNaN(t)) {
sum = plus(sum,t);
sum = plus(sum, t);
}
}
var header_rec = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
......@@ -617,16 +620,17 @@
function csh_deposit_edit_function(record, name) {
if ('${/parameter/@readOnly}' == 'Y') {
return;
} else {
if (name == 'write_off_amount') {
return 'csh_transaction_deposit_grid_nf';
}
}
}
function csh_advance_edit_function(record, name) {
if ('${/parameter/@readOnly}' == 'Y') {
return;
} else {
if (name == 'write_off_amount') {
var r = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
......@@ -673,7 +677,7 @@
// Leaf.showInfoMessage("提示", "存在未保存数据，请先保存再进行提交操作！");
// return;
// }
sum = plus(sum,allRs[i].get('write_off_amount') || 0);
sum = plus(sum, allRs[i].get('write_off_amount') || 0);
}
if (sum == 0) {
......@@ -681,13 +685,13 @@
return;
}
// 以旧换新与三方协议合同的首付款不可进行电汇核销
var cf_item_2_count=0;
var cf_item_2_count = 0;
for (var i = 0; i < interfaceRs.length; i++) {
if ((interfaceRs[i].get('payment_deduction')=='TRADE_IN'||interfaceRs[i].get('payment_deduction')=='TRI_AGREEMENT')&&interfaceRs[i].get('write_off_cf_item')=='2') {
cf_item_2_count = plus(cf_item_2_count,1);
if ((interfaceRs[i].get('payment_deduction') == 'TRADE_IN' || interfaceRs[i].get('payment_deduction') == 'TRI_AGREEMENT') && interfaceRs[i].get('write_off_cf_item') == '2') {
cf_item_2_count = plus(cf_item_2_count, 1);
}
}
if (cf_item_2_count>0) {
if (cf_item_2_count > 0) {
Leaf.showInfoMessage('提示', ' 首付款抵扣为“无”以外的合同，不可进行首付款电汇核销！');
return;
}
......@@ -723,15 +727,15 @@
}
function write_off_amount_dblclick(grid, record, row, name) {
if(!record){
if (!record) {
record = grid.record;
}
var head_record = $('csh_transaction_receipt_write_off_detail_ds').getAt(0);
// record = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
var for_allocate_amount = head_record.get('for_allocate_amount'),
unreceived_amount = record.get('unreceived_amount');
if(unreceived_amount){
if (Ext.isEmpty(record.get('write_off_amount'))||record.get('write_off_amount') == 0) {
if (unreceived_amount) {
if (Ext.isEmpty(record.get('write_off_amount')) || record.get('write_off_amount') == 0) {
record.set('write_off_amount', get_min_amount(for_allocate_amount, unreceived_amount));
}
}
......@@ -776,7 +780,7 @@
displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<a:field name="ref_v01"/>
<a:field name="approving_return_amount" readOnly="true"/>
<a:field name="for_allocate_amount" readOnly="true" />
<a:field name="for_allocate_amount" readOnly="true"/>
</a:fields>
</a:dataSet>
......@@ -786,7 +790,8 @@
selectable="true">
<a:fields>
<a:field name="company_id" defaultValue="${/parameter/@company_id}"/>
<a:field name="write_off_date" datatype="java.util.Date" validator="write_off_date_validator" required="true"
<a:field name="write_off_date" datatype="java.util.Date" validator="write_off_date_validator"
required="true"
defaultValue="${/model/sys_default_time/record/@now_date}"/>
<a:field name="journal_date" required="true"
defaultValue="${/model/sys_default_time/record/@now_date}"/>
......@@ -844,20 +849,32 @@
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.csh_transaction_plan_query/query?transaction_id=${/parameter/@transaction_id}&amp;write_off_type=RECEIPT_DEPOSIT_POOL"
selectable="true">
<a:fields>
<a:field name="bp_agent_name" lovGridHeight="350" lovHeight="550" lovLabelWidth="50" lovWidth="550"
required="true" readOnly="true" autoComplete="true" autoCompleteField="bp_agent_name"
lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT&amp;bp_id=${/parameter/@bp_id}"
title="HLS.BP_TITLE">
<!-- <a:field name="bp_agent_name" lovGridHeight="350" lovHeight="550" lovLabelWidth="50" lovWidth="550"-->
<!-- required="true" readOnly="true" autoComplete="true" autoCompleteField="bp_agent_name"-->
<!-- lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT&amp;bp_id=${/parameter/@bp_id}"-->
<!-- title="HLS.BP_TITLE">-->
<!-- <a:mapping>-->
<!-- <a:map from="bp_id" to="bp_id"/>-->
<!-- <a:map from="bp_name" to="bp_agent_name"/>-->
<!-- </a:mapping>-->
<!-- </a:field>-->
<a:field name="bp_name" readOnly="true" autoComplete="true" lovGridHeight="350" lovHeight="550"
lovLabelWidth="50"
lovWidth="550"
required="true"
lovService="basic.hls_bp_master_v_for_lov?bp_id=${/parameter/@bp_id}" title="HLS.BP_TITLE">
<a:mapping>
<a:map from="bp_id" to="bp_id"/>
<a:map from="bp_name" to="bp_agent_name"/>
<a:map from="bp_name" to="bp_name"/>
</a:mapping>
</a:field>
<a:field name="bp_id" defaultValue="${/parameter/@bp_id}"/>
<a:field name="bp_name" defaultValue="${/model/csh_transaction_path/record/@bp_name}"/>
<a:field name="transaction_id" defaultValue="${/parameter/@transaction_id}"/>
<a:field name="write_off_type" defaultValue="RECEIPT_DEPOSIT_POOL"/>
<a:field name="company_id" defaultValue="${/session/@company_id}"/>
<a:field name="write_off_amount"/>
<a:field name="create_wf_flag" defaultValue="N"/>
<a:field name="write_off_date" validator="write_off_date_validator" required="true"
defaultValue="${/model/sys_default_time/record/@now_date}"/>
</a:fields>
......@@ -878,6 +895,7 @@
</a:mapping>
</a:field>
<a:field name="bp_id" defaultValue="${/parameter/@bp_id}"/>
<a:field name="bp_name" defaultValue="${/parameter/@bp_name}"/>
<a:field name="transaction_id" defaultValue="${/parameter/@transaction_id}"/>
<a:field name="write_off_type" defaultValue="RECEIPT_ADVANCE_RECEIPT"/>
<a:field name="company_id" defaultValue="${/session/@company_id}"/>
......@@ -945,7 +963,8 @@
<a:box column="3" labelWidth="100">
<a:label prompt="附件查看" colspan="2" bindTarget="csh_transaction_receipt_write_off_detail_ds"
renderer="attachment_rendered" width="370"/>
<a:numberField name="for_allocate_amount" renderer="Leaf.formatMoney" prompt="剩余可分配金额" readOnly="true" bindTarget="csh_transaction_receipt_write_off_detail_ds" />
<a:numberField name="for_allocate_amount" renderer="Leaf.formatMoney" prompt="剩余可分配金额"
readOnly="true" bindTarget="csh_transaction_receipt_write_off_detail_ds"/>
</a:box>
<!-- <a:box column="4" labelWidth="100">-->
......@@ -1080,17 +1099,17 @@
</a:events>
</a:grid>
</a:tab>
<a:tab id="write_off_deposit" tabStyle="display:none" prompt="核销为租金保证金" width="150">
<a:tab id="write_off_deposit" tabStyle="display:none" prompt="核销为保证金" width="150">
<a:grid id="csh_transaction_deposit_grid" navBar="true"
bindTarget="csh_transaction_deposit_ds"
height="370"
marginWidth="10">
<!-- <a:toolBar>-->
<!-- <a:button id="csh_grid_deposit_add_bt" type="add"/>-->
<!-- <a:button id="csh_grid_deposit_delete_bt" type="delete"/>-->
<!-- </a:toolBar>-->
<a:toolBar>
<a:button id="csh_grid_deposit_add_bt" type="add"/>
<a:button id="csh_grid_deposit_delete_bt" type="delete"/>
</a:toolBar>
<a:columns>
<a:column name="bp_agent_name" prompt="代理店" width="180" align="center"
<a:column name="bp_name" prompt="商业伙伴" width="180" align="center"
editor="csh_transaction_deposit_grid_lv"/>
<a:column name="write_off_amount" prompt="核销金额"
editorFunction="csh_deposit_edit_function" renderer="Leaf.formatMoney"
......@@ -1102,9 +1121,16 @@
</a:columns>
<a:editors>
<a:lov id="csh_transaction_deposit_grid_lv"/>
<a:numberField id="csh_transaction_deposit_grid_nf" allowNegative="false"/>
<a:numberField id="csh_transaction_deposit_grid_nf" allowNegative="false">
<a:events>
<a:event name="focus" handler="write_off_amount_dblclick"/>
</a:events>
</a:numberField>
<a:datePicker id="csh_transaction_deposit_grid_dp"/>
</a:editors>
<a:events>
<a:event name="dblclick" handler="write_off_amount_dblclick"/>
</a:events>
</a:grid>
</a:tab>
<a:tab id="write_off_advance" tabStyle="display:none" prompt="核销为预收款" width="150">
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ c8ab0da5
......@@ -130,6 +130,10 @@
url = $('${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_calculator_update_link_id').getUrl();
// Leaf.showMessage('${l:PROMPT}', '${l:HLS.CALC_TYPE_IS_NULL}');
// return;
}
if (head_record.dirty == true) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
return;
}
if (record.dirty == true) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
......@@ -513,14 +517,20 @@
if (record.get('bp_category') == 'TENANT') {
//实际为不选中
Leaf.showMessage('${l:HLS.PROMPT}', '无法删除主承租人！');
ds.unSelect(record);
ds.Select(record);
//ds.unSelect(record);
//ds.select(record);
setTimeout(function () {
ds.unSelect(record);
}, 1);
}
if (record.get('bp_category') == 'AGENT') {
//实际为不选中
Leaf.showMessage('${l:HLS.PROMPT}', '无法删除经销商！');
ds.unSelect(record);
ds.Select(record);
// ds.unSelect(record);
// ds.select(record);
setTimeout(function () {
ds.unSelect(record);
}, 1);
}
}
};
......
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