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
ede254bb
Commit
ede254bb
authored
Feb 18, 2022
by
袁成
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
5b20c91c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
10 deletions
+3
-10
agreeAction.js
...lop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
+0
-2
rejectAction.js
...op/@gms/gms-plugin-billexpand/src/actions/rejectAction.js
+0
-2
index.vue
...ms-plugin-billexpand/src/control/baseDataSelect/index.vue
+1
-3
select-table.vue
...in-billexpand/src/control/baseDataSelect/select-table.vue
+2
-3
No files found.
develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
View file @
ede254bb
import
{
getUUID
}
from
"../query-actions/util/lib"
;
import
Bridge
from
'../components-control/util/bridge'
import
SelectApprovers
from
'../components-control/select-approvers.vue'
export
default
{
...
...
@@ -90,7 +89,6 @@ export default {
}
},
approval
:
function
(
bill
,
param
)
{
let
billId
=
bill
.
getMasterData
().
getValue
(
'id'
);
let
taskId
=
bill
.
getGlobalParam
(
'reviewParam'
).
taskId
;
let
comments
=
bill
.
getGlobalParam
(
'reviewParam'
).
suggestions
?
bill
.
getGlobalParam
(
'reviewParam'
).
suggestions
:
""
;
GMS
.
$http
.
post
(
'/gms/workflow/task/completed/'
+
taskId
+
'?result=1&comments='
+
comments
).
then
(
...
...
develop/@gms/gms-plugin-billexpand/src/actions/rejectAction.js
View file @
ede254bb
import
{
getUUID
}
from
"../query-actions/util/lib"
;
import
Bridge
from
'../components-control/util/bridge'
export
default
{
execute
:
function
(
bill
,
param
)
{
...
...
@@ -32,7 +31,6 @@ export default {
}
},
approval
:
function
(
bill
,
param
){
let
billId
=
bill
.
getMasterData
().
getValue
(
'id'
);
let
taskId
=
bill
.
getGlobalParam
(
'reviewParam'
).
taskId
;
let
comments
=
bill
.
getGlobalParam
(
'reviewParam'
).
suggestions
?
bill
.
getGlobalParam
(
'reviewParam'
).
suggestions
:
""
;
GMS
.
$http
.
post
(
'/gms/workflow/task/completed/'
+
taskId
+
'?result=3&comments='
+
comments
).
then
(
...
...
develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue
View file @
ede254bb
...
...
@@ -7,7 +7,6 @@
<Icon
type=
"ios-more"
class=
"more-select"
slot=
"suffix"
@
click=
"handleInputSelect"
/>
</Input>
</div>
<!--
<div
class=
"api"
slot=
"content"
>
-->
<ul
ref=
"searchList"
class=
"acct-search-list"
:class=
"
{'is-focus': hasFocus}" @mouseleave="onResultList = false" @mouseenter="onResultList = true">
<li
:class=
"['acct-search-item',selectIndex === index ? 'selected' : '',
{active: activeName == item.name}]" v-for="(item,index) in baseDataList" :key="item.code" :value="item.code" @click="handleMainSearchSelectClick(item)">
<span
class=
"acct-search-label"
>
{{
item
.
code
+
' '
+
item
.
name
}}
</span>
...
...
@@ -16,7 +15,6 @@
<span
class=
"list-empty"
>
无匹配数据
</span>
</li>
</ul>
<!--
</div>
-->
</el-popover>
<!-- 弹框 -->
<EditModal
v-if=
"showModal"
v-model=
"showModal"
:title=
"title"
:selection=
"selection"
:table-name=
"tableName"
:multiple=
"multiple"
:tableKey=
"tableKey"
:treeKey=
"treeKey"
:tableColumns=
"tableColumns"
:searchPlaceholder=
"searchPlaceholder"
:authType=
"authType"
:versionDate=
"versionDate"
:modalWidth=
"modalWidth"
:isLeaf=
"isLeaf"
:hideSelected=
"hideSelected"
:structtype=
"structtype"
:groupTableName=
"groupTableName"
:treeTableName=
"treeTableName"
:filterFormular=
"filterFormular"
:filterFormularSP=
"filterFormularSP"
:billdefineName=
"billdefineName"
:billId=
"billId"
:bill=
"bill"
:isFilter=
"isFilter"
:rowIndex=
"rowIndex"
@
on-ok=
"onSelectOk"
/>
...
...
@@ -26,7 +24,7 @@
import
EditModal
from
'./edit-modal.vue'
import
baseDataMixin
from
'./baseDataMixin'
import
indexMixin
from
'./indexMixin'
import
{
addResizeListener
,
removeResizeListener
}
from
'element-ui/src/utils/resize-event'
import
{
addResizeListener
}
from
'element-ui/src/utils/resize-event'
export
default
{
mixins
:
[
indexMixin
,
baseDataMixin
],
...
...
develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/select-table.vue
View file @
ede254bb
...
...
@@ -178,7 +178,7 @@ export default {
GMS
.
$http
.
post
(
'/org/data/list'
,
param
)
.
then
((
res
)
=>
{
const
{
rows
,
rs
,
total
}
=
res
.
data
const
{
rows
,
total
}
=
res
.
data
this
.
pageTotal
=
total
let
_tabledatas
=
rows
this
.
refreshRowsCheckStatus
(
this
.
selection
,
_tabledatas
)
...
...
@@ -190,7 +190,6 @@ export default {
console
.
log
(
'error'
,
err
)
})
}
else
{
let
that
=
this
this
.
loading
=
true
// 更新右侧table
let
postData
=
{}
...
...
@@ -248,7 +247,7 @@ export default {
this
.
tableDatas
=
[]
return
}
const
{
rows
,
rs
,
total
}
=
response
.
data
const
{
rows
,
total
}
=
response
.
data
this
.
pageTotal
=
total
let
_tabledatas
=
rows
...
...
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