Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
rbc-demo
Overview
Overview
Details
Activity
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
王衍超
rbc-demo
Commits
b76b7936
Commit
b76b7936
authored
May 17, 2022
by
Joey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(@gms/gms-plugin-billexpand): 工会预算按钮调整
- 驳回接口错误 - 审批意见未及时清空
parent
d74445fa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
4 deletions
+13
-4
gh_rejectAction.js
...gin-billexpand/src/actions/labourUnion/gh_rejectAction.js
+2
-2
index.js
develop/@gms/gms-plugin-billexpand/src/actions/util/index.js
+3
-1
constant.js
develop/@gms/gms-plugin-billexpand/src/constant.js
+2
-0
approval-user-control.vue
...c/control/approval-user-control/approval-user-control.vue
+6
-1
No files found.
develop/@gms/gms-plugin-billexpand/src/actions/labourUnion/gh_rejectAction.js
View file @
b76b7936
...
...
@@ -55,11 +55,11 @@ export default {
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
?
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
:
''
bill
.
clearSubDatas
(
SIGNATURE_TABLE_NAME
)
saveBill
(
bill
,
param
).
then
(()
=>
{
GMS
.
$http
.
post
(
`/rbc/bill/action/zgh/change/work/
${
param
.
define
}
/bill.Basic.
accep
t`
,
`/rbc/bill/action/zgh/change/work/
${
param
.
define
}
/bill.Basic.
rejec
t`
,
{
approvalComments
:
comments
},
).
then
(
function
(
response
)
{
...
...
develop/@gms/gms-plugin-billexpand/src/actions/util/index.js
View file @
b76b7936
...
...
@@ -141,6 +141,8 @@ export const showCommentModal = (bill, param, checkComment) => {
},
}
)
window
.
GMS
.
vbus
.
$emit
(
GLOBAL_EVENT
.
APPROVAL_USER_CONTROL_RESETVALUE
)
return
GMS
.
$hideContainer
.
$msgbox
({
title
:
'审批意见'
,
message
:
vNode
,
...
...
@@ -152,7 +154,7 @@ export const showCommentModal = (bill, param, checkComment) => {
let
comments
=
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
)
&&
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
if
(
comments
)
{
if
(
comments
||
!
checkComment
)
{
done
()
}
else
{
...
...
develop/@gms/gms-plugin-billexpand/src/constant.js
View file @
b76b7936
...
...
@@ -16,4 +16,6 @@ export const BILL_GLOBAL_PARAM = {
export
const
GLOBAL_EVENT
=
{
VERIFY_SIGNATURE_FAIL
:
'verifySignatureFail'
,
APPROVAL_USER_CONTROL_RESETVALUE
:
'approvalUserControlResetValue'
,
}
develop/@gms/gms-plugin-billexpand/src/control/approval-user-control/approval-user-control.vue
View file @
b76b7936
...
...
@@ -133,7 +133,7 @@
<
script
>
const
TABLE_NAME
=
"MD_SPYJ"
import
ConfirmPopover
from
'./confirm-popover'
import
{
BILL_GLOBAL_PARAM
}
from
'../../constant'
;
import
{
BILL_GLOBAL_PARAM
,
GLOBAL_EVENT
}
from
'../../constant'
;
export
default
{
name
:
'ApprovalUserControl'
,
...
...
@@ -203,6 +203,7 @@ export default {
this
.
currentTagId
=
window
.
nros
.
context
.
getCurrTag
()
window
.
GMS
.
vbus
.
$on
(
'approval-user-control-edit'
,
this
.
openEditModal
)
window
.
GMS
.
vbus
.
$on
(
'approval-user-control-add'
,
this
.
handleAdd
)
window
.
GMS
.
vbus
.
$on
(
GLOBAL_EVENT
.
APPROVAL_USER_CONTROL_RESETVALUE
,
this
.
resetValue
)
this
.
getSuggestionOptions
()
},
beforeDestroy
()
{
...
...
@@ -210,6 +211,10 @@ export default {
window
.
GMS
.
vbus
.
$off
(
'approval-user-control-add'
,
this
.
handleAdd
)
},
methods
:
{
resetValue
()
{
if
(
this
.
currentTagId
&&
this
.
currentTagId
!=
window
.
nros
.
context
.
getCurrTag
())
return
this
.
value
=
''
},
showDeletePopover
(
suggestion
)
{
this
.
$set
(
suggestion
,
'visible'
,
true
)
},
...
...
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