From 64bd494733f07b040081d39f323b9fa7edc560f8 Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Tue, 24 Nov 2020 17:56:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- .../controller/FtDepartDaoController.java | 74 ++++--- .../controller/FtFoodDaoController.java | 79 ++++---- .../controller/FtPatientDaoController.java | 78 ++++---- .../controller/FtStaffInfoDaoController.java | 37 +++- .../system/fantang/domain/FtDepartDao.java | 30 +-- .../system/fantang/domain/FtFoodDao.java | 42 ++-- .../system/fantang/domain/FtPatientDao.java | 47 +++-- .../system/fantang/domain/FtStaffInfoDao.java | 43 ++++- .../fantang/mapper/FtDepartDaoMapper.java | 4 +- .../fantang/mapper/FtFoodDaoMapper.java | 4 +- .../fantang/mapper/FtPatientDaoMapper.java | 4 +- .../fantang/service/IFtDepartDaoService.java | 4 +- .../fantang/service/IFtFoodDaoService.java | 4 +- .../fantang/service/IFtPatientDaoService.java | 4 +- .../service/impl/FtDepartDaoServiceImpl.java | 10 +- .../service/impl/FtFoodDaoServiceImpl.java | 10 +- .../service/impl/FtPatientDaoServiceImpl.java | 10 +- .../mapper/fantang/FtDepartDaoMapper.xml | 1 + .../mapper/fantang/FtPatientDaoMapper.xml | 4 + .../mapper/fantang/FtStaffInfoDaoMapper.xml | 33 ++-- .../src/views/fantang/careStaffInfo/index.vue | 181 +++++++++++------- ruoyi-ui/src/views/fantang/depart/index.vue | 93 +++++---- ruoyi-ui/src/views/fantang/food/index.vue | 133 +++++++------ ruoyi-ui/src/views/fantang/patient/index.vue | 46 ++++- .../src/views/fantang/staffInfo/index.vue | 157 ++++++++++++--- ruoyi-ui/vue.config.js | 2 +- 28 files changed, 738 insertions(+), 400 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 3257d8cf7..4d3a41b1e 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -8,7 +8,7 @@ 3.2.1 4.0.0 - jar + war ruoyi-admin diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 073a856dd..512896e0c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -18,7 +18,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8080 + port: 9000 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtDepartDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtDepartDaoController.java index 13b9f1ced..d54164033 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtDepartDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtDepartDaoController.java @@ -1,33 +1,41 @@ package com.ruoyi.system.fantang.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +import java.util.List; +import java.util.Arrays; + import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.fantang.domain.FtDepartDao; import com.ruoyi.system.fantang.service.IFtDepartDaoService; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; /** * 科室管理Controller - * + * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController -@RequestMapping("/fantang/depart") +@RequestMapping("/fantang/depart" ) public class FtDepartDaoController extends BaseController { private final IFtDepartDaoService iFtDepartDaoService; @@ -37,11 +45,15 @@ public class FtDepartDaoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('fantang:depart:list')") @GetMapping("/list") - public TableDataInfo list(FtDepartDao ftDepartDao) { + public TableDataInfo list(FtDepartDao ftDepartDao) + { startPage(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftDepartDao); - if (StringUtils.isNotBlank(ftDepartDao.getDepartName())) { - lqw.like(FtDepartDao::getDepartName, ftDepartDao.getDepartName()); + if (StringUtils.isNotBlank(ftDepartDao.getDepartName())){ + lqw.like(FtDepartDao::getDepartName ,ftDepartDao.getDepartName()); + } + if (StringUtils.isNotBlank(ftDepartDao.getDepartCode())){ + lqw.eq(FtDepartDao::getDepartCode ,ftDepartDao.getDepartCode()); } List list = iFtDepartDaoService.list(lqw); return getDataTable(list); @@ -50,30 +62,30 @@ public class FtDepartDaoController extends BaseController { /** * 导出科室管理列表 */ - @PreAuthorize("@ss.hasPermi('fantang:depart:export')") - @Log(title = "科室管理", businessType = BusinessType.EXPORT) - @GetMapping("/export") + @PreAuthorize("@ss.hasPermi('fantang:depart:export')" ) + @Log(title = "科室管理" , businessType = BusinessType.EXPORT) + @GetMapping("/export" ) public AjaxResult export(FtDepartDao ftDepartDao) { LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftDepartDao); List list = iFtDepartDaoService.list(lqw); - ExcelUtil util = new ExcelUtil(FtDepartDao.class); - return util.exportExcel(list, "depart"); + ExcelUtil util = new ExcelUtil(FtDepartDao. class); + return util.exportExcel(list, "depart" ); } /** * 获取科室管理详细信息 */ - @PreAuthorize("@ss.hasPermi('fantang:depart:query')") - @GetMapping(value = "/{departId}") - public AjaxResult getInfo(@PathVariable("departId") Long departId) { + @PreAuthorize("@ss.hasPermi('fantang:depart:query')" ) + @GetMapping(value = "/{departId}" ) + public AjaxResult getInfo(@PathVariable("departId" ) Long departId) { return AjaxResult.success(iFtDepartDaoService.getById(departId)); } /** * 新增科室管理 */ - @PreAuthorize("@ss.hasPermi('fantang:depart:add')") - @Log(title = "科室管理", businessType = BusinessType.INSERT) + @PreAuthorize("@ss.hasPermi('fantang:depart:add')" ) + @Log(title = "科室管理" , businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody FtDepartDao ftDepartDao) { return toAjax(iFtDepartDaoService.save(ftDepartDao) ? 1 : 0); @@ -82,8 +94,8 @@ public class FtDepartDaoController extends BaseController { /** * 修改科室管理 */ - @PreAuthorize("@ss.hasPermi('fantang:depart:edit')") - @Log(title = "科室管理", businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('fantang:depart:edit')" ) + @Log(title = "科室管理" , businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody FtDepartDao ftDepartDao) { return toAjax(iFtDepartDaoService.updateById(ftDepartDao) ? 1 : 0); @@ -92,9 +104,9 @@ public class FtDepartDaoController extends BaseController { /** * 删除科室管理 */ - @PreAuthorize("@ss.hasPermi('fantang:depart:remove')") - @Log(title = "科室管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{departIds}") + @PreAuthorize("@ss.hasPermi('fantang:depart:remove')" ) + @Log(title = "科室管理" , businessType = BusinessType.DELETE) + @DeleteMapping("/{departIds}" ) public AjaxResult remove(@PathVariable Long[] departIds) { return toAjax(iFtDepartDaoService.removeByIds(Arrays.asList(departIds)) ? 1 : 0); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDaoController.java index dcf6eeeb8..736246ea7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDaoController.java @@ -1,33 +1,41 @@ package com.ruoyi.system.fantang.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +import java.util.List; +import java.util.Arrays; + import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.fantang.domain.FtFoodDao; import com.ruoyi.system.fantang.service.IFtFoodDaoService; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; /** * 食品管理Controller - * + * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController -@RequestMapping("/fantang/food") +@RequestMapping("/fantang/food" ) public class FtFoodDaoController extends BaseController { private final IFtFoodDaoService iFtFoodDaoService; @@ -37,17 +45,18 @@ public class FtFoodDaoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('fantang:food:list')") @GetMapping("/list") - public TableDataInfo list(FtFoodDao ftFoodDao) { + public TableDataInfo list(FtFoodDao ftFoodDao) + { startPage(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftFoodDao); - if (StringUtils.isNotBlank(ftFoodDao.getName())) { - lqw.like(FtFoodDao::getName, ftFoodDao.getName()); + if (StringUtils.isNotBlank(ftFoodDao.getName())){ + lqw.like(FtFoodDao::getName ,ftFoodDao.getName()); } - if (ftFoodDao.getPrice() != null) { - lqw.eq(FtFoodDao::getPrice, ftFoodDao.getPrice()); + if (ftFoodDao.getPrice() != null){ + lqw.eq(FtFoodDao::getPrice ,ftFoodDao.getPrice()); } - if (ftFoodDao.getType() != null) { - lqw.eq(FtFoodDao::getType, ftFoodDao.getType()); + if (ftFoodDao.getType() != null){ + lqw.eq(FtFoodDao::getType ,ftFoodDao.getType()); } List list = iFtFoodDaoService.list(lqw); return getDataTable(list); @@ -56,30 +65,30 @@ public class FtFoodDaoController extends BaseController { /** * 导出食品管理列表 */ - @PreAuthorize("@ss.hasPermi('fantang:food:export')") - @Log(title = "食品管理", businessType = BusinessType.EXPORT) - @GetMapping("/export") + @PreAuthorize("@ss.hasPermi('fantang:food:export')" ) + @Log(title = "食品管理" , businessType = BusinessType.EXPORT) + @GetMapping("/export" ) public AjaxResult export(FtFoodDao ftFoodDao) { LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftFoodDao); List list = iFtFoodDaoService.list(lqw); - ExcelUtil util = new ExcelUtil(FtFoodDao.class); - return util.exportExcel(list, "food"); + ExcelUtil util = new ExcelUtil(FtFoodDao. class); + return util.exportExcel(list, "food" ); } /** * 获取食品管理详细信息 */ - @PreAuthorize("@ss.hasPermi('fantang:food:query')") - @GetMapping(value = "/{foodId}") - public AjaxResult getInfo(@PathVariable("foodId") Long foodId) { + @PreAuthorize("@ss.hasPermi('fantang:food:query')" ) + @GetMapping(value = "/{foodId}" ) + public AjaxResult getInfo(@PathVariable("foodId" ) Long foodId) { return AjaxResult.success(iFtFoodDaoService.getById(foodId)); } /** * 新增食品管理 */ - @PreAuthorize("@ss.hasPermi('fantang:food:add')") - @Log(title = "食品管理", businessType = BusinessType.INSERT) + @PreAuthorize("@ss.hasPermi('fantang:food:add')" ) + @Log(title = "食品管理" , businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody FtFoodDao ftFoodDao) { return toAjax(iFtFoodDaoService.save(ftFoodDao) ? 1 : 0); @@ -88,8 +97,8 @@ public class FtFoodDaoController extends BaseController { /** * 修改食品管理 */ - @PreAuthorize("@ss.hasPermi('fantang:food:edit')") - @Log(title = "食品管理", businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('fantang:food:edit')" ) + @Log(title = "食品管理" , businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody FtFoodDao ftFoodDao) { return toAjax(iFtFoodDaoService.updateById(ftFoodDao) ? 1 : 0); @@ -98,9 +107,9 @@ public class FtFoodDaoController extends BaseController { /** * 删除食品管理 */ - @PreAuthorize("@ss.hasPermi('fantang:food:remove')") - @Log(title = "食品管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{foodIds}") + @PreAuthorize("@ss.hasPermi('fantang:food:remove')" ) + @Log(title = "食品管理" , businessType = BusinessType.DELETE) + @DeleteMapping("/{foodIds}" ) public AjaxResult remove(@PathVariable Long[] foodIds) { return toAjax(iFtFoodDaoService.removeByIds(Arrays.asList(foodIds)) ? 1 : 0); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPatientDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPatientDaoController.java index 90595fd7b..ee11e2e5b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPatientDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPatientDaoController.java @@ -1,33 +1,41 @@ package com.ruoyi.system.fantang.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +import java.util.List; +import java.util.Arrays; + import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.fantang.domain.FtPatientDao; import com.ruoyi.system.fantang.service.IFtPatientDaoService; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; /** * 病人管理Controller - * + * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController -@RequestMapping("/fantang/patient") +@RequestMapping("/fantang/patient" ) public class FtPatientDaoController extends BaseController { private final IFtPatientDaoService iFtPatientDaoService; @@ -37,14 +45,18 @@ public class FtPatientDaoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('fantang:patient:list')") @GetMapping("/list") - public TableDataInfo list(FtPatientDao ftPatientDao) { + public TableDataInfo list(FtPatientDao ftPatientDao) + { startPage(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftPatientDao); - if (StringUtils.isNotBlank(ftPatientDao.getName())) { - lqw.like(FtPatientDao::getName, ftPatientDao.getName()); + if (StringUtils.isNotBlank(ftPatientDao.getName())){ + lqw.like(FtPatientDao::getName ,ftPatientDao.getName()); } - if (StringUtils.isNotBlank(ftPatientDao.getBedId())) { - lqw.eq(FtPatientDao::getBedId, ftPatientDao.getBedId()); + if (StringUtils.isNotBlank(ftPatientDao.getBedId())){ + lqw.eq(FtPatientDao::getBedId ,ftPatientDao.getBedId()); + } + if (StringUtils.isNotBlank(ftPatientDao.getHospitalId())){ + lqw.eq(FtPatientDao::getHospitalId ,ftPatientDao.getHospitalId()); } List list = iFtPatientDaoService.list(lqw); return getDataTable(list); @@ -53,30 +65,30 @@ public class FtPatientDaoController extends BaseController { /** * 导出病人管理列表 */ - @PreAuthorize("@ss.hasPermi('fantang:patient:export')") - @Log(title = "病人管理", businessType = BusinessType.EXPORT) - @GetMapping("/export") + @PreAuthorize("@ss.hasPermi('fantang:patient:export')" ) + @Log(title = "病人管理" , businessType = BusinessType.EXPORT) + @GetMapping("/export" ) public AjaxResult export(FtPatientDao ftPatientDao) { LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftPatientDao); List list = iFtPatientDaoService.list(lqw); - ExcelUtil util = new ExcelUtil(FtPatientDao.class); - return util.exportExcel(list, "patient"); + ExcelUtil util = new ExcelUtil(FtPatientDao. class); + return util.exportExcel(list, "patient" ); } /** * 获取病人管理详细信息 */ - @PreAuthorize("@ss.hasPermi('fantang:patient:query')") - @GetMapping(value = "/{patientId}") - public AjaxResult getInfo(@PathVariable("patientId") Long patientId) { + @PreAuthorize("@ss.hasPermi('fantang:patient:query')" ) + @GetMapping(value = "/{patientId}" ) + public AjaxResult getInfo(@PathVariable("patientId" ) Long patientId) { return AjaxResult.success(iFtPatientDaoService.getById(patientId)); } /** * 新增病人管理 */ - @PreAuthorize("@ss.hasPermi('fantang:patient:add')") - @Log(title = "病人管理", businessType = BusinessType.INSERT) + @PreAuthorize("@ss.hasPermi('fantang:patient:add')" ) + @Log(title = "病人管理" , businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody FtPatientDao ftPatientDao) { return toAjax(iFtPatientDaoService.save(ftPatientDao) ? 1 : 0); @@ -85,8 +97,8 @@ public class FtPatientDaoController extends BaseController { /** * 修改病人管理 */ - @PreAuthorize("@ss.hasPermi('fantang:patient:edit')") - @Log(title = "病人管理", businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('fantang:patient:edit')" ) + @Log(title = "病人管理" , businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody FtPatientDao ftPatientDao) { return toAjax(iFtPatientDaoService.updateById(ftPatientDao) ? 1 : 0); @@ -95,9 +107,9 @@ public class FtPatientDaoController extends BaseController { /** * 删除病人管理 */ - @PreAuthorize("@ss.hasPermi('fantang:patient:remove')") - @Log(title = "病人管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{patientIds}") + @PreAuthorize("@ss.hasPermi('fantang:patient:remove')" ) + @Log(title = "病人管理" , businessType = BusinessType.DELETE) + @DeleteMapping("/{patientIds}" ) public AjaxResult remove(@PathVariable Long[] patientIds) { return toAjax(iFtPatientDaoService.removeByIds(Arrays.asList(patientIds)) ? 1 : 0); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java index 9b87ffb50..f2bbad616 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java @@ -11,19 +11,21 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.fantang.domain.FtStaffInfoDao; import com.ruoyi.system.fantang.service.IFtStaffInfoDaoService; +import com.ruoyi.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.Arrays; +import java.util.Date; import java.util.List; /** * 员工管理Controller * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @@ -32,6 +34,8 @@ public class FtStaffInfoDaoController extends BaseController { private final IFtStaffInfoDaoService iFtStaffInfoDaoService; + private final ISysUserService userService; + /** * 查询员工管理列表 */ @@ -49,6 +53,9 @@ public class FtStaffInfoDaoController extends BaseController { if (StringUtils.isNotBlank(ftStaffInfoDao.getRole())) { lqw.eq(FtStaffInfoDao::getRole, ftStaffInfoDao.getRole()); } + if (ftStaffInfoDao.getFlag() != null) { + lqw.eq(FtStaffInfoDao::getFlag, ftStaffInfoDao.getFlag()); + } List list = iFtStaffInfoDaoService.list(lqw); return getDataTable(list); } @@ -82,7 +89,31 @@ public class FtStaffInfoDaoController extends BaseController { @Log(title = "员工管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody FtStaffInfoDao ftStaffInfoDao) { - return toAjax(iFtStaffInfoDaoService.save(ftStaffInfoDao) ? 1 : 0); + + List list = iFtStaffInfoDaoService.list(null); + for (FtStaffInfoDao staffInfoDao : list) { + if (ftStaffInfoDao.getTel().equals(staffInfoDao.getTel())) { + return AjaxResult.error("该电话号码已存在"); + } + } + + // 判断是否有所属公司 + if (ftStaffInfoDao.getCorpName() == null) { + ftStaffInfoDao.setStaffType(1L); + } else { + ftStaffInfoDao.setStaffType(2L); + } + + // 判断密码是否为空 + if (ftStaffInfoDao.getPassword() == null) { + ftStaffInfoDao.setPassword("123456"); + } + + ftStaffInfoDao.setCreateAt(new Date()); + + boolean save = iFtStaffInfoDaoService.save(ftStaffInfoDao); + + return AjaxResult.success("添加成功"); } /** @@ -104,4 +135,4 @@ public class FtStaffInfoDaoController extends BaseController { public AjaxResult remove(@PathVariable Long[] staffIds) { return toAjax(iFtStaffInfoDaoService.removeByIds(Arrays.asList(staffIds)) ? 1 : 0); } -} +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtDepartDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtDepartDao.java index 4f8f1cc7b..55fca0a2f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtDepartDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtDepartDao.java @@ -1,21 +1,25 @@ package com.ruoyi.system.fantang.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import lombok.experimental.Accessors; - +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; +import com.ruoyi.common.core.domain.BaseEntity; /** * 科室管理对象 ft_depart - * + * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @Data @ToString @@ -25,18 +29,18 @@ import java.io.Serializable; @TableName("ft_depart") public class FtDepartDao implements Serializable { - private static final long serialVersionUID = 1L; +private static final long serialVersionUID=1L; - /** - * 科室编号 - */ + /** 科室编号 */ @TableId(value = "depart_id") private Long departId; - /** - * 科室名称 - */ + /** 科室名称 */ @Excel(name = "科室名称") private String departName; + + /** 科室编号 */ + @Excel(name = "科室编号") + private String departCode; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDao.java index 66a7a8672..a50d90f31 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDao.java @@ -1,22 +1,25 @@ package com.ruoyi.system.fantang.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import lombok.experimental.Accessors; - +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; import java.io.Serializable; +import java.util.Date; import java.math.BigDecimal; +import com.ruoyi.common.core.domain.BaseEntity; /** * 食品管理对象 ft_food - * + * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @Data @ToString @@ -26,41 +29,28 @@ import java.math.BigDecimal; @TableName("ft_food") public class FtFoodDao implements Serializable { - private static final long serialVersionUID = 1L; +private static final long serialVersionUID=1L; - /** - * 食品id - */ + /** 食品id */ @TableId(value = "food_id") private Long foodId; - /** - * 名称 - */ + /** 名称 */ @Excel(name = "名称") private String name; - /** - * 图片地址 - */ - @Excel(name = "图片地址") + /** 图片 */ private String pictureUrl; - /** - * 售价 - */ + /** 售价 */ @Excel(name = "售价") private BigDecimal price; - /** - * 启用标志 - */ + /** 启用标志 */ private Long flag; - /** - * 食品分类 - */ + /** 食品分类 */ @Excel(name = "食品分类") private Long type; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPatientDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPatientDao.java index 4c2bffb9b..586a8059c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPatientDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPatientDao.java @@ -1,21 +1,25 @@ package com.ruoyi.system.fantang.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import lombok.experimental.Accessors; - +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; +import com.ruoyi.common.core.domain.BaseEntity; /** * 病人管理对象 ft_patient - * + * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @Data @ToString @@ -25,29 +29,34 @@ import java.io.Serializable; @TableName("ft_patient") public class FtPatientDao implements Serializable { - private static final long serialVersionUID = 1L; +private static final long serialVersionUID=1L; - /** - * 病人id - */ + /** 病人id */ @TableId(value = "patient_id") private Long patientId; - /** - * 姓名 - */ + /** 姓名 */ @Excel(name = "姓名") private String name; - /** - * 所属部门id - */ + /** 所属部门id */ private Long departId; - /** - * 床号 - */ + /** 床号 */ @Excel(name = "床号") private String bedId; + + /** 住院号 */ + @Excel(name = "住院号") + private String hospitalId; + + /** 同步标志 */ + private Integer syncFlag; + + /** 出院标志 */ + private Integer offFlag; + + /** 创建时间 */ + private Date createAt; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java index 74c9ea770..c191fb4e9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java @@ -2,6 +2,7 @@ package com.ruoyi.system.fantang.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +18,7 @@ import java.util.Date; * 员工管理对象 ft_staff_info * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @Data @ToString @@ -67,6 +68,8 @@ public class FtStaffInfoDao implements Serializable { /** * 创建日期 */ + @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createAt; /** @@ -77,6 +80,7 @@ public class FtStaffInfoDao implements Serializable { /** * 启用标志 */ + @Excel(name = "启用标志") private Integer flag; /** @@ -84,4 +88,39 @@ public class FtStaffInfoDao implements Serializable { */ @Excel(name = "补贴余额") private BigDecimal balance; -} + + /** + * 员工类别 + */ + private Long staffType; + + /** + * 所属公司 + */ + private String corpName; + + /** + * 照片 + */ + private String pictureUrl; + + /** + * 报餐科室列表 + */ + private String deptList; + + /** + * 二维码 + */ + private String qrCode; + + /** + * 性别 + */ + private Integer sex; + + /** + * 手机号码 + */ + private String tel; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtDepartDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtDepartDaoMapper.java index bef46e9f4..7bd69d168 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtDepartDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtDepartDaoMapper.java @@ -1,13 +1,13 @@ package com.ruoyi.system.fantang.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.fantang.domain.FtDepartDao; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 科室管理Mapper接口 * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ public interface FtDepartDaoMapper extends BaseMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDaoMapper.java index 8a0db1cec..3d0ee006f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDaoMapper.java @@ -1,13 +1,13 @@ package com.ruoyi.system.fantang.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.fantang.domain.FtFoodDao; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 食品管理Mapper接口 * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ public interface FtFoodDaoMapper extends BaseMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java index 99a66d94a..7bc928821 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java @@ -1,13 +1,13 @@ package com.ruoyi.system.fantang.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.fantang.domain.FtPatientDao; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 病人管理Mapper接口 * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ public interface FtPatientDaoMapper extends BaseMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtDepartDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtDepartDaoService.java index 61cb1f01f..2b45809d4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtDepartDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtDepartDaoService.java @@ -1,13 +1,13 @@ package com.ruoyi.system.fantang.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.fantang.domain.FtDepartDao; +import com.baomidou.mybatisplus.extension.service.IService; /** * 科室管理Service接口 * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ public interface IFtDepartDaoService extends IService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDaoService.java index 5f4744511..2a3380f6c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDaoService.java @@ -1,13 +1,13 @@ package com.ruoyi.system.fantang.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.fantang.domain.FtFoodDao; +import com.baomidou.mybatisplus.extension.service.IService; /** * 食品管理Service接口 * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ public interface IFtFoodDaoService extends IService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPatientDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPatientDaoService.java index ca73e56b7..9796f4e78 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPatientDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPatientDaoService.java @@ -1,13 +1,13 @@ package com.ruoyi.system.fantang.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.fantang.domain.FtPatientDao; +import com.baomidou.mybatisplus.extension.service.IService; /** * 病人管理Service接口 * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ public interface IFtPatientDaoService extends IService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtDepartDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtDepartDaoServiceImpl.java index feffbf565..b9f7d3138 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtDepartDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtDepartDaoServiceImpl.java @@ -1,16 +1,16 @@ package com.ruoyi.system.fantang.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.system.fantang.domain.FtDepartDao; -import com.ruoyi.system.fantang.mapper.FtDepartDaoMapper; -import com.ruoyi.system.fantang.service.IFtDepartDaoService; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.system.fantang.mapper.FtDepartDaoMapper; +import com.ruoyi.system.fantang.domain.FtDepartDao; +import com.ruoyi.system.fantang.service.IFtDepartDaoService; /** * 科室管理Service业务层处理 * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @Service public class FtDepartDaoServiceImpl extends ServiceImpl implements IFtDepartDaoService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDaoServiceImpl.java index 5a72140d0..024dcef8d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDaoServiceImpl.java @@ -1,16 +1,16 @@ package com.ruoyi.system.fantang.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.system.fantang.domain.FtFoodDao; -import com.ruoyi.system.fantang.mapper.FtFoodDaoMapper; -import com.ruoyi.system.fantang.service.IFtFoodDaoService; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.system.fantang.mapper.FtFoodDaoMapper; +import com.ruoyi.system.fantang.domain.FtFoodDao; +import com.ruoyi.system.fantang.service.IFtFoodDaoService; /** * 食品管理Service业务层处理 * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @Service public class FtFoodDaoServiceImpl extends ServiceImpl implements IFtFoodDaoService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPatientDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPatientDaoServiceImpl.java index 5dce07db5..d8b78a92f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPatientDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPatientDaoServiceImpl.java @@ -1,16 +1,16 @@ package com.ruoyi.system.fantang.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.system.fantang.domain.FtPatientDao; -import com.ruoyi.system.fantang.mapper.FtPatientDaoMapper; -import com.ruoyi.system.fantang.service.IFtPatientDaoService; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.system.fantang.mapper.FtPatientDaoMapper; +import com.ruoyi.system.fantang.domain.FtPatientDao; +import com.ruoyi.system.fantang.service.IFtPatientDaoService; /** * 病人管理Service业务层处理 * * @author ft - * @date 2020-11-19 + * @date 2020-11-24 */ @Service public class FtPatientDaoServiceImpl extends ServiceImpl implements IFtPatientDaoService { diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtDepartDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtDepartDaoMapper.xml index f57edb63b..a7f686c4e 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtDepartDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtDepartDaoMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml index 1aefb760d..3e4309da1 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml @@ -9,6 +9,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtStaffInfoDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtStaffInfoDaoMapper.xml index f32aabe54..f07cae4f8 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtStaffInfoDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtStaffInfoDaoMapper.xml @@ -1,20 +1,27 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue b/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue index 27b8fab77..0884b5537 100644 --- a/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue +++ b/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue @@ -10,23 +10,29 @@ @keyup.enter.native="handleQuery" /> - + + + + + + - - + + + + + 搜索 @@ -41,7 +47,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['fantang:careStaffInfo:add']" + v-hasPermi="['fantang:staffInfo:add']" >新增 @@ -52,7 +58,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['fantang:careStaffInfo:edit']" + v-hasPermi="['fantang:staffInfo:edit']" >修改 @@ -63,7 +69,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['fantang:careStaffInfo:remove']" + v-hasPermi="['fantang:staffInfo:remove']" >删除 @@ -73,20 +79,26 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['fantang:careStaffInfo:export']" + v-hasPermi="['fantang:staffInfo:export']" >导出 - + - + - - - + + + + + + + @@ -118,23 +130,42 @@ @pagination="getList" /> - + - - + + + + - - + + + + + + + - - + + - - + + + + +
@@ -147,19 +178,22 @@