Commit 837a58ac authored by stone's avatar stone

[fix] 修复收款功能

parent b74efab3
...@@ -18,10 +18,11 @@ ...@@ -18,10 +18,11 @@
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
csh_transaction_pkg.update_confirmFlag_byCondition( csh_transaction_pkg.update_muti_confirmed_flag(
p_transaction_id =>${@transaction_id}, p_transaction_id =>${@transaction_id},
p_wanted_confirmed_flag =>${@wanted_confirmed_flag}, p_wanted_confirmed_flag =>${@wanted_confirmed_flag},
p_wanted_written_off_flag=>${@wanted_written_off_flag}, p_wanted_written_off_flag=>${@wanted_written_off_flag},
p_confirmed_by =>${@confirmed_by},
p_user_id =>${/session/@user_id} p_user_id =>${/session/@user_id}
); );
end; end;
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
csh_transaction_pkg.update_confirmed_flag( csh_transaction_pkg.update_confirmer_by_condition(
p_transaction_id =>${@transaction_id}, p_transaction_id =>${@transaction_id},
p_user_id =>${/session/@user_id} p_user_id =>${session/@user_id}
); );
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
<a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"/> <a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//添加一个全局变量,该变量用于判断是债权内勤还是会计担当进行确认
var confirmed_by='';
//判断是债权内勤还是会计担当 //判断是债权内勤还是会计担当
function judgeRoles(position_code){ function judgeRoles(position_code){
...@@ -38,6 +40,7 @@ ...@@ -38,6 +40,7 @@
var datas=$('position_code_ds').data; var datas=$('position_code_ds').data;
for(var i=0;i<datas.length;i++){ for(var i=0;i<datas.length;i++){
if(datas[i].data.position_code==position_code){ if(datas[i].data.position_code==position_code){
return true; return true;
} }
} }
...@@ -84,23 +87,28 @@ ...@@ -84,23 +87,28 @@
} }
// //
if(confirmed_flag=='ACCAUDITING'){ if(confirmed_flag=='ACCAUDITING'){
confirmed_by='00321';
if(!judgeRoles("00321")){ if(!judgeRoles("00321")){
$L.showInfoMessage("提示",'需要会计担当确认单据'); $L.showInfoMessage("提示",'需要会计担当确认单据');
return; return;
} }
} }else if(confirmed_flag=='DEBTAUDITING'){
if(confirmed_flag=='DEBTAUDITING'){ confirmed_by='00217';
if(!judgeRoles("00217")){ if(!judgeRoles("00217")){
$L.showInfoMessage("提示",'需要债权内勤确认单据'); $L.showInfoMessage("提示",'需要债权内勤确认单据');
return; return;
} }
}else{
$L.showInfoMessage("提示",'该身份没有确认的权限');
return;
} }
//保存要修改的数据 //保存要修改的数据
updateData.push({ updateData.push({
transaction_id:datas[i].get('transaction_id'), transaction_id:datas[i].get('transaction_id'),
wanted_confirmed_flag: 'APPROVED', wanted_confirmed_flag: 'APPROVED',
wanted_written_off_flag: 'NOT', wanted_written_off_flag: 'NOT',
confirmed_by :confirmed_by,
_status : 'update' _status : 'update'
}) })
} }
......
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