Skip to content

L
leaf-hlcm
Commit 61f94a4e authored by 38823's avatar 38823
Browse files
Options

茂甲控制保证金测试问题修复

parent 71b9de55
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 43 deletions
src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_check_wfl.lwm
View file @ 61f94a4e
......@@ -14,6 +14,9 @@
</bm:operation>
<bm:operation name="insert">
<bm:parameters>
<bm:parameter name="margin_check_id" dataType="java.lang.Long" input="false" output="true"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
margin_check_req_pkg.margin_check_save(
......
src/main/webapp/modules/csh/CSH531F/csh_bank_recoi_margin_check.lview
View file @ 61f94a4e
......@@ -2,7 +2,9 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true"
dynamiccreateenabled="true" trace="true">
<a:init-procedure><a:model-query model="csh.CSH531F.csh_transaction_recoi_check_wfl" rootPath="wfl_status"/>
<a:init-procedure>
<a:model-query model="csh.CSH531F.csh_transaction_recoi_check_wfl" rootPath="wfl_status"/>
<a:model-query model="csh.CSH531F.csh_transaction_recoi_check_query" rootPath="margin_check"/>
</a:init-procedure>
<a:view>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
......@@ -48,43 +50,44 @@
// 提交审批
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var ds_id = 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
var record= $(ds_id).getSelected()[0];
var marginId=record.get('margin_check_id');
var wflStatus=record.data.wfl_status;
if(wflStatus == 'APPROVING' || wflStatus == 'APPROVED' || wflStatus == 'REJECT'){
Leaf.showErrorMessage('提示', '只有新建的单据才可以提交审批');
return false;
}
Leaf.showConfirm('${l:HLS.PROMPT}', '${l:HLS.ARE_YOU_SURE_TO_SUBMIT}', function() {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('${/parameter/@layout_code}_csh531_margin_check_submit_link_id').getUrl(),
para: {
margin_check_id: marginId,
},
success: function(res) {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
Leaf.SideBar.show({
msg: '操作成功',
duration: 200
});
},
failure: function() {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function() {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
});
}
// window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
// var ds_id = 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
// var record= $(ds_id).getSelected()[0];
// var marginId=record.get('margin_check_id');
// var wflStatus=record.data.wfl_status;
// if(wflStatus == 'APPROVING' || wflStatus == 'APPROVED' || wflStatus == 'REJECT'){
// Leaf.showErrorMessage('提示', '只有新建的单据才可以提交审批');
// return false;
// }
// Leaf.showConfirm('${l:HLS.PROMPT}', '${l:HLS.ARE_YOU_SURE_TO_SUBMIT}', function() {
// window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
// Leaf.request({
// url: $('${/parameter/@layout_code}_csh531_margin_check_submit_link_id').getUrl(),
// para: {
// margin_check_id: marginId,
// },
// success: function(res) {
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// $('${/parameter/@winid}').close();
// Leaf.SideBar.show({
// msg: '操作成功',
// duration: 200
// });
// },
// failure: function() {
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// error: function() {
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// scope: this
// });
// });
// }
//自定义保存
//自定义提交审批保存
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
debugger;
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
var ds_id = 'MARGIN_CHECK_F_QUERY_csh_margin_check_ds';
var ds_result_id = 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
......@@ -101,27 +104,52 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
if($(ds_result_id)){
var record=$(ds_result_id).getAll();
if (record.length != 1) {
for (var i = 0; i < record.length; i++) {
if (record[i].get('wfl_status') == 'NEW' || record[i].get('wfl_status') == 'APPROVING') {
Leaf.showErrorMessage('提示', '当前系统中已有新建/审批中单据，请审批结束后再新建');
if (record[i].get('wfl_status') == 'APPROVING') {
Leaf.showErrorMessage('提示', '当前系统中已有审批中单据，请审批结束后再提交审批');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}
}
}
Leaf.request({
url: $('${/parameter/@layout_code}_csh531_margin_check_save_link_id').getUrl(),
para: params,
success: function(res) {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.SideBar.show({
msg: '操作成功',
duration: 200
debugger;
Leaf.showConfirm('${l:HLS.PROMPT}', '${l:HLS.ARE_YOU_SURE_TO_SUBMIT}', function() {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var marginCheckId=res.result.margin_check_id;
Leaf.request({
url: $('${/parameter/@layout_code}_csh531_margin_check_submit_link_id').getUrl(),
para: {
margin_check_id: marginCheckId,
},
success: function(res) {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
Leaf.SideBar.show({
msg: '操作成功',
duration: 200
});
},
failure: function() {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function() {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
});
// Leaf.SideBar.show({
// msg: '操作成功',
// duration: 200
// });
var ds_result_id = 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
$(ds_result_id).query();
$(ds_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