diff --git a/klp-flow/src/main/java/com/klp/flow/domain/bo/TsComplaintAcceptBo.java b/klp-flow/src/main/java/com/klp/flow/domain/bo/TsComplaintAcceptBo.java index c3217532..65f1772b 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/bo/TsComplaintAcceptBo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/bo/TsComplaintAcceptBo.java @@ -8,6 +8,7 @@ import javax.validation.constraints.*; import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 投诉受理单主业务对象 ts_complaint_accept @@ -33,6 +34,8 @@ public class TsComplaintAcceptBo extends BaseEntity { /** * 投诉日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date complaintDate; /** diff --git a/klp-flow/src/main/java/com/klp/flow/domain/vo/TsComplaintAcceptVo.java b/klp-flow/src/main/java/com/klp/flow/domain/vo/TsComplaintAcceptVo.java index b87c9322..4519b525 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/vo/TsComplaintAcceptVo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/vo/TsComplaintAcceptVo.java @@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; +import com.klp.common.core.domain.BaseEntity; import lombok.Data; @@ -17,7 +18,7 @@ import lombok.Data; */ @Data @ExcelIgnoreUnannotated -public class TsComplaintAcceptVo { +public class TsComplaintAcceptVo extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/klp-ui/src/api/flow/acceptCoilRel.js b/klp-ui/src/api/flow/acceptCoilRel.js new file mode 100644 index 00000000..3ebe59e3 --- /dev/null +++ b/klp-ui/src/api/flow/acceptCoilRel.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listAcceptCoilRel(query) { + return request({ + url: '/flow/acceptCoilRel/list', + method: 'get', + params: query + }) +} + +export function getAcceptCoilRel(relId) { + return request({ + url: '/flow/acceptCoilRel/' + relId, + method: 'get' + }) +} + +export function addAcceptCoilRel(data) { + return request({ + url: '/flow/acceptCoilRel', + method: 'post', + data: data + }) +} + +export function updateAcceptCoilRel(data) { + return request({ + url: '/flow/acceptCoilRel', + method: 'put', + data: data + }) +} + +export function delAcceptCoilRel(relIds) { + return request({ + url: '/flow/acceptCoilRel/' + relIds, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/flow/complaintAccept.js b/klp-ui/src/api/flow/complaintAccept.js new file mode 100644 index 00000000..97ea1ad5 --- /dev/null +++ b/klp-ui/src/api/flow/complaintAccept.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +export function listComplaintAccept(query) { + return request({ + url: '/flow/complaintAccept/list', + method: 'get', + params: query + }) +} + +export function getComplaintAccept(acceptId) { + return request({ + url: '/flow/complaintAccept/' + acceptId, + method: 'get' + }) +} + +export function addComplaintAccept(data) { + return request({ + url: '/flow/complaintAccept', + method: 'post', + data: data + }) +} + +export function updateComplaintAccept(data) { + return request({ + url: '/flow/complaintAccept', + method: 'put', + data: data + }) +} + +export function delComplaintAccept(acceptIds) { + return request({ + url: '/flow/complaintAccept/' + acceptIds, + method: 'delete' + }) +} + +export function opinionDispatch(acceptId) { + return request({ + url: '/flow/complaintAccept/opinionDispatch/' + acceptId, + method: 'post' + }) +} + +export function feedbackDispatch(acceptId, deptIds) { + return request({ + url: '/flow/complaintAccept/feedbackDispatch', + method: 'post', + params: { acceptId, deptIds } + }) +} diff --git a/klp-ui/src/api/flow/complaintTask.js b/klp-ui/src/api/flow/complaintTask.js new file mode 100644 index 00000000..8d583f1f --- /dev/null +++ b/klp-ui/src/api/flow/complaintTask.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listComplaintTask(query) { + return request({ + url: '/flow/complaintTask/list', + method: 'get', + params: query + }) +} + +export function getComplaintTask(taskId) { + return request({ + url: '/flow/complaintTask/' + taskId, + method: 'get' + }) +} + +export function addComplaintTask(data) { + return request({ + url: '/flow/complaintTask', + method: 'post', + data: data + }) +} + +export function updateComplaintTask(data) { + return request({ + url: '/flow/complaintTask', + method: 'put', + data: data + }) +} + +export function delComplaintTask(taskIds) { + return request({ + url: '/flow/complaintTask/' + taskIds, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/flow/planExecuteRel.js b/klp-ui/src/api/flow/planExecuteRel.js new file mode 100644 index 00000000..9a058f82 --- /dev/null +++ b/klp-ui/src/api/flow/planExecuteRel.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listPlanExecuteRel(query) { + return request({ + url: '/flow/planExecuteRel/list', + method: 'get', + params: query + }) +} + +export function getPlanExecuteRel(relId) { + return request({ + url: '/flow/planExecuteRel/' + relId, + method: 'get' + }) +} + +export function addPlanExecuteRel(data) { + return request({ + url: '/flow/planExecuteRel', + method: 'post', + data: data + }) +} + +export function updatePlanExecuteRel(data) { + return request({ + url: '/flow/planExecuteRel', + method: 'put', + data: data + }) +} + +export function delPlanExecuteRel(relIds) { + return request({ + url: '/flow/planExecuteRel/' + relIds, + method: 'delete' + }) +} diff --git a/klp-ui/src/components/FileList/index.vue b/klp-ui/src/components/FileList/index.vue index 54da9c12..f3cd674d 100644 --- a/klp-ui/src/components/FileList/index.vue +++ b/klp-ui/src/components/FileList/index.vue @@ -121,7 +121,7 @@ export default { diff --git a/klp-ui/src/views/wms/post/objection/components/CoilInfoSection.vue b/klp-ui/src/views/wms/post/objection/components/CoilInfoSection.vue new file mode 100644 index 00000000..3bbfac5b --- /dev/null +++ b/klp-ui/src/views/wms/post/objection/components/CoilInfoSection.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/objection/components/ContractInfoSection.vue b/klp-ui/src/views/wms/post/objection/components/ContractInfoSection.vue new file mode 100644 index 00000000..96531d12 --- /dev/null +++ b/klp-ui/src/views/wms/post/objection/components/ContractInfoSection.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/objection/components/DepartmentOpinionSection.vue b/klp-ui/src/views/wms/post/objection/components/DepartmentOpinionSection.vue new file mode 100644 index 00000000..a169ef7c --- /dev/null +++ b/klp-ui/src/views/wms/post/objection/components/DepartmentOpinionSection.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/objection/components/ExecutionFeedbackSection.vue b/klp-ui/src/views/wms/post/objection/components/ExecutionFeedbackSection.vue new file mode 100644 index 00000000..e7b20500 --- /dev/null +++ b/klp-ui/src/views/wms/post/objection/components/ExecutionFeedbackSection.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/objection/components/HandlingSchemeSection.vue b/klp-ui/src/views/wms/post/objection/components/HandlingSchemeSection.vue new file mode 100644 index 00000000..2b0beed6 --- /dev/null +++ b/klp-ui/src/views/wms/post/objection/components/HandlingSchemeSection.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/objection/components/HeaderControlSection.vue b/klp-ui/src/views/wms/post/objection/components/HeaderControlSection.vue new file mode 100644 index 00000000..4032fbfe --- /dev/null +++ b/klp-ui/src/views/wms/post/objection/components/HeaderControlSection.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/objection/dashboard.vue b/klp-ui/src/views/wms/post/objection/dashboard.vue new file mode 100644 index 00000000..e69de29b diff --git a/klp-ui/src/views/wms/post/objection/index.vue b/klp-ui/src/views/wms/post/objection/index.vue new file mode 100644 index 00000000..5f4038f9 --- /dev/null +++ b/klp-ui/src/views/wms/post/objection/index.vue @@ -0,0 +1,704 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/objection/opinion.vue b/klp-ui/src/views/wms/post/objection/opinion.vue new file mode 100644 index 00000000..b091faf1 --- /dev/null +++ b/klp-ui/src/views/wms/post/objection/opinion.vue @@ -0,0 +1,314 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/objection/todo.vue b/klp-ui/src/views/wms/post/objection/todo.vue new file mode 100644 index 00000000..3bba6013 --- /dev/null +++ b/klp-ui/src/views/wms/post/objection/todo.vue @@ -0,0 +1,270 @@ + + + + +