diff --git a/klp-ui/src/api/wms/bonusConfig.js b/klp-ui/src/api/wms/bonusConfig.js new file mode 100644 index 00000000..6666d6e2 --- /dev/null +++ b/klp-ui/src/api/wms/bonusConfig.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询奖金分配列表 +export function listBonusConfig(query) { + return request({ + url: '/wms/bonusConfig/list', + method: 'get', + params: query + }) +} + +// 查询奖金分配详细 +export function getBonusConfig(configId) { + return request({ + url: '/wms/bonusConfig/' + configId, + method: 'get' + }) +} + +// 新增奖金分配 +export function addBonusConfig(data) { + return request({ + url: '/wms/bonusConfig', + method: 'post', + data: data + }) +} + +// 修改奖金分配 +export function updateBonusConfig(data) { + return request({ + url: '/wms/bonusConfig', + method: 'put', + data: data + }) +} + +// 删除奖金分配 +export function delBonusConfig(configId) { + return request({ + url: '/wms/bonusConfig/' + configId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/bonusPool.js b/klp-ui/src/api/wms/bonusPool.js new file mode 100644 index 00000000..59114f37 --- /dev/null +++ b/klp-ui/src/api/wms/bonusPool.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询奖金池列表 +export function listBonusPool(query) { + return request({ + url: '/wms/bonusPool/list', + method: 'get', + params: query + }) +} + +// 查询奖金池详细 +export function getBonusPool(poolId) { + return request({ + url: '/wms/bonusPool/' + poolId, + method: 'get' + }) +} + +// 新增奖金池 +export function addBonusPool(data) { + return request({ + url: '/wms/bonusPool', + method: 'post', + data: data + }) +} + +// 修改奖金池 +export function updateBonusPool(data) { + return request({ + url: '/wms/bonusPool', + method: 'put', + data: data + }) +} + +// 删除奖金池 +export function delBonusPool(poolId) { + return request({ + url: '/wms/bonusPool/' + poolId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/postCoeffConfig.js b/klp-ui/src/api/wms/postCoeffConfig.js new file mode 100644 index 00000000..25f049c7 --- /dev/null +++ b/klp-ui/src/api/wms/postCoeffConfig.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询岗位系数配置列表 +export function listPostCoeffConfig(query) { + return request({ + url: '/wms/postCoeffConfig/list', + method: 'get', + params: query + }) +} + +// 查询岗位系数配置详细 +export function getPostCoeffConfig(configId) { + return request({ + url: '/wms/postCoeffConfig/' + configId, + method: 'get' + }) +} + +// 新增岗位系数配置 +export function addPostCoeffConfig(data) { + return request({ + url: '/wms/postCoeffConfig', + method: 'post', + data: data + }) +} + +// 修改岗位系数配置 +export function updatePostCoeffConfig(data) { + return request({ + url: '/wms/postCoeffConfig', + method: 'put', + data: data + }) +} + +// 删除岗位系数配置 +export function delPostCoeffConfig(configId) { + return request({ + url: '/wms/postCoeffConfig/' + configId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/wms/bonus/components/BonusConfig.vue b/klp-ui/src/views/wms/bonus/components/BonusConfig.vue new file mode 100644 index 00000000..4df86628 --- /dev/null +++ b/klp-ui/src/views/wms/bonus/components/BonusConfig.vue @@ -0,0 +1,409 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/bonus/components/PostCoeffConfig.vue b/klp-ui/src/views/wms/bonus/components/PostCoeffConfig.vue new file mode 100644 index 00000000..1d0d1eb5 --- /dev/null +++ b/klp-ui/src/views/wms/bonus/components/PostCoeffConfig.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/klp-ui/src/views/wms/bonus/index.vue b/klp-ui/src/views/wms/bonus/index.vue new file mode 100644 index 00000000..2fbdab36 --- /dev/null +++ b/klp-ui/src/views/wms/bonus/index.vue @@ -0,0 +1,278 @@ + + + \ No newline at end of file diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java index e4fc398a..0c3518f3 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java @@ -8,6 +8,7 @@ import javax.validation.constraints.*; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 奖金池业务对象 wms_bonus_pool @@ -33,6 +34,8 @@ public class WmsBonusPoolBo extends BaseEntity { /** * 奖金时间/统计时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date bonusTime; /**