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
97e6f9b1
Commit
97e6f9b1
authored
5 years ago
by
lijingjing
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'contract_change_quotation' into develop
parents
8d5cdd55
783c6334
master
develop
feature/建机电子合同开发
remote_dev
remote_uat
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
27 deletions
+76
-27
check_con_record.lwm
...n/webapp/WEB-INF/classes/hls/HLS500N/check_con_record.lwm
+26
-0
hls_fin_calculator_update_n.lview
...app/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
+44
-21
prj_project_create.lview
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
+3
-3
prj_project_maintain.lview
...ain/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
+3
-3
No files found.
src/main/webapp/WEB-INF/classes/hls/HLS500N/check_con_record.lwm
0 → 100644
View file @
97e6f9b1
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2014-2-28 下午03:32:03
$Revision: 1.0
$Purpose:
-->
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:operations>
<bm:operation
name=
"execute"
>
<bm:update-sql>
<![CDATA[
begin
con_contract_workflow_pkg.check_con_record(
p_contract_id =>
${@contract_id},
p_contract_status =>${@contract_status}
);
end;
]]>
</bm:update-sql>
<bm:parameters>
<bm:parameter
name=
"contract_status"
dataType=
"java.lang.String"
input=
"false"
output=
"true"
outputPath=
"/parameter/@contract_status"
/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
This diff is collapsed.
Click to expand it.
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @
97e6f9b1
...
...
@@ -36,6 +36,8 @@
<a:link
id=
"hls_fin_calc_import_line_link_id"
url=
"${/request/@context_path}/modules/hls/HLS500/hls_fin_calc_import_line.lview"
/>
<a:link
id=
"hls_fin_calc_show_display_line_link_id"
url=
"${/request/@context_path}/modules/hls/HLS500N/hls_fin_calc_show_display_line_n.lview"
/>
<a:link
id=
"prj_check_prj_record_link_id"
model=
"hls.HLS500N.check_prj_record"
modelaction=
"execute"
/>
<a:link
id=
"con_check_con_record_link_id"
model=
"hls.HLS500N.check_con_record"
modelaction=
"execute"
/>
<a:link
id=
"hls_fin_calc_single_variable_calc_link_id"
model=
"hls.HLS500.hls_fin_calc_single_variable_calc"
modelaction=
"update"
/>
<a:link
id=
"hls_fin_calc_single_variable_manual_link_id"
model=
"hls.HLS500.hls_fin_calc_single_variable_calc"
modelaction=
"execute"
/>
<style>
<![CDATA[
...
...
@@ -90,7 +92,7 @@
var secondary_lease = res.result.secondary_lease;
var payment_deduction = res.result.payment_deduction;
var price_list = res.result.price_list;
if(
price_list=='DS_PRICE_10'
&& secondary_lease=='NO'){
if(
(price_list=='HL_PRICR_E'||price_list=='HL_PRICR_TEST'||price_list=='HL_PRICR_NTEST'||price_list=='HL_PRICR_EN')
&& secondary_lease=='NO'){
var count=0;
var denominator=0;
var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
...
...
@@ -108,7 +110,7 @@
return;
}
}
if(price_list=='
DS_PRICE_10
'){
if(price_list=='
HL_PRICR_E' ||price_list=='HL_PRICR_TEST'||price_list=='HL_PRICR_NTEST'||price_list=='HL_PRICR_EN
'){
if(payment_deduction!='TRADE_IN'){
var record = $('hls_fin_calculator_hd_ds').getAll();
for (var i = 0;i < temp_head_records.length;i++) {
...
...
@@ -202,6 +204,7 @@
}
function hls_hls500_re_calc() {
lock_calc_current_window('${l:HLS.CALCULATING}');
hls_hls500_save(calc_execute, 'RE_CALC');
}
...
...
@@ -787,12 +790,18 @@
}
function onEditorHdload(ds) {
var headRecords = ds.getAll();
if('${/parameter/@document_category}'=='CONTRACT'
&&
'${/parameter/@contract_status}'=='SIGN'){
if('${/parameter/@document_category}'=='CONTRACT'){
Leaf.request({
url: $('con_check_con_record_link_id').getUrl(),
para: {
'contract_id': '${/parameter/@document_id}'
},
success: function(res) {
var contract_status = res.result.contract_status;
if(contract_status=='SIGN'){
for (var i = 0;i
< headRecords.length
;i++)
{
var
column_name =
headRecords[i].get('column_name')
if(column_name
!="lease_start_date"&&column_name
!="contract_inception_date"){
headRecords[i].set('input_mode','READONLY');
headRecords[i].set('readonly_input_mode','TRUE');
...
...
@@ -800,9 +809,8 @@
headRecords[i].getField('column_value_c').setReadOnly(true);
}
}
}else
if('${/parameter/@document_category}'=='CONTRACT'&&'${/parameter/@contract_status}'!='SIGN')
{
}else
{
for
(var
i =
0;i
<
headRecords.length;i++)
{
var
column_name =
headRecords[i].get('column_name')
headRecords[i].set('input_mode','READONLY');
headRecords[i].set('readonly_input_mode','TRUE');
headRecords[i].getField('column_value').setReadOnly(true);
...
...
@@ -810,6 +818,21 @@
}
}
},
failure:
function()
{
unlock_calc_current_window('${l:HLS.SAVING}');
},
error:
function()
{
unlock_calc_current_window('${l:HLS.SAVING}');
},
scope:
this
});
}
if
(headRecords[0].get('show_column_code')
==
'N')
{
$('hls_fin_calculator_hd_grid_id').hideColumn('column_code');
$('hls_fin_calculator_export_grid_id').hideColumn('column_code');
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @
97e6f9b1
...
...
@@ -107,7 +107,7 @@
id: 'hls_fin_calc_quotation_link_winid',
params: {
document_id: parent_pk_value,
document_category: 'P
OR
JECT',
document_category: 'P
RO
JECT',
maintain_type: 'MODIFY',
calc_session_id: res.result.record.calc_session_id,
quotation_id: quotation_id,
...
...
@@ -147,7 +147,7 @@
id: 'hls_fin_calc_quotation_update_link_winid',
params: {
document_id: parent_pk_value,
document_category: 'P
OR
JECT',
document_category: 'P
RO
JECT',
maintain_type: 'MODIFY',
calc_session_id: record.get('calc_session_id'),
quotation_id: record.get('quotation_id'),
...
...
@@ -192,7 +192,7 @@
id: 'hls_fin_calc_quotation_link_winid',
params: {
document_id: parent_pk_value,
document_category: 'P
OR
JECT',
document_category: 'P
RO
JECT',
maintain_type: 'MODIFY',
calc_session_id: res.result.record.calc_session_id,
quotation_id: quotation_id,
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @
97e6f9b1
...
...
@@ -174,7 +174,7 @@
price_list: price_list,
secondary_lease:secondary_lease,
payment_deduction:payment_deduction,
document_category: 'P
OR
JECT',
document_category: 'P
RO
JECT',
maintain_type: 'MODIFY',
calc_session_id: res.result.record.calc_session_id,
quotation_id: quotation_id,
...
...
@@ -218,7 +218,7 @@
price_list: price_list,
secondary_lease:secondary_lease,
payment_deduction:payment_deduction,
document_category: 'P
OR
JECT',
document_category: 'P
RO
JECT',
maintain_type: 'MODIFY',
calc_session_id: record.get('calc_session_id'),
quotation_id: record.get('quotation_id'),
...
...
@@ -268,7 +268,7 @@
price_list: price_list,
secondary_lease:secondary_lease,
payment_deduction:payment_deduction,
document_category: 'P
OR
JECT',
document_category: 'P
RO
JECT',
maintain_type: 'MODIFY',
calc_session_id: res.result.record.calc_session_id,
quotation_id: quotation_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