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
139546eb
Commit
139546eb
authored
Nov 11, 2019
by
stone
Browse files
Options
Browse Files
Download
Plain Diff
[fix] 解决冲突
parents
fe742dfb
f3d0b8ba
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
csh_payment_req.lview
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
+1
-4
No files found.
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
View file @
139546eb
...
@@ -77,10 +77,7 @@
...
@@ -77,10 +77,7 @@
<a:link
id=
"tre_loan_con_print_excel_link_id"
url=
"${/request/@context_path}/modules/csh/CSH501/csh_payment_contract_export.lsc"
/>
<a:link
id=
"tre_loan_con_print_excel_link_id"
url=
"${/request/@context_path}/modules/csh/CSH501/csh_payment_contract_export.lsc"
/>
<script
type=
"text/javascript"
>
<![CDATA[
<script
type=
"text/javascript"
>
<![CDATA[
//测试
jQuery.noConflict();
jQuery.noConflict();
//测试冲突2 fork提交发生代码冲突
//如果头id 不为空,就使用自在定义的ds进行查询
//如果头id 不为空,就使用自在定义的ds进行查询
Leaf.onReady(function(){
Leaf.onReady(function(){
...
@@ -89,7 +86,7 @@
...
@@ -89,7 +86,7 @@
var payment_req_id='${/parameter/@payment_req_id}';
var payment_req_id='${/parameter/@payment_req_id}';
if(payment_req_id){
if(payment_req_id){
$(lnds_id).setQueryUrl('${/request/@context_path}/autocrud/csh.CSH501.csh_payment_req_ln_query_after_save/query');
$(lnds_id).setQueryUrl('${/request/@context_path}/autocrud/csh.CSH501.csh_payment_req_ln_query_after_save/query');
$(lnds_id).setQueryParameter("payment_req_id
_1
",payment_req_id);
$(lnds_id).setQueryParameter("payment_req_id",payment_req_id);
$(lnds_id).query();
$(lnds_id).query();
$(hdds_id).setQueryParameter("payment_req_id",payment_req_id);
$(hdds_id).setQueryParameter("payment_req_id",payment_req_id);
$(hdds_id).query();
$(hdds_id).query();
...
...
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