Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
K
karname-ui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
Reza Sahebgharan
karname-ui
Commits
4f9d6815
Commit
4f9d6815
authored
Dec 23, 2019
by
Reza Sahebgharan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(bug fix devicemap combobox): edit bindings of code in pacs and hisname
parent
c6e11e77
Pipeline
#744
passed with stages
in 50 minutes and 44 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
5 deletions
+22
-5
Client.vue
client/components/Client.vue
+1
-1
DeviceMap.vue
client/components/DeviceMap.vue
+20
-3
Login.vue
client/views/Login.vue
+1
-1
No files found.
client/components/Client.vue
View file @
4f9d6815
...
@@ -147,7 +147,7 @@ export default {
...
@@ -147,7 +147,7 @@ export default {
}
}
},
},
openNewDialog
()
{
openNewDialog
()
{
debugger
;
for
(
let
prop
in
this
.
ClientForm
)
{
for
(
let
prop
in
this
.
ClientForm
)
{
this
.
$set
(
this
.
ClientForm
,
prop
,
""
);
this
.
$set
(
this
.
ClientForm
,
prop
,
""
);
}
}
...
...
client/components/DeviceMap.vue
View file @
4f9d6815
...
@@ -192,10 +192,12 @@ export default {
...
@@ -192,10 +192,12 @@ export default {
}
}
},
},
openNewDialog
()
{
openNewDialog
()
{
debugger
;
;
for
(
let
prop
in
this
.
DevicemapForm
)
{
for
(
let
prop
in
this
.
DevicemapForm
)
{
this
.
$set
(
this
.
DevicemapForm
,
prop
,
""
);
this
.
$set
(
this
.
DevicemapForm
,
prop
,
""
);
}
}
this
.
selectedClient
=
undefined
;
this
.
selectedHisLink
=
undefined
;
this
.
$set
(
this
.
DevicemapForm
,
"_id"
,
""
);
this
.
$set
(
this
.
DevicemapForm
,
"_id"
,
""
);
this
.
newOrEdit
=
"new"
;
this
.
newOrEdit
=
"new"
;
this
.
dialog
=
true
;
this
.
dialog
=
true
;
...
@@ -214,6 +216,21 @@ export default {
...
@@ -214,6 +216,21 @@ export default {
);
);
}
}
}
}
this
.
selectedClient
=
undefined
;
this
.
selectedHisLink
=
undefined
;
let
me
=
this
;
this
.
selectedClient
=
this
.
clients
.
filter
(
client
=>
{
return
client
.
Caption
==
me
.
DevicemapForm
.
CodeInPacs
;
})[
0
];
this
.
selectedHisLink
=
this
.
hislink
.
filter
(
hislink
=>
{
return
hislink
.
Name
==
me
.
DevicemapForm
.
HisName
;
})[
0
];
this
.
$set
(
this
.
DevicemapForm
,
"_id"
,
this
.
selectedItemInTable
[
0
][
"_id"
]);
this
.
$set
(
this
.
DevicemapForm
,
"_id"
,
this
.
selectedItemInTable
[
0
][
"_id"
]);
this
.
newOrEdit
=
"edit"
;
this
.
newOrEdit
=
"edit"
;
this
.
dialog
=
true
;
this
.
dialog
=
true
;
...
@@ -222,7 +239,7 @@ export default {
...
@@ -222,7 +239,7 @@ export default {
this
.
loading
=
true
;
this
.
loading
=
true
;
let
me
=
this
;
let
me
=
this
;
if
(
this
.
newOrEdit
==
"new"
)
{
if
(
this
.
newOrEdit
==
"new"
)
{
debugger
if
(
this
.
selectedClient
!=
undefined
&&
this
.
selectedClient
!=
null
)
if
(
this
.
selectedClient
!=
undefined
&&
this
.
selectedClient
!=
null
)
this
.
DevicemapForm
.
CodeInPacs
=
this
.
selectedClient
.
Caption
;
this
.
DevicemapForm
.
CodeInPacs
=
this
.
selectedClient
.
Caption
;
...
@@ -236,7 +253,7 @@ export default {
...
@@ -236,7 +253,7 @@ export default {
});
});
}
}
if
(
this
.
newOrEdit
==
"edit"
)
{
if
(
this
.
newOrEdit
==
"edit"
)
{
debugger
if
(
this
.
selectedClient
!=
undefined
&&
this
.
selectedClient
!=
null
)
if
(
this
.
selectedClient
!=
undefined
&&
this
.
selectedClient
!=
null
)
this
.
DevicemapForm
.
CodeInPacs
=
this
.
selectedClient
.
Caption
;
this
.
DevicemapForm
.
CodeInPacs
=
this
.
selectedClient
.
Caption
;
...
...
client/views/Login.vue
View file @
4f9d6815
...
@@ -180,7 +180,7 @@ export default {
...
@@ -180,7 +180,7 @@ export default {
},
},
beforeRouteEnter
(
to
,
from
,
next
)
{
beforeRouteEnter
(
to
,
from
,
next
)
{
next
(
vm
=>
{
next
(
vm
=>
{
debugger
;
// if (Meteor.userId()) {
// if (Meteor.userId()) {
// vm.$router.push("/main/worklist");
// vm.$router.push("/main/worklist");
...
...
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