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
f5507ecd
Commit
f5507ecd
authored
Nov 21, 2019
by
stone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【fix】修改付款申请bug
parent
09172d70
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
csh_payment_req_excel_report_static.lwm
...lasses/csh/CSH501/csh_payment_req_excel_report_static.lwm
+4
-4
csh_payment_req.lview
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
+12
-0
No files found.
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_excel_report_static.lwm
View file @
f5507ecd
...
...
@@ -12,10 +12,10 @@
select *
from ( select count(*) total_number,
TRIM(to_char(sum(nvl(c.lease_item_amount, 0)),'
999,999,999,999.99
')) sum_amount,
TRIM(to_char(sum(nvl(v.amount_agent, 0)),'
999,999,999,999.99
')) sum_amount_agent,
TRIM(to_char(sum(nvl(v.amount_vender, 0)),'
999,999,999,999.99
')) sum_amount_vender,
TRIM(to_char(sum(nvl(v.other_payment2, 0)),'
999,999,999,999.99
')) sum_other_payment,
TRIM(to_char(sum(nvl(c.lease_item_amount, 0)),'
FM999,999,999,990.00
')) sum_amount,
TRIM(to_char(sum(nvl(v.amount_agent, 0)),'
FM999,999,999,990.00
')) sum_amount_agent,
TRIM(to_char(sum(nvl(v.amount_vender, 0)),'
FM999,999,999,990.00
')) sum_amount_vender,
TRIM(to_char(sum(nvl(v.other_payment2, 0)),'
FM999,999,999,990.00
')) sum_other_payment,
to_char(sysdate, 'yyyy') || '年' || to_char(sysdate, 'mm') || '月' purchase_date
from csh_payment_req_ln v,con_contract c
WHERE v.ref_doc_id=c.contract_id
...
...
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
View file @
f5507ecd
...
...
@@ -292,6 +292,13 @@
var payment_req_id = hd_record.get('payment_req_id');
var line_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var line_record = $(line_ds_id).getAt(0);
// var datas=$(line_ds_id).data;
// if(datas.length<=0){
// $L.showInfoMessage("提示",'无付款记录,不可提交审批!');
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// return;
// }
// if (line_record.get('cf_item') == '52' || line_record.get('cf_item') == '509') {
// //保证金退还Doodream审批接口 CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0
// var case_type = 'CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0';
...
...
@@ -718,6 +725,11 @@
var
check_flag =
false;
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'csh_payment_req_hd');
var
ds_line_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'csh_payment_req_ln');
if($(ds_line_id).data.length<=0){
$L.showErrorMessage("错误",'无付款记录,不可提交审批!');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
var
total_amount_agent=
0;
var
total_amount_vender=
0;
...
...
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