diff --git a/fuintAdmin/src/api/staff/duty.js b/fuintAdmin/src/api/staff/duty.js new file mode 100644 index 000000000..4f8fba4b2 --- /dev/null +++ b/fuintAdmin/src/api/staff/duty.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 查询角色列表 +export function listDuty(query) { + return request({ + url: '/business/member/duty/list', + method: 'get', + params: query + }) +} diff --git a/fuintAdmin/src/api/staff/staff.js b/fuintAdmin/src/api/staff/staff.js index 7099b82dd..e9dcdc5e7 100644 --- a/fuintAdmin/src/api/staff/staff.js +++ b/fuintAdmin/src/api/staff/staff.js @@ -9,15 +9,15 @@ export function listStaff(query) { }) } -// 查询字典类型详细 +// 查询员工详细 export function getStaff(id) { return request({ - url: '/business/member/staff' + id, + url: '/business/member/staff/' + id, method: 'get' }) } -// 新增字典类型 +// 新增员工 export function addStaff(data) { return request({ url: '/business/member/staff', @@ -26,7 +26,7 @@ export function addStaff(data) { }) } -// 修改字典类型 +// 修改员工 export function updateStaff(data) { return request({ url: '/business/member/staff', @@ -35,10 +35,10 @@ export function updateStaff(data) { }) } -// 删除字典类型 +// 删除员工 export function delStaff(id) { return request({ - url: '/business/member/staff' + id, + url: '/business/member/staff/' + id, method: 'delete' }) } diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue index c5a098f8e..62173cf11 100644 --- a/fuintAdmin/src/views/staff/list.vue +++ b/fuintAdmin/src/views/staff/list.vue @@ -63,26 +63,24 @@ - - - - - - + + - + + + + + + + - + + + + + + + + + + + + + - + @@ -132,7 +150,7 @@ - + @@ -150,31 +168,277 @@ - + - - - + + + + + + + + - - - - + + + + + + + + + v-for="dict in dict.type.ywqx" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> + + + + + + + + + + + + + + + 特殊权限 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -186,16 +450,6 @@ - - - - - 启用 - 禁用 - - - -
确 定 @@ -207,12 +461,14 @@ + diff --git a/fuintAdmin/src/views/staff/model/addStaff.vue b/fuintAdmin/src/views/staff/model/addStaff.vue new file mode 100644 index 000000000..594c48a4b --- /dev/null +++ b/fuintAdmin/src/views/staff/model/addStaff.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java index 4ea1e2378..a189ec460 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java @@ -47,9 +47,9 @@ public class LJStaffController extends BaseController { * 批量删除员工信息 * @return */ - @DeleteMapping("/id") + @DeleteMapping("/{id}") public ResponseObject remove(@PathVariable Integer id){ - mtStaffService.removeById(id); + mtStaffService.deleteStaffById(id); return getSuccessResult("操作成功"); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LjDutyController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LjDutyController.java new file mode 100644 index 000000000..d17262a16 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LjDutyController.java @@ -0,0 +1,25 @@ +package com.fuint.business.member.controller; + +import com.fuint.business.member.entity.LJDuty; +import com.fuint.business.member.service.ILJDutyService; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/business/member/duty") +public class LjDutyController extends BaseController { + @Autowired + private ILJDutyService dutyService; + + @GetMapping("/list") + public ResponseObject list(){ + List list = dutyService.selectDutyList(); + return getSuccessResult(list); + } +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJDuty.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJDuty.java index aee76e13d..e43ef01c5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJDuty.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJDuty.java @@ -3,6 +3,7 @@ package com.fuint.business.member.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fuint.framework.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -21,7 +22,7 @@ import java.util.Date; @Setter @TableName("t_duty") @ApiModel(value = "TDuty对象", description = "角色表") -public class LJDuty implements Serializable { +public class LJDuty extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -43,16 +44,4 @@ public class LJDuty implements Serializable { @ApiModelProperty("角色类型") private String dutyType; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("创建用户") - private Date createUser; - - @ApiModelProperty("修改用户") - private Date updateUser; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java index 412ce313c..bc3f22bbf 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java @@ -1,6 +1,7 @@ package com.fuint.business.member.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fuint.framework.entity.BaseEntity; @@ -51,7 +52,6 @@ public class LJStaff extends BaseEntity implements Serializable { @ApiModelProperty("店铺ID") private Integer storeId; - @ApiModelProperty("审核状态，A：审核通过；U：未审核；D：无效; ") private String auditedStatus; @@ -72,7 +72,7 @@ public class LJStaff extends BaseEntity implements Serializable { private String handoverPrem; @ApiModelProperty("交班退出：交班退出；交班不退出") - private String out; + private String handoverOut; @ApiModelProperty("交班记录，全部记录；名下记录；禁用权限") private String record; @@ -112,4 +112,10 @@ public class LJStaff extends BaseEntity implements Serializable { @ApiModelProperty("公众号，1：未关注，2：已关注") private String official; + + @ApiModelProperty("员工状态：启用；禁用") + private String status; + + @ApiModelProperty("POS加油员，启用；禁用") + private String pos; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/LJDutyMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/LJDutyMapper.java new file mode 100644 index 000000000..4cf5348d1 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/LJDutyMapper.java @@ -0,0 +1,7 @@ +package com.fuint.business.member.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fuint.business.member.entity.LJDuty; + +public interface LJDutyMapper extends BaseMapper { +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml index b89389dc3..e0c752cb9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml @@ -20,8 +20,7 @@ - - + @@ -35,13 +34,15 @@ + + select id, merchant_id, store_id, user_id, category, mobile, real_name, wechat, create_time, update_time, audited_status, audited_time, description, create_by, update_by, is_refuel, handover_mode, handover_prem, - `out`, record, merchant_status, screen, pos_prem, applet_prem, notice, oil_gun_id, time_frame, refund, transaction, - write_off, special_prem, official from mt_staff + handover_out, record, merchant_status, screen, pos_prem, applet_prem, notice, oil_gun_id, time_frame, refund, + transaction, write_off, special_prem, official,status,pos from mt_staff