FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-06 07:21:24 +08:00
Code Packages Releases Activity

modify AffairController

Browse Source
This commit is contained in:
assina045
2023-05-18 19:52:37 +08:00
parent ff22d02bbb
commit 0f36884afb
2 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java
View File

@@ -39,6 +39,16 @@ public class AffairController {
return ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", affairService.save(affair));
}
@GetMapping("/add/getUser")
public ResponseResult getUser() {
List<User> userList = (List<User>)userController.getAllUser().getData();
return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",userList);
}//获取数据库中所有用户
@GetMapping("/add/getCurrentUser")
public ResponseResult getCurrentUser() {
return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",WebUtil.getLoginUser().getUser());
}//获取当前用户

59
ui/src/components/ApplicantsAddAffairs.vue
View File

@@ -6,16 +6,16 @@
</el-col>
</el-form-item>
<!-- <el-form-item label="申请者:">-->
<!-- <el-col :span="3">-->
<!-- <el-input-->
<!-- v-model="form.applicantId"-->
<!-- class="shortInput"-->
<!-- disabled-->
<!-- :placeholder="currentUser.username"-->
<!-- />-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<el-form-item label="申请者:">
<el-col :span="3">
<el-input
v-model="form.applicantId"
class="shortInput"
disabled
:placeholder="currentUser.username"
/>
</el-col>
</el-form-item>
<el-form-item label="审批者:">
<el-col :span="4">
@@ -109,22 +109,6 @@ export default {
]
}
},
// created: {
// // request(form) {
// // post("localhost:8686/addAffairs",
// // {
// // affairsName: form.affairsName,
// // Applicants: form.Applicants,
// // Approver: form.Approver,
// // affairsType: form.affairsType,
// // Date: form.Date,
// // Time: form.Time,
// // affairsContent: form.affairsContent
// // },
// // )
// // get("localhost:8686/addAffairs")
// // }
// },
methods: {
onSubmit: function (form) {
this.form.applicantId = this.currentUser.id
@@ -205,23 +189,22 @@ export default {
.catch((reportError) => {
console.log(reportError)
}) // 数据库中获取用户
},
getCurrentUser() {
request
.get('http://localhost:8621/affair/add/getCurrentUser')
.then((response) => {
this.currentUser = response.data.data
})
.catch((reportError) => {
console.log(reportError)
})
}
// ,
// getCurrentUser() {
// request
// .get('http://localhost:8621/affair/add/getCurrentUser')
// .then((response) => {
// this.currentUser = response.data.data
// })
// .catch((reportError) => {
// console.log(reportError)
// })
// }
},
created() {
this.alarm()
this.getUser()
// this.getCurrentUser()
this.getCurrentUser()
},
mounted() {
this.$nextTick(function () {