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
837a58ac
Commit
837a58ac
authored
Sep 21, 2019
by
stone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix] 修复收款功能
parent
b74efab3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
query_roles_info.lwm
...in/webapp/WEB-INF/classes/csh/CSH509/query_roles_info.lwm
+2
-1
csh_transaction_update.lwm
...app/WEB-INF/classes/csh/CSH510/csh_transaction_update.lwm
+2
-2
csh_transaction_receipt_confirm.lview
.../modules/csh/CSH509/csh_transaction_receipt_confirm.lview
+10
-2
No files found.
src/main/webapp/WEB-INF/classes/csh/CSH509/query_roles_info.lwm
View file @
837a58ac
...
...
@@ -18,10 +18,11 @@
<bm:operation
name=
"update"
>
<bm:update-sql>
<![CDATA[
begin
csh_transaction_pkg.update_
confirmFlag_byCondition
(
csh_transaction_pkg.update_
muti_confirmed_flag
(
p_transaction_id =>
${@transaction_id},
p_wanted_confirmed_flag =>${@wanted_confirmed_flag},
p_wanted_written_off_flag=>${@wanted_written_off_flag},
p_confirmed_by =>${@confirmed_by},
p_user_id =>${/session/@user_id}
);
end;
...
...
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_update.lwm
View file @
837a58ac
...
...
@@ -10,9 +10,9 @@
<bm:operation
name=
"update"
>
<bm:update-sql>
<![CDATA[
begin
csh_transaction_pkg.update_confirme
d_flag
(
csh_transaction_pkg.update_confirme
r_by_condition
(
p_transaction_id =>
${@transaction_id},
p_user_id =>${
/
session/@user_id}
p_user_id =>${session/@user_id}
);
end;
]]>
</bm:update-sql>
...
...
src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview
View file @
837a58ac
...
...
@@ -31,6 +31,8 @@
<a:link
id=
"csh510_csh_transaction_import_link"
url=
"${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"
/>
<script
type=
"text/javascript"
>
<![CDATA[
//添加一个全局变量,该变量用于判断是债权内勤还是会计担当进行确认
var confirmed_by='';
//判断是债权内勤还是会计担当
function judgeRoles(position_code){
...
...
@@ -38,6 +40,7 @@
var datas=$('position_code_ds').data;
for(var i=0;i<datas.length;i++){
if(datas[i].data.position_code==position_code){
return true;
}
}
...
...
@@ -84,23 +87,28 @@
}
//
if(confirmed_flag=='ACCAUDITING'){
confirmed_by='00321';
if(!judgeRoles("00321")){
$L.showInfoMessage("提示",'需要会计担当确认单据');
return;
}
}
if(confirmed_flag=='DEBTAUDITING'){
}
else if(confirmed_flag=='DEBTAUDITING'){
confirmed_by='00217';
if(!judgeRoles("00217")){
$L.showInfoMessage("提示",'需要债权内勤确认单据');
return;
}
}else{
$L.showInfoMessage("提示",'该身份没有确认的权限');
return;
}
//保存要修改的数据
updateData.push({
transaction_id:datas[i].get('transaction_id'),
wanted_confirmed_flag: 'APPROVED',
wanted_written_off_flag: 'NOT',
confirmed_by :confirmed_by,
_status : 'update'
})
}
...
...
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