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
247f1a11
Commit
247f1a11
authored
Dec 20, 2022
by
21471731
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
租赁物导入调整20
parent
c3befb39
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
29 deletions
+13
-29
prj_project_lease_number.lwm
.../WEB-INF/classes/prj/PRJ500D/prj_project_lease_number.lwm
+0
-12
con_contract_get_layout_code.lview
...pp/modules/cont/CON500/con_contract_get_layout_code.lview
+1
-4
prj_project_maintain.lview
...ain/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
+12
-13
No files found.
src/main/webapp/WEB-INF/classes/prj/PRJ500D/prj_project_lease_number.lwm
deleted
100644 → 0
View file @
c3befb39
<?xml version="1.0" encoding="UTF-8"?>
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
needAccessControl=
"false"
>
<bm:operations>
<bm:operation
name=
"query"
>
<bm:query-sql>
<![CDATA[
select prj_project_lease_import_pkg.get_prj_lease_count(${/parameter/@project_id}) as lease_number from dual
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/modules/cont/CON500/con_contract_get_layout_code.lview
View file @
247f1a11
...
...
@@ -85,10 +85,7 @@
$(list_ds).query();
}
}else if(param['function_code']=='PRJ501INC'){
if (list_ds) {
$(list_ds).query();
}
Leaf.showMessage('提示信息', '租赁物信息发生变化,请重新进行报价');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_ds').query();
}
else{
if (list_ds) {
...
...
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @
247f1a11
...
...
@@ -16,8 +16,6 @@
<a:model-query
fetchAll=
"true"
model=
"prj.PRJ500D.user_agent_description"
rootPath=
"user_agent_description"
/>
<a:model-query
fetchAll=
"true"
model=
"prj.PRJ500D.prj_project_get_description"
rootPath=
"description"
/>
<a:model-query
fetchAll=
"true"
model=
"prj.PRJ500D.prj_project_residual_value"
rootPath=
"residual_value"
/>
<a:model-query
fetchAll=
"true"
model=
"prj.PRJ500D.prj_project_residual_value_from"
rootPath=
"prj_residual_value"
/>
<a:model-query
fetchAll=
"true"
model=
"prj.PRJ500D.prj_project_lease_number"
rootPath=
"prj_lease_count"
/>
<s:server-script
import=
"contract_print_path.js"
>
<![CDATA[
$ctx.parameter.file_path = con_print_path['con_print_path'];
$ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
...
...
@@ -25,6 +23,7 @@
</s:server-script>
</a:init-procedure>
<a:view>
<a:link
id=
"prj501N_prj_lease_item_maintain_link"
model=
"prj.PRJ500N.prj_project_lease_item_delete"
modelaction=
"execute"
/>
<a:link
id=
"hls_bp_master_billing_link"
model=
"prj.PRJ500N.hls_bp_master_billing"
modelaction=
"query"
/>
<a:link
id=
"bp_tenant_detail_query_link"
model=
"prj.PRJ500D.bp_tenant_old_r_query"
modelaction=
"query"
/>
<a:link
id=
"${/parameter/@layout_code}${/parameter/@pre_layout}get_special_fields_link_id"
...
...
@@ -235,11 +234,11 @@
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
var set_number=current_red.get('set_number');
var
lease_count='${/model/prj_lease_count/record/@lease_number}'
;
if(lease_count!=0 && set_number!=lease_count
){
Leaf.showMessage('提示信息
', '租赁物台数与查看明细中台数不一致,请重新维护!');
return;
}
var
total_number=current_red.get('total_number')
;
if(total_number!=0 && set_number!=total_number
){
Leaf.showMessage('${l:HLS.PROMPT}
', '租赁物台数与查看明细中台数不一致,请重新维护!');
return;
}
}
var cal_hd_price_list = record.get('cal_hd_price_list');
...
...
@@ -1595,7 +1594,7 @@
var
record=
$(lease_ds_id).getCurrentRecord();
var
records=
$(ds_id).getCurrentRecord();
var
set_number=
records.get('set_number');
var
lease_count=
'${/model/prj_lease_count/record/@lease_number}'
;
var
total_number=
records.get('total_number')
;
var
total_price=
records.get('total_price');
var
lease_item_amount=
record.get('lease_item_amount');
var
residual_value=
record.get('residual_value');
...
...
@@ -1607,8 +1606,8 @@
}else
if(q_value!=residual_value){
Leaf.showMessage('${l:PROMPT}',
'支付计划中留购价与报价计算不一致,无法提交审批!');
return;
}else
if(lease_count!=0
&&
set_number!=lease_count
){
Leaf.showMessage('
提示信息
',
'租赁物台数与查看明细中台数不一致,请重新维护!');
}else
if(total_number!=0
&&
set_number!=total_number
){
Leaf.showMessage('
${l:HLS.PROMPT}
',
'租赁物台数与查看明细中台数不一致,请重新维护!');
return;
}
}
...
...
@@ -1655,7 +1654,7 @@
var
record=
$(lease_ds_id).getCurrentRecord();
var
records=
$(ds_id).getCurrentRecord();
var
set_number=
records.get('set_number');
var
lease_count=
'${/model/prj_lease_count/record/@lease_number}'
;
var
total_number=
records.get('total_number')
;
var
total_price=
records.get('total_price');
var
lease_item_amount=
record.get('lease_item_amount');
var
residual_value=
record.get('residual_value');
...
...
@@ -1667,8 +1666,8 @@
}else
if(q_value!=residual_value){
Leaf.showMessage('${l:PROMPT}',
'支付计划中留购价与报价计算不一致,无法提交审批!');
return;
}else
if(lease_count!=0
&&
set_number!=lease_count
){
Leaf.showMessage('
提示信息
',
'租赁物台数与查看明细中台数不一致,请重新维护!');
}else
if(total_number!=0
&&
set_number!=total_number
){
Leaf.showMessage('
${l:HLS.PROMPT}
',
'租赁物台数与查看明细中台数不一致,请重新维护!');
return;
}
}
...
...
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