Commit 139546eb authored by stone's avatar stone

[fix] 解决冲突

parents fe742dfb f3d0b8ba
......@@ -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"/>
<script type="text/javascript"><![CDATA[
//测试
jQuery.noConflict();
//测试冲突2 fork提交发生代码冲突
//如果头id 不为空,就使用自在定义的ds进行查询
Leaf.onReady(function(){
......@@ -89,7 +86,7 @@
var payment_req_id='${/parameter/@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).setQueryParameter("payment_req_id_1",payment_req_id);
$(lnds_id).setQueryParameter("payment_req_id",payment_req_id);
$(lnds_id).query();
$(hdds_id).setQueryParameter("payment_req_id",payment_req_id);
$(hdds_id).query();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment