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
04361fbc
Commit
04361fbc
authored
Mar 22, 2022
by
袁成
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend
into develop-yuancheng
parents
b0656467
0c586a66
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
21 deletions
+33
-21
saveAction.js
develop/@gms/gms-plugin-billexpand/src/actions/saveAction.js
+3
-2
submitAction.js
...op/@gms/gms-plugin-billexpand/src/actions/submitAction.js
+2
-1
SetSubFieldsByBaseData.js
...s-plugin-billexpand/src/formula/SetSubFieldsByBaseData.js
+0
-4
index.vue
develop/@rbc/rbc-login/src/views/login/index.vue
+12
-1
bill-form-runner.vue
develop/@rbc/runner-bill-form/src/views/bill-form-runner.vue
+16
-13
No files found.
develop/@gms/gms-plugin-billexpand/src/actions/saveAction.js
View file @
04361fbc
...
...
@@ -112,11 +112,12 @@ export default {
bill
.
getMasterData
().
setValue
(
"billCode"
,
response
.
data
.
content
.
billData
.
billCode
);
const
id
=
response
.
data
.
content
.
billData
.
id
;
initIndexZero
();
//处理上张下张
let
curTagId
=
window
.
nros
.
context
.
getCurrTag
();
GMS
.
vbus
.
$Message
.
success
(
"保存成功"
);
if
(
param
.
param
&&
param
.
param
.
isApprove
)
{
GMS
.
vbus
.
$emit
(
'change-form-state'
,
{
state
:
''
})
GMS
.
vbus
.
$emit
(
'change-form-state'
,
{
state
:
''
}
,
curTagId
)
}
else
{
GMS
.
vbus
.
$emit
(
'change-form-state'
,
{
state
:
'readOnly'
,
billId
:
id
})
GMS
.
vbus
.
$emit
(
'change-form-state'
,
{
state
:
'readOnly'
,
billId
:
id
}
,
curTagId
)
}
// GMS.vbus.$emit("saveSuccess", buidData, param);
}
else
{
...
...
develop/@gms/gms-plugin-billexpand/src/actions/submitAction.js
View file @
04361fbc
...
...
@@ -86,7 +86,8 @@ export default {
const
id
=
data
.
content
.
billData
.
id
;
minusIndex
();
//上张下张用
GMS
.
$hideContainer
.
$Message
.
success
(
'提交成功'
);
GMS
.
vbus
.
$emit
(
"workflow-state-change"
,
90
)
let
curTagId
=
window
.
nros
.
context
.
getCurrTag
();
GMS
.
vbus
.
$emit
(
"workflow-state-change"
,
90
,
curTagId
);
}
else
if
(
code
===
201
)
{
GMS
.
$hideContainer
.
$Spin
.
hide
()
data
.
message
&&
GMS
.
$hideContainer
.
$Message
.
error
({
...
...
develop/@gms/gms-plugin-billexpand/src/formula/SetSubFieldsByBaseData.js
View file @
04361fbc
...
...
@@ -53,10 +53,6 @@ export default {
}
if
(
baseDataParamArrayList
.
length
===
targetSubTableFieldList
.
length
&&
targetSubTableFieldList
.
length
>
0
)
{
this
.
getCombBaseDataList
(
baseDataParamArrayList
,
(
baseDataList
)
=>
{
let
newIndex
=
context
.
getSubFocus
()
if
(
oldIndex
!==
newIndex
)
{
context
.
setSubFocus
(
oldIndex
)
}
focusData
[
sourceBaseDataField
.
FieldCode
].
_field_old_value_
=
focusData
[
sourceBaseDataField
.
FieldCode
].
value
for
(
let
i
=
0
;
i
<
targetSubTableFieldList
.
length
;
i
++
)
{
focusData
[
targetSubTableFieldList
[
i
].
FieldCode
].
_field_old_value_
=
focusData
[
targetSubTableFieldList
[
i
].
FieldCode
].
value
=
baseDataList
[
i
]
...
...
develop/@rbc/rbc-login/src/views/login/index.vue
View file @
04361fbc
...
...
@@ -117,6 +117,7 @@ export default {
titleColor
:
'black'
,
Image
:
""
,
imgLoading
:
0
,
checkLogin
:
true
,
// 默认当作已经登录了,因为已经登录的时候不能再进登录页
userData
:
{
username
:
""
,
password
:
""
,
...
...
@@ -160,6 +161,12 @@ export default {
this
.
getLoginAssetsInfo
();
},
mounted
()
{
window
.
GMS
.
util
.
nvwa
.
checkLogin
().
then
(()
=>
{
this
.
checkLogin
=
true
this
.
$Message
.
error
(
'您已登录,请先注销'
)
}).
catch
(()
=>
{
this
.
checkLogin
=
false
})
document
.
addEventListener
(
'keyup'
,
this
.
onKeyUp
)
this
.
getVerificationCode
();
},
...
...
@@ -229,6 +236,10 @@ export default {
},
submit
()
{
if
(
this
.
checkLogin
)
{
this
.
$Message
.
error
(
'您已登录,请先注销'
)
return
}
this
.
$refs
[
"userData"
].
validate
((
valid
)
=>
{
if
(
valid
)
{
this
.
loginLoading
=
true
;
...
...
@@ -307,7 +318,7 @@ export default {
width
:
100%
;
height
:
100%
;
background-color
:
white
;
z-index
:
20
00
;
z-index
:
1
00
;
}
.login-img-bg
{
...
...
develop/@rbc/runner-bill-form/src/views/bill-form-runner.vue
View file @
04361fbc
...
...
@@ -57,7 +57,10 @@ export default {
this
.
$portalAPI
.
off
(
'on-close-tag'
,
this
.
checkBillChange
)
},
methods
:
{
changeFormState
(
param
){
changeFormState
(
param
,
curTagId
){
if
(
curTagId
!=
this
.
curTagId
){
return
}
if
(
param
&&
Object
.
prototype
.
toString
.
call
(
param
)
==
'[object Object]'
){
const
{
state
,
billId
}
=
param
;
if
(
billId
!==
undefined
)
{
...
...
@@ -70,6 +73,18 @@ export default {
this
.
init
=
true
;
});
},
changeData
(
billId
,
state
,
curTagId
)
{
if
(
curTagId
!=
this
.
curTagId
){
return
}
this
.
init
=
false
;
this
.
$nextTick
(()
=>
{
this
.
type
=
'load'
;
this
.
state
=
state
;
this
.
init
=
true
;
this
.
billId
=
billId
;
});
},
checkBillChange
(
cb
,
id
)
{
if
(
id
!=
this
.
curTagId
)
{
cb
(
true
)
...
...
@@ -110,18 +125,6 @@ export default {
GMS
.
oldBillDataMap
[
this
.
curTagId
]
=
bill
.
getBuillData
()
},
100
);
},
changeData
(
billId
,
state
,
curTagId
)
{
if
(
curTagId
!=
this
.
curTagId
){
return
}
this
.
init
=
false
;
this
.
$nextTick
(()
=>
{
this
.
type
=
'load'
;
this
.
state
=
state
;
this
.
init
=
true
;
this
.
billId
=
billId
;
});
},
},
};
</
script
>
...
...
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