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
acd8bbe3
Commit
acd8bbe3
authored
Jan 06, 2020
by
stone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【fix】修改付款申请条件
parent
d1a6af69
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
12 deletions
+17
-12
csh_payment_req_selected.lwm
...p/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
+13
-8
csh_payment_req_selected.lview
.../webapp/modules/csh/CSH501/csh_payment_req_selected.lview
+4
-4
No files found.
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
View file @
acd8bbe3
...
...
@@ -208,13 +208,18 @@
),
0)) > 0
AND t.data_class = 'NORMAL'
AND t.bp_id_agent_level1 IN (
select h.bp_id
from exp_emp_assign_e_v ee, hls_bp_master h
where ee.user_id = ${/session/@user_id}
and ee.unit_id = h.unit_id
and h.bp_category = 'AGENT'
)
AND ('Y' = 'Y' AND EXISTS
(SELECT 1
FROM aut_trx_user_authorize a1, aut_owner_user_authorize a2
WHERE a1.trx_category = 'CONTRACT'
AND a1.trx_id = t.contract_id
AND trunc(SYSDATE) BETWEEN a1.start_date AND
nvl(a1.end_date, trunc(SYSDATE))
AND a1.user_id = a2.owner_user_id
AND a1.trx_category = a2.trx_category
AND a2.authorized_user_id = ${/session/@user_id}
AND trunc(SYSDATE) BETWEEN a2.start_date AND
nvl(a2.end_date, trunc(SYSDATE))))
AND t.contract_status IN
('INCEPT')
and t.sign_contract_status in ('SIGN','SIGNING')
...
...
src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
View file @
acd8bbe3
...
...
@@ -52,10 +52,10 @@
return;
}
//暂时去掉
if(a[i].get('billing_status_n')!='已开票' ||a[i].get('invoice_status_n')!='已确认'){
$L.showErrorMessage("提示",'请选择开票状态为已开票,发票状态为已确认的现金流!');
return;
}
//
if(a[i].get('billing_status_n')!='已开票' ||a[i].get('invoice_status_n')!='已确认'){
//
$L.showErrorMessage("提示",'请选择开票状态为已开票,发票状态为已确认的现金流!');
//
return;
//
}
cashflow_id = a[i].get('cashflow_id');
var arr = {};
...
...
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