Skip to content

L
leaf-hlcm
Commit 3101ca32 authored by Darming's avatar Darming
Browse files
Options

[fix]optimization

parent 26080351
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 29 deletions
src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm
View file @ 3101ca32
......@@ -87,7 +87,8 @@
<bm:query-field name="invoice_number_t" queryExpression="t1.invoice_number &lt;= ${@invoice_number_t}"/>
<bm:query-field name="contract_number_f" queryExpression="t1.contract_number &lt;= ${@contract_number_f}"/>
<bm:query-field name="contract_number_t" queryExpression="t1.contract_number &lt;= ${@contract_number_t}"/>
<bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name}"/>
<bm:query-field name="invoice_bp_name" queryExpression="t1.invoice_bp_name like ${@invoice_bp_name}"/>
<bm:query-field name="invoice_date_f" queryExpression="to_date(t1.invoice_date,&apos;yyyy-mm-dd&apos;) &gt;= to_date(${@invoice_date_f},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="invoice_date_t" queryExpression="to_date(t1.invoice_date,&apos;yyyy-mm-dd&apos;) &lt;= to_date(${@invoice_date_t},&apos;yyyy-mm-dd&apos;)"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_write_off.lwm
View file @ 3101ca32
......@@ -96,9 +96,9 @@
t1.WRITE_OFF_DUE_AMOUNT write_off_amount,
t1.WRITE_OFF_PRINCIPAL,
t1.WRITE_OFF_INTEREST,
(select principal from con_contract_cashflow where cashflow_id = t.cashflow_id) principal,
(select interest from con_contract_cashflow where cashflow_id = t.cashflow_id) interest,
(select due_amount from con_contract_cashflow where cashflow_id = t.cashflow_id) due_amount,
(select principal from con_contract_cashflow where cashflow_id = t1.cashflow_id) principal,
(select interest from con_contract_cashflow where cashflow_id = t1.cashflow_id) interest,
(select due_amount from con_contract_cashflow where cashflow_id = t1.cashflow_id) due_amount,
(select bp_name from hls_bp_master h,con_contract c where h.bp_id = c.bp_id_tenant and c.contract_id = t1.contract_id) bp_tenant_name
from csh_write_off t1) t
#WHERE_CLAUSE#
......
src/main/webapp/modules/acr/ACR512/acr_invoice_update_detail.lview
View file @ 3101ca32
......@@ -143,12 +143,12 @@
var ds_batch_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acr_invoice_batch_ln');
var invoice_hd_id = $(ds_id).getCurrentRecord().get('invoice_hd_id');
var message = '';
if ($(ds_id).getCurrentRecord().get('merge_flag') == 'Y') {
message = '您确认行合并吗';
} else {
message = '您确认行不合并吗';
}
var message = '您确认吗';
// if ($(ds_id).getCurrentRecord().get('merge_flag') == 'Y') {
// message = '您确认行合并吗';
// } else {
// message = '您确认行不合并吗';
// }
Leaf.showConfirm('提示', message, function() {
Leaf.request({
......
src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
View file @ 3101ca32
......@@ -185,6 +185,8 @@
<a:fields>
<a:field name="currency_name" displayField="currency_name" options="acr512_currency_ds" returnField="currency" valueField="currency_code"/>
<a:field name="invoice_kind" />
<a:field name="contract_name"/>
<a:field name="invoice_bp_name"/>
<a:field name="invoice_kind_desc" displayField="code_value_name" options="acr512_invoice_kind_ds" returnField="invoice_kind" valueField="code_value"/>
<a:field name="business_type_desc" displayField="business_type_desc" options="acr512_business_type_ds" returnField="business_type" valueField="business_type"/>
<a:field name="created_by_name" lovGridHeight="320" lovHeight="500" lovService="acr.ACR512.acr_invoice_sys_user_lov" lovWidth="500" title="开票人选择">
......@@ -256,12 +258,13 @@
<div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div>
-->
<a:textField name="document_number_t" bindTarget="acr512_invoice_query_ds" prompt="单据编号到" width="135"/>
<a:textField name="contract_name" bindTarget="acr512_invoice_query_ds" prompt="合同名称" width="353"/>
<a:lov name="contract_number_f" bindTarget="acr512_invoice_query_ds" prompt="合同编号从" width="135"/>
<!-- <a:lov name="contract_number_f" bindTarget="acr512_invoice_query_ds" prompt="合同编号从" width="135"/>-->
<!--
<div><![CDATA[${l:HLS.CONTRACT_NUMBER_TO}]]></div>
-->
<a:lov name="contract_number_t" bindTarget="acr512_invoice_query_ds" prompt="合同编号到" width="135"/>
<!-- <a:lov name="contract_number_t" bindTarget="acr512_invoice_query_ds" prompt="合同编号到" width="135"/>-->
<!-- <a:lov name="project_number_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.PROJECT_NUMBER_FROM" width="135"/>
<div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div>
<a:lov name="project_number_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>-->
......@@ -289,15 +292,13 @@
<div><![CDATA[${l:ACR.INVOICE_DATE_TO}]]></div>
-->
<a:datePicker name="invoice_date_t" bindTarget="acr512_invoice_query_ds" prompt="发票日期到" width="135"/>
<a:lov name="invoice_bp_code_f" bindTarget="acr512_invoice_query_ds" prompt="客户编号从" width="135"/>
<!-- <a:lov name="invoice_bp_code_f" bindTarget="acr512_invoice_query_ds" prompt="客户编号从" width="135"/>-->
<!--
<div><![CDATA[${l:HLS.CUSTOMER_NUMBER_TO}]]></div>
-->
<a:lov name="invoice_bp_code_t" bindTarget="acr512_invoice_query_ds" prompt="客户编号到" width="135"/>
</a:hBox>
<a:hBox labelSeparator=" ">
<!-- <a:lov name="invoice_bp_code_t" bindTarget="acr512_invoice_query_ds" prompt="客户编号到" width="135"/>-->
<a:textField name="invoice_bp_name" bindTarget="acr512_invoice_query_ds" prompt="客户名称" width="135"/>
<a:comboBox name="invoice_kind_desc" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_KIND" width="135"/>
</a:hBox>
</a:form>
<a:grid id="acr512_invoice_update_grid_ds" bindTarget="acr512_invoice_result_ds" marginHeight="250" marginWidth="30" navBar="true">
......
src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview
View file @ 3101ca32
......@@ -169,6 +169,7 @@
var confirmed_flag = datas[i].get('confirmed_flag');
if(confirmed_flag!='ACCAUDITING'){
$L.showInfoMessage("提示",'请选择收款确认中的收款单据');
$('csh509_csh_trx_bank_refuse').enable();
return;
}
// //需要债权用户和会计担当才能驳回单据
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
View file @ 3101ca32
......@@ -95,8 +95,12 @@
$('csh511_receipt_save_id').disable();
$('csh_transaction_receipt_head_ds').submit();
$('csh511_receipt_save_id').enable();
$('csh_transaction_receipt_link_winid').close();
// $('csh_transaction_receipt_link_winid').close();
}
function onSubmitSuccess(){
$('csh_transaction_receipt_link_winid').close();
}
function csh511_receipt_posted() {
......@@ -443,6 +447,7 @@
</a:fields>
<a:events>
<a:event name="update" handler="onUpdate_csh511_receipt"/>
<a:event name="submitsuccess" handler="onSubmitSuccess"/>
<!--<a:event name="add" handler="onAdd_csh511_receipt"/>
<a:event name="load" handler="onAdd_csh511_receipt"/>-->
</a:events>
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ 3101ca32
......@@ -391,7 +391,11 @@
}
}
var h_record = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
h_record.set('for_allocate_amount',minus(h_record.get('unwrite_off_amount'),sum));
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);
}
h_record.set('for_allocate_amount',for_allocate_amount);
}
function csh531n_write_off_return() {
......@@ -481,13 +485,15 @@
}
function attachment_upload() {
if ('${/parameter/@transaction_id}') {
//
// ds = $('csh_transaction_receipt_head_ds');
// record = ds.getCurrentRecord();
// var header_id = record.get('transaction_id');
var header_id = '${/parameter/@transaction_id}';
var ds = $('csh_transaction_receipt_write_off_detail_ds');
var record = ds.getCurrentRecord();
// var header_id = '${/parameter/@transaction_id}';
var header_id = record.get('transaction_id');
if(record.get('transaction_type') == 'ADVANCE_RECEIPT'){
header_id = record.get('source_csh_trx_id');
}
var url = $('transaction_downloadFile_id').getUrl() + '?table_name=CSH_TRANSACTION&header_id=' + header_id;
var win = new Leaf.Window({
url: url,
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview
View file @ 3101ca32
......@@ -107,6 +107,12 @@
}
}
function changeColor(record, index) {
if (index == 0) {
return 'color:red';
}
}
]]></script>
<a:dataSets>
<a:dataSet id="csh_lov_cf_item_ds" autoQuery="true" model="csh.CSH531N.hls_cashflow_item_v"
......@@ -166,7 +172,7 @@
</a:vBox>
<a:vBox>
<a:grid bindTarget="csh_write_off_lov_ds" marginHeight="120" id="csh_con_contract_cashflow_ds"
width="800" navBar="true">
width="800" navBar="true" rowRenderer="changeColor">
<a:columns>
<a:column name="times" prompt="HLS.TIMES" align="center" width="60"/>
<a:column name="cf_item_desc" prompt="HLS.CF_ITEM_DESC" align="center" width="80"/>
......@@ -176,7 +182,9 @@
width="110"/>
<a:column name="principal" align="right" prompt="应收本金" renderer="Leaf.formatMoney"
width="110"/>
<a:column name="interest" align="right" prompt="应收利息" renderer="Leaf.formatMoney" width="110"/> <!-- <a:column prompt="营业">-->
<a:column name="interest" align="right" prompt="应收利息" renderer="Leaf.formatMoney"
width="110"/>
<!-- <a:column prompt="营业">-->
<a:column name="unreceived_amount" prompt="未收金额" align="right"
renderer="Leaf.formatMoney" width="110"/>
<a:column name="unreceived_principal" prompt="未收本金" align="right"
......
src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview
View file @ 3101ca32
......@@ -76,9 +76,9 @@
var headers_ds = $('hls_monthly_statement_ds');
var record = headers_ds.getAt(0);
var period_name = typeof (record.get('period_name')) == 'undefined' ? 0 : record.get('period_name');
if (period_name == 0 || period_name == '') {
Leaf.showMessage('${l:HLS.PROMPT}', '请确认期间！');
var calc_end_date = typeof (record.get('calc_end_date')) == 'undefined' ? 0 : record.get('calc_end_date');
if (period_name == 0 || period_name == '' || calc_end_date == 0 || calc_end_date == '') {
Leaf.showMessage('${l:HLS.PROMPT}', '请确认期间以及截止日！');
} else {
nextStep();
......
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