Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
c747000a
Commit
c747000a
authored
Jan 27, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加窗口人员查询
parent
82e6c8ee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js
...formance-manager-ui/admin/src/assets/mixins/formdialog.js
+0
-2
attendance-performance-manager-ui/admin/src/views/window/owner/drawershow.vue
...ce-manager-ui/admin/src/views/window/owner/drawershow.vue
+6
-6
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/web/WindowOwnerController.java
.../mortals/xhx/module/window/web/WindowOwnerController.java
+1
-1
No files found.
attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js
View file @
c747000a
...
@@ -16,7 +16,6 @@ export default {
...
@@ -16,7 +16,6 @@ export default {
},
},
];
];
}
}
console
.
log
(
data
);
return
data
;
return
data
;
},
},
// 渲染后置处理
// 渲染后置处理
...
@@ -26,7 +25,6 @@ export default {
...
@@ -26,7 +25,6 @@ export default {
data
.
attachmentPathList
&&
data
.
attachmentPathList
.
length
>
0
data
.
attachmentPathList
&&
data
.
attachmentPathList
.
length
>
0
?
(
data
.
attachmentPath
=
data
.
attachmentPathList
[
0
].
url
)
?
(
data
.
attachmentPath
=
data
.
attachmentPathList
[
0
].
url
)
:
(
data
.
attachmentPath
=
""
);
:
(
data
.
attachmentPath
=
""
);
console
.
log
(
data
);
return
data
;
return
data
;
},
},
...
...
attendance-performance-manager-ui/admin/src/views/window/owner/drawershow.vue
View file @
c747000a
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
</el-cascader>
</el-cascader>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<!--
<Field
<!--
<Field
label=
"部门"
label=
"部门"
prop=
"deptId"
prop=
"deptId"
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
v-model=
"form.number"
v-model=
"form.number"
placeholder=
"请输入工号"
placeholder=
"请输入工号"
/>
-->
/>
-->
<!--
<Field
<!--
<Field
label=
"负责窗口数量"
label=
"负责窗口数量"
prop=
"windowCount"
prop=
"windowCount"
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
<el-button
type=
"primary"
@
click=
"onSubmitSearch"
>
查询
</el-button>
<el-button
type=
"primary"
@
click=
"onSubmitSearch"
>
查询
</el-button>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
</div>
</div>
</div>
</div>
<el-table
<el-table
...
@@ -137,8 +137,8 @@ export default {
...
@@ -137,8 +137,8 @@ export default {
mixins
:
[
form
],
mixins
:
[
form
],
components
:
{},
components
:
{},
created
()
{
created
()
{
this
.
changePath
(
"
window/owner
"
);
//
this.changePath("window/owner");
this
.
getUser
()
//
this.getUser()
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -167,7 +167,7 @@ export default {
...
@@ -167,7 +167,7 @@ export default {
]
]
},
},
userList
:{},
userList
:{},
};
};
},
},
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/web/WindowOwnerController.java
View file @
c747000a
...
@@ -82,7 +82,7 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win
...
@@ -82,7 +82,7 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win
siteHallPdu
.
setSiteId
(
1L
);
siteHallPdu
.
setSiteId
(
1L
);
Rest
<
RespData
<
List
<
SiteHallPdu
>>>
rest
=
siteHallFeign
.
list
(
siteHallPdu
);
Rest
<
RespData
<
List
<
SiteHallPdu
>>>
rest
=
siteHallFeign
.
list
(
siteHallPdu
);
if
(
YesNoEnum
.
YES
.
getValue
()
==
rest
.
getCode
())
{
if
(
YesNoEnum
.
YES
.
getValue
()
==
rest
.
getCode
())
{
Map
<
Long
,
String
>
hallMap
=
rest
.
getData
().
getData
().
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
(),
y
->
y
.
getHallName
(),
(
o
,
n
)
->
n
));
Map
<
String
,
String
>
hallMap
=
rest
.
getData
().
getData
().
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getHallName
(),
(
o
,
n
)
->
n
));
this
.
addDict
(
model
,
"hallId"
,
hallMap
);
this
.
addDict
(
model
,
"hallId"
,
hallMap
);
}
}
...
...
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