abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询员工信息列表附带科室信息传入弹出层

Browse Source
This commit is contained in:
ryoeiken 2020-12-04 16:01:19 +08:00
parent 5a2a31c552
commit e94a6eeec2
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
View File

@ -59,8 +59,7 @@ public class FtStaffInfoDaoController extends BaseController {
@GetMapping("/staffListWithDepart")
public AjaxResult staffListWithDepart() {
return AjaxResult.success(null);
return AjaxResult.success(iFtStaffInfoDaoService.selectStaffInfoWithDepart());
}
/**

2
ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
View File

@ -14,6 +14,6 @@ import java.util.List;
*/
public interface FtStaffInfoDaoMapper extends BaseMapper<FtStaffInfoDao> {
@Select("")
@Select("SELECT a.*, b.depart_name from ft_staff_info a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where staff_type = 1")
List<FtStaffInfoDao> selectStaffInfoWithDepart();
}

7
ruoyi-ui/src/api/fantang/staffInfo.js
View File

@ -9,6 +9,13 @@ export function listStaffInfo(query) {
})
}
export function staffListWithDepart() {
return request({
url: '/fantang/staffInfo/staffListWithDepart',
method: 'get',
})
}
// 查询护工管理列表
export function careStaffList(query) {
return request({

9
ruoyi-ui/src/views/fantang/subsidy/index.vue
View File

@ -143,7 +143,7 @@
<el-dialog title="选择发放员工" :visible.sync="showPopupSubsidyGiveOut" width="500px" align="center">
<el-table :data="staffData">
<el-table-column type="selection" width="55" align="center" />
<el-table-column property="departId" label="科室" width="200"></el-table-column>
<el-table-column property="departName" label="科室" width="200"></el-table-column>
<el-table-column property="name" label="姓名" width="150"></el-table-column>
</el-table>
<br>
@ -186,7 +186,7 @@
<script>
import {addSubsidy, delSubsidy, exportSubsidy, getSubsidy, listSubsidy, updateSubsidy} from "@/api/fantang/subsidy";
import {listStaffInfo} from "@/api/fantang/staffInfo";
import {staffListWithDepart} from "@/api/fantang/staffInfo";
export default {
name: "Subsidy",
@ -251,8 +251,9 @@ export default {
// 响应发放补贴按钮
clickSubsidyGiveOut(row) {
listStaffInfo().then(response => {
this.staffData = response.rows;
staffListWithDepart().then(response => {
console.log(response);
this.staffData = response.data;
this.showPopupSubsidyGiveOut = true;
})