Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
fa6cc20a
Commit
fa6cc20a
authored
5 years ago
by
Darming
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/start_fixs' into develop
parents
3a190480
8d3d72de
Pipeline
#3804
canceled with stages
Changes
8
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
194 additions
and
65 deletions
+194
-65
csh_con_contract_cashflow.lwm
...WEB-INF/classes/csh/CSH531N/csh_con_contract_cashflow.lwm
+5
-3
hls_cashflow_item_v.lwm
...ebapp/WEB-INF/classes/csh/CSH531N/hls_cashflow_item_v.lwm
+3
-0
hls_prj_customer_for_lov.lwm
.../classes/hls_acr/hls_acr5010/hls_prj_customer_for_lov.lwm
+2
-2
csh_write_off_interface.lview
.../webapp/modules/csh/CSH531N/csh_write_off_interface.lview
+112
-27
csh_write_off_ref_contract.lview
...bapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview
+60
-27
hls_acr_ebank_output.lview
...pp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output.lview
+4
-2
hls_acr_ebank_import_upload.lview
...les/hls_acr/HLS_ACR5040/hls_acr_ebank_import_upload.lview
+1
-1
hls_acr_ebank_input_detail.lview
...ules/hls_acr/HLS_ACR5040/hls_acr_ebank_input_detail.lview
+7
-3
No files found.
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_con_contract_cashflow.lwm
View file @
fa6cc20a
...
...
@@ -10,10 +10,11 @@
contract_id,
to_char(due_date,'yyyy-mm-dd') due_date,
due_amount,
principal,
interest,
principal - nvl(received_principal,0) unreceived_principal,
interest - nvl(received_interest,0) unreceived_interest,
due_amount - nvl(received_amount,0) unreceived_amount,
decode(cf_item,1,due_amount-nvl(received_amount,0)) unreceived_rental
due_amount - nvl(received_amount,0) unreceived_amount
from con_contract_cashflow t
#WHERE_CLAUSE#
order by times, due_date
...
...
@@ -24,6 +25,8 @@
<bm:field
name=
"contract_id"
/>
<bm:field
name=
"cashflow_id"
/>
<bm:field
name=
"times"
/>
<bm:field
name=
"principal"
/>
<bm:field
name=
"interest"
/>
<bm:field
name=
"cf_item"
/>
<bm:field
name=
"cf_item_desc"
/>
<bm:field
name=
"due_date"
/>
...
...
@@ -31,7 +34,6 @@
<bm:field
name=
"unreceived_principal"
/>
<bm:field
name=
"unreceived_interest"
/>
<bm:field
name=
"unreceived_amount"
/>
<bm:field
name=
"unreceived_rental"
/>
</bm:fields>
<bm:query-fields>
<bm:query-field
name=
"contract_id"
queryExpression=
"t.contract_id = ${@contract_id}"
/>
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/WEB-INF/classes/csh/CSH531N/hls_cashflow_item_v.lwm
View file @
fa6cc20a
...
...
@@ -17,4 +17,7 @@
<bm:features>
<f:standard-who
xmlns:f=
"leaf.database.features"
/>
</bm:features>
<bm:query-fields>
<bm:query-field
name=
"write_off_cf_item"
queryExpression=
"(${@write_off_cf_item} = 'Y' and cf_item in (1,2,8,9,200,250))"
/>
</bm:query-fields>
</bm:model>
This diff is collapsed.
Click to expand it.
src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_prj_customer_for_lov.lwm
View file @
fa6cc20a
...
...
@@ -13,8 +13,8 @@
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field
name=
"bp_id"
databaseType=
"NUMBER"
datatype=
"java.lang.Long"
forDisplay=
"
true"
forQuery=
"tru
e"
physicalName=
"BP_ID"
prompt=
"用户ID"
/>
<bm:field
name=
"bp_name"
databaseType=
"VARCHAR2"
datatype=
"java.lang.String"
forDisplay=
"true"
forQuery=
"true"
physicalName=
"BP_NAME"
prompt=
"
用
户名称"
/>
<bm:field
name=
"bp_id"
databaseType=
"NUMBER"
datatype=
"java.lang.Long"
forDisplay=
"
false"
forQuery=
"fals
e"
physicalName=
"BP_ID"
prompt=
"用户ID"
/>
<bm:field
name=
"bp_name"
databaseType=
"VARCHAR2"
datatype=
"java.lang.String"
forDisplay=
"true"
forQuery=
"true"
physicalName=
"BP_NAME"
prompt=
"
客
户名称"
/>
<bm:field
name=
"id_card_no"
databaseType=
"VARCHAR2"
datatype=
"java.lang.String"
forDisplay=
"true"
physicalName=
"ID_CARD_NO"
prompt=
"身份证号"
/>
</bm:fields>
<bm:query-fields
>
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @
fa6cc20a
...
...
@@ -94,7 +94,7 @@
return 'csh_write_off_grid_dp';
}
if (write_off_type == 'RECEIPT_ADVANCE_RECEIPT') {
if
(record.get('create_wf_flag') == 'Y')
{
if
(record.get('create_wf_flag') == 'Y')
{
return;
}
return 'csh_transaction_advanced_grid_dp';
...
...
@@ -147,8 +147,16 @@
}
function csh531_update_fun(ds, record, name, value, oldValue) {
if (name == 'write_off_amount') {
if(!checkAmount()){
setTimeout(function () {//防止递归
record.set(name, oldValue);
});
}
var h_record = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
csh531_load_fun(ds);
var left_amount = record.get('left_amount');
var left_principal = record.get('left_principal');
var left_interest = record.get('left_interest');
...
...
@@ -360,9 +368,30 @@
function csh531_load_fun(ds) {
var records = ds.getAll();
for (var i = 0; i
< records.length
;
i++)
{
records[i].getField('write_off_times').setLovPara('contract_id',
records[i].get('contract_id'));
var sum = 0;
var write_off_recs = $('csh_write_off_interface_ds').getAll();
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
+=
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
+=
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
+=
t;
}
}
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));
}
function
csh531n_write_off_return()
{
...
...
@@ -574,7 +603,7 @@
// if (r.get('exists_advance_flag') == 'Y'
&&
current_advance_r) {
// return;
// }
if (record.get('create_wf_flag') == 'Y'){
if (record.get('create_wf_flag') == 'Y')
{
return;
}
return 'csh_transaction_advanced_grid_nf';
...
...
@@ -621,13 +650,45 @@
}
function
csh531_add_fun(ds,
record,
index)
{
var
ds =
$('csh_transaction_receipt_write_off_detail_ds');
var
r =
ds.getCurrentRecord();
if
(r.get('transaction_type')
==
'DEPOSIT')
{
var
h_
ds =
$('csh_transaction_receipt_write_off_detail_ds');
var
r =
h_
ds.getCurrentRecord();
if
(r.get('transaction_type')
==
'DEPOSIT')
{
record.set('write_off_type',
'DEPOSIT_CREDIT');
}
}
function
get_min_amount(amt1,
amt2)
{
if
(!Ext.isEmpty(amt1)
&&
!Ext.isEmpty(amt2))
{
if
(amt1
>
amt2) {
return amt2;
} else {
return amt1;
}
} else if (Ext.isEmpty(amt1)) {
return amt2;
} else if (Ext.isEmpty(amt2)) {
return amt1;
} else {
return null;
}
}
function write_off_amount_dblclick(grid, record, row, name) {
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) {
record.set('write_off_amount', get_min_amount(for_allocate_amount, unreceived_amount));
}
}
}
]]>
</script>
<a:dataSets>
<a:dataSet
id=
"ds_collection_classes_ds"
lookupCode=
"DS_COLLECTION_CLASSES"
/>
...
...
@@ -666,6 +727,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:fields>
</a:dataSet>
...
...
@@ -769,7 +831,7 @@
<a:field
name=
"write_off_type"
defaultValue=
"RECEIPT_ADVANCE_RECEIPT"
/>
<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=
"create_wf_flag"
defaultValue=
"N"
/>
<a:field
name=
"write_off_date"
validator=
"write_off_date_validator"
required=
"true"
defaultValue=
"${/parameter/@transaction_date}"
/>
</a:fields>
...
...
@@ -820,18 +882,19 @@
<a:textField
name=
"description"
bindTarget=
"csh_transaction_receipt_write_off_detail_ds"
prompt=
"摘要"
readOnly=
"true"
colspan=
"2"
width=
"370"
/>
<a:numberField
name=
"unwrite_off_amount"
prompt=
"剩余可核销金额"
<a:numberField
name=
"unwrite_off_amount"
prompt=
"剩余可核销金额"
renderer=
"Leaf.formatMoney"
bindTarget=
"csh_transaction_receipt_write_off_detail_ds"
readOnly=
"true"
/>
</a:box>
<a:box
column=
"3"
labelWidth=
"100"
>
<a:textField
colspan=
"2"
name=
"ref_v05"
bindTarget=
"csh_transaction_receipt_write_off_detail_ds"
prompt=
"备注"
width=
"370"
readOnly=
"true"
/>
<a:numberField
name=
"returned_amount"
prompt=
"已退款金额"
<a:numberField
name=
"returned_amount"
prompt=
"已退款金额"
renderer=
"Leaf.formatMoney"
bindTarget=
"csh_transaction_receipt_write_off_detail_ds"
readOnly=
"true"
/>
</a:box>
<a:box
column=
"2"
labelWidth=
"100"
>
<a:label
prompt=
"附件上传"
bindTarget=
"csh_transaction_receipt_write_off_detail_ds"
renderer=
"attachment_rendered"
/>
<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:box>
<!-- <a:box column="4" labelWidth="100">-->
...
...
@@ -904,18 +967,26 @@
align=
"center"
prompt=
"CSH531.CF_ITEM"
width=
"80"
/>
<a:column
name=
"due_date"
prompt=
"支付日"
renderer=
"Leaf.formatDate"
width=
"80"
align=
"center"
/>
<a:column
name=
"write_off_times"
prompt=
"HLS.TIMES"
align=
"center"
width=
"80"
/>
<a:column
prompt=
"营业"
>
<a:column
name=
"left_principal"
renderer=
"Leaf.formatMoney"
prompt=
"未收本金"
<!-- <a:column name="left_principal" renderer="Leaf.formatMoney" prompt="未收本金"-->
<!-- width="120" align="right"/>-->
<!-- <a:column name="left_interest" renderer="Leaf.formatMoney" prompt="未收利息"-->
<!-- width="120"-->
<!-- align="right"/>-->
<!-- <a:column name="left_amount" renderer="Leaf.formatMoney" prompt="未收金额"-->
<!-- width="120"-->
<!-- align="right"/>-->
<a:column
name=
"principal"
renderer=
"Leaf.formatMoney"
prompt=
"应收本金"
width=
"120"
align=
"right"
/>
<a:column
name=
"left_interest"
renderer=
"Leaf.formatMoney"
prompt=
"未
收利息"
<a:column
name=
"interest"
renderer=
"Leaf.formatMoney"
prompt=
"应
收利息"
width=
"120"
align=
"right"
/>
<a:column
name=
"left_amount"
renderer=
"Leaf.formatMoney"
prompt=
"未收租金
"
<a:column
name=
"due_amount"
renderer=
"Leaf.formatMoney"
prompt=
"应收金额
"
width=
"120"
align=
"right"
/>
</a:column>
<!-- <a:column name="write_off_bp_name" editorFunction="csh_edit_function"-->
<!-- prompt="CSH531.WRITE_OFF_BP_NAME" width="100"/>-->
<!-- <a:column name="left_amount" align="right" footerRenderer="summaryRenderer"-->
...
...
@@ -944,11 +1015,18 @@
</a:columns>
<a:editors>
<a:textField
id=
"csh_write_off_grid_tf"
/>
<a:numberField
id=
"csh_write_off_grid_nf"
allowNegative=
"false"
/>
<a:numberField
id=
"csh_write_off_grid_nf"
allowNegative=
"false"
>
<a:events>
<a:event
name=
"focus"
handler=
"write_off_amount_dblclick"
/>
</a:events>
</a:numberField>
<a:datePicker
id=
"csh_write_off_grid_dp"
/>
<a:comboBox
id=
"csh_write_off_grid_cb"
/>
<a:lov
id=
"csh_write_off_grid_lv"
/>
</a:editors>
<a:events>
<a:event
name=
"dblclick"
handler=
"write_off_amount_dblclick"
/>
</a:events>
</a:grid>
</a:tab>
<a:tab
id=
"write_off_deposit"
tabStyle=
"display:none"
prompt=
"核销为租金保证金"
width=
"150"
>
...
...
@@ -996,13 +1074,20 @@
footerRenderer=
"summaryRenderer"
/>
<a:column
name=
"write_off_date"
prompt=
"核销日期"
width=
"180"
align=
"center"
renderer=
"Leaf.formatDate"
editorFunction=
"csh_edit_function"
/>
<!-- <a:column name="create_wf_flag_desc" prompt="已核销标志"/>-->
<!-- <a:column name="create_wf_flag_desc" prompt="已核销标志"/>-->
</a:columns>
<a:editors>
<a:lov
id=
"csh_transaction_advanced_grid_lv"
/>
<a:numberField
id=
"csh_transaction_advanced_grid_nf"
allowNegative=
"false"
/>
<a:numberField
id=
"csh_transaction_advanced_grid_nf"
allowNegative=
"false"
>
<a:events>
<a:event
name=
"focus"
handler=
"write_off_amount_dblclick"
/>
</a:events>
</a:numberField>
<a:datePicker
id=
"csh_transaction_advanced_grid_dp"
/>
</a:editors>
<a:events>
<a:event
name=
"dblclick"
handler=
"write_off_amount_dblclick"
/>
</a:events>
</a:grid>
</a:tab>
</a:tabs>
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview
View file @
fa6cc20a
...
...
@@ -13,7 +13,30 @@
}
function griddbclick(grid, record, row, name) {
$('${/parameter/@lovid}').commit(record);
var ds = $('csh_write_off_interface_ds');
var con_rec = $('csh_lov_con_contract_ds').getCurrentRecord();
var rec = ds.getCurrentRecord();
rec.set('contract_id', con_rec.get('contract_id'));
rec.set('contract_number', con_rec.get('contract_number'));
rec.set('bp_tenant_name', con_rec.get('bp_name'));
rec.set('write_off_bp_name', con_rec.get('bp_name'));
rec.set('write_off_bp_id', con_rec.get('bp_id_tenant'));
rec.set('bp_id_tenant', con_rec.get('bp_id_tenant'));
rec.set('write_off_cf_item_desc', record.get('cf_item_desc'));
rec.set('write_off_cashflow_id', record.get('cashflow_id'));
rec.set('write_off_cf_item', record.get('cf_item'));
rec.set('write_off_times', record.get('times'));
rec.set('left_principal', record.get('unreceived_principal'));
rec.set('left_interest', record.get('unreceived_interest'));
rec.set('left_amount', record.get('unreceived_amount'));
rec.set('due_amount', record.get('due_amount'));
rec.set('principal', record.get('principal'));
rec.set('interest', record.get('interest'));
rec.set('due_date', record.get('due_date'));
rec.set('write_off_principal', record.get('unreceived_principal'));
rec.set('write_off_interest', record.get('unreceived_interest'));
rec.set('unreceived_amount', record.get('unreceived_amount'));
$('${/parameter/@lovid}').win.close();
}
function csh_write_off_confirmed() {
...
...
@@ -37,28 +60,35 @@
rec.set('write_off_times', cf_recs[0].get('times'));
rec.set('left_principal', cf_recs[0].get('unreceived_principal'));
rec.set('left_interest', cf_recs[0].get('unreceived_interest'));
rec.set('left_amount', cf_recs[0].get('unreceived_rental'));
rec.set('left_amount', cf_recs[0].get('unreceived_amount'));
rec.set('due_amount', cf_recs[0].get('due_amount'));
rec.set('principal', cf_recs[0].get('principal'));
rec.set('interest', cf_recs[0].get('interest'));
rec.set('due_date', cf_recs[0].get('due_date'));
rec.set('write_off_principal', cf_recs[0].get('unreceived_principal'));
rec.set('write_off_interest', cf_recs[0].get('unreceived_interest'));
rec.set('unreceived_amount', cf_recs[0].get('unreceived_amount'));
rec.set('write_off_amount',
cf_recs[0].get('unreceived_amount'));
// rec.set('write_off_amount',
cf_recs[0].get('unreceived_amount'));
for (var i = 1; i < cf_recs.length; i++) {
//copy...
debugger;
var newRecord = new Leaf.Record({...rec.data});
newRecord.ds = rec.ds;
newRecord.set('write_off_cf_item_desc', cf_recs[i].get('cf_item_desc'));
newRecord.set('write_off_cf_item', cf_recs[i].get('cf_item'));
newRecord.set('write_off_times', cf_recs[i].get('times'));
newRecord.set('write_off_cashflow_id',cf_recs[i].get('cashflow_id'));
newRecord.set('due_date', cf_recs[i].get('due_date'));
newRecord.set('write_off_cashflow_id', cf_recs[i].get('cashflow_id'));
newRecord.set('unreceived_amount', cf_recs[i].get('unreceived_amount'));
newRecord.set('interest', cf_recs[i].get('interest'));
newRecord.set('principal', cf_recs[i].get('principal'));
newRecord.set('due_amount', cf_recs[i].get('due_amount'));
newRecord.set('left_principal', cf_recs[i].get('unreceived_principal'));
newRecord.set('left_interest', cf_recs[i].get('unreceived_interest'));
newRecord.set('left_amount', cf_recs[i].get('unreceived_
rental
'));
newRecord.set('left_amount', cf_recs[i].get('unreceived_
amount
'));
newRecord.set('write_off_principal', cf_recs[i].get('unreceived_principal'));
newRecord.set('write_off_interest', cf_recs[i].get('unreceived_interest'));
newRecord.set('write_off_amount',
cf_recs[i].get('unreceived_amount'));
// newRecord.set('write_off_amount',
cf_recs[i].get('unreceived_amount'));
ds.add(newRecord);
}
...
...
@@ -79,11 +109,12 @@
]]>
</script>
<a:dataSets>
<a:dataSet
id=
"csh_lov_cf_item_ds"
autoQuery=
"true"
model=
"csh.CSH531N.hls_cashflow_item_v"
/>
<a:dataSet
id=
"csh_lov_cf_item_ds"
autoQuery=
"true"
model=
"csh.CSH531N.hls_cashflow_item_v"
queryUrl=
"${/request/@context_path}/autocrud/csh.CSH531N.hls_cashflow_item_v/query?write_off_cf_item=Y"
/>
<a:dataSet
id=
"csh_query_con_ds"
autoCreate=
"true"
>
<a:fields>
<a:field
name=
"contract_number"
/>
<!-- <a:field name="bp_name"/>--
>
<a:field
name=
"bp_name"
/
>
<a:field
name=
"bp_id"
defaultValue=
"${/parameter/@bp_id}"
/>
</a:fields>
</a:dataSet>
...
...
@@ -117,10 +148,10 @@
</a:screenTopToolbar>
<a:form
column=
"5"
labelWidth=
"180"
width=
"1100"
title=
"HLS.QUERY_TITLE"
>
<a:textField
name=
"contract_number"
bindTarget=
"csh_query_con_ds"
prompt=
"HLS.CONTRACT_NUMBER"
/>
<!-- <a:textField name="bp_name" bindTarget="csh_query_con_ds" prompt="客户名"/>--
>
<a:
datePicker
name=
"due_date_from"
bindTarget=
"csh_query_cf_ds"
prompt=
"CSH531.DATE_FRO
M"
/>
<a:datePicker
name=
"due_date_
to"
bindTarget=
"csh_query_cf_ds"
prompt=
"CSH531.DATE_TO
"
/>
<!-- <a:comboBox name="cf_item_desc" bindTarget="csh_query_cf_ds" prompt="CSH531.CF_ITEM"/>--
>
<a:textField
name=
"bp_name"
bindTarget=
"csh_query_con_ds"
prompt=
"客户名"
/
>
<a:
comboBox
name=
"cf_item_desc"
bindTarget=
"csh_query_cf_ds"
prompt=
"CSH531.CF_ITE
M"
/>
<a:datePicker
name=
"due_date_
from"
bindTarget=
"csh_query_cf_ds"
prompt=
"支付日从
"
/>
<a:datePicker
name=
"due_date_to"
bindTarget=
"csh_query_cf_ds"
prompt=
"支付日到"
/
>
</a:form>
<a:hBox>
<a:vBox>
...
...
@@ -139,21 +170,23 @@
<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"
/>
<a:column
name=
"due_date"
prompt=
"还款日"
renderer=
"Leaf.formatDate"
width=
"80"
align=
"center"
/>
<a:column
name=
"due_amount"
align=
"right"
prompt=
"应还金额"
renderer=
"Leaf.formatMoney"
width=
"120"
/>
<a:column
prompt=
"营业"
>
<a:column
name=
"due_date"
prompt=
"支付日"
renderer=
"Leaf.formatDate"
width=
"80"
align=
"center"
/>
<a:column
name=
"due_amount"
align=
"right"
prompt=
"应收金额"
renderer=
"Leaf.formatMoney"
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=
"unreceived_amount"
prompt=
"未收金额"
align=
"right"
renderer=
"Leaf.formatMoney"
width=
"110"
/>
<a:column
name=
"unreceived_principal"
prompt=
"未收本金"
align=
"right"
renderer=
"Leaf.formatMoney"
width=
"12
0"
/>
renderer=
"Leaf.formatMoney"
width=
"11
0"
/>
<a:column
name=
"unreceived_interest"
prompt=
"未收利息"
align=
"right"
renderer=
"Leaf.formatMoney"
width=
"120"
/>
<a:column
name=
"unreceived_rental"
prompt=
"未收租金"
align=
"right"
renderer=
"Leaf.formatMoney"
width=
"120"
/>
</a:column>
renderer=
"Leaf.formatMoney"
width=
"110"
/>
</a:columns>
<!-- <a:events>--
>
<!-- <a:event name="dblclick" handler="griddbclick"/>--
>
<!-- </a:events>--
>
<a:events
>
<a:event
name=
"dblclick"
handler=
"griddbclick"
/
>
</a:events
>
</a:grid>
</a:vBox>
</a:hBox>
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output.lview
View file @
fa6cc20a
...
...
@@ -215,14 +215,16 @@
<a:field
name=
"session_id"
defaultValue=
"${/session/@session_id}"
/>
<a:field
name=
"deadline_date"
required=
"true"
/>
<a:field
name=
"deadline_date_to"
required=
"true"
/>
<a:field
name=
"currency_name"
displayField=
"currency_name"
options=
"hls_currency_ds"
required=
"true"
returnField=
"currency_code"
valueField=
"currency_code"
/>
<a:field
name=
"currency_code"
defaultValue=
"CNY"
/>
<a:field
name=
"currency_name"
readOnly=
"true"
defaultValue=
"人民币"
displayField=
"currency_name"
options=
"hls_currency_ds"
required=
"true"
returnField=
"currency_code"
valueField=
"currency_code"
/>
<a:field
name=
"payment_method_display"
displayField=
"code_value_name"
options=
"hls_acr_payment_method_ds"
required=
"true"
returnField=
"payment_method"
valueField=
"code_value"
/>
<!-- <a:field name="payment_method_display" defaultValue="ABC" displayField="code_value_name" readOnly="true" options="hls_acr_payment_method_ds" required="true" returnField="payment_method" valueField="code_value"/> -->
<!-- <a:field name="payment_method_display_n" defaultValue="农行代扣" displayField="code_value_name" readOnly="true" options="hls_acr_payment_method_ds" required="true" returnField="payment_method" valueField="code_value"/> -->
<a:field
name=
"customer_type_display"
displayField=
"code_value_name"
options=
"hls_customer_type_ds"
required=
"true"
returnField=
"customer_type"
valueField=
"code_value"
/>
<a:field
name=
"customer_name_display"
lovGridHeight=
"300"
lovHeight=
"450"
lovWidth=
"550"
readOnly=
"true"
/>
<a:field
name=
"limit_amount"
validator=
"amountValidator"
/>
<a:field
name=
"generate_rules_display"
displayField=
"code_value_name"
options=
"hls_generate_rules_ds"
required=
"true"
returnField=
"generate_rules"
valueField=
"code_value"
/>
<a:field
name=
"generate_rules_display"
readOnly=
"true"
defaultValue=
"汇总"
displayField=
"code_value_name"
options=
"hls_generate_rules_ds"
required=
"true"
returnField=
"generate_rules"
valueField=
"code_value"
/>
<a:field
name=
"generate_rules"
defaultValue=
"N"
/>
<a:field
name=
"contract_number"
/>
</a:fields>
<a:events>
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_import_upload.lview
View file @
fa6cc20a
...
...
@@ -8,7 +8,7 @@
if (document.getElementById('importFile').value){
var fileName = document.getElementById('importFile').value;
var fileType = fileName.substr(fileName.lastIndexOf("."));
if (fileType != '.xls' && fileType != '.xlsx'){
if (fileType != '.xls' && fileType != '.xlsx'
&& fileType != '.csv'
){
Leaf.showErrorMessage('错误','导入文件非Excel,请重新选择文件!');
} else {
document.getElementById('importForm').submit();
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input_detail.lview
View file @
fa6cc20a
...
...
@@ -18,7 +18,6 @@
<a:link
id=
"hls_acr_ebank_enter_link"
url=
"${/request/@context_path}/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input.lview"
/>
<script>
<![CDATA[
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
debugger;
var payment_method = '${/parameter/@payment_method}';
var title = '';
if (payment_method == 'ABC'){
...
...
@@ -36,7 +35,10 @@
title: title,
width: 420,
height: 275
}).on('close', function() {});
}).on('close', function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_acr_ebank_output_ln_temp');
$(ds_id).query();
});
};
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
...
...
@@ -63,8 +65,10 @@
});
};
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
window.location.href = $('hls_acr_ebank_enter_link').getUrl()+ '?layout_code=' + 'HLS_ACR5030_HEADER' + '&function_code=HLS_ACR5040';
// window.location.href = $('hls_acr_ebank_enter_link').getUrl()+ '?layout_code=' + 'HLS_ACR5030_HEADER' + '&function_code=HLS_ACR5040';
$('${/parameter/@winid}').close();
};
window['${/parameter/@layout_code}_upload_layout_dynamic_click'] = function() {
var p_sourcetype = 'hls_acr_ebank_input';
var p_pkvalue = '${/session/@session_id}';
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment