Browse Source
修改售后单的前端新增页面 修改售后单修改页面 新增售后单VO类。加上流程相关字段 修改后端售后单列表查询接口 修改后端售后单列表导出接口 修改后端保存售后单接口：新增开始审核方法和审核状态 新增 加载审批弹窗后端接口 新增 自动绑定页面字段后端接口 新增 完成任务后端接口 修改查询售后单详情接口 修改查询售后端集合接口 修改售后单的resultMap为vo类型 新增发起人节点判断后端接口，加入需要的角色节点人 新增售后单驳回调整页面 新增售后单业务经理审核页面 新增售后单业务主管审核页面dev
13 changed files with 889 additions and 146 deletions
@ -0,0 +1,33 @@ |
|||||
|
package com.ruoyi.aftersales.domain.vo; |
||||
|
|
||||
|
import com.ruoyi.aftersales.domain.AftersalesOrder; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.Date; |
||||
|
|
||||
|
@Data |
||||
|
public class AftersalesOrderVO extends AftersalesOrder { |
||||
|
private static final long serialVersionUID = -3627380777050403384L; |
||||
|
|
||||
|
/** 申请人姓名 */ |
||||
|
private String applyUserName; |
||||
|
/** 任务ID */ |
||||
|
private String taskId; |
||||
|
/** 任务名称 */ |
||||
|
private String taskName; |
||||
|
/** 办理时间 */ |
||||
|
private Date doneTime; |
||||
|
/** 创建人 */ |
||||
|
private String createUserName; |
||||
|
/** 流程实例状态 1 激活 2 挂起 */ |
||||
|
private String suspendState; |
||||
|
/** 待办用户id */ |
||||
|
private String todoUserId; |
||||
|
/** 流程实例类型名称 */ |
||||
|
private String instanceTypeName; |
||||
|
|
||||
|
/** |
||||
|
* 关键词 |
||||
|
*/ |
||||
|
private String keyword; |
||||
|
} |
||||
@ -0,0 +1,140 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
||||
|
<head> |
||||
|
<th:block th:include="include :: header('驳回调整')" /> |
||||
|
<th:block th:include="include :: datetimepicker-css" /> |
||||
|
<th:block th:include="include :: summernote-css" /> |
||||
|
</head> |
||||
|
<body class="white-bg"> |
||||
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
||||
|
<form class="form-horizontal m" id="form-aftersalesOrder-edit" th:object="${formData}"> |
||||
|
<input name="aftersalesOrderId" th:field="*{aftersalesOrderId}" type="hidden"> |
||||
|
<input name="taskId" th:field="*{taskId}" type="hidden"> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">售后单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="aftersalesOrderCode" th:field="*{aftersalesOrderCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">关联销售订单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">关联生产订单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="makeNo" th:field="*{makeNo}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">用户ID：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="userId" th:field="*{userId}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">业务员：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="businessName" th:field="*{businessName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">售后员：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="aftersalesName" th:field="*{aftersalesName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">客户ID：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="customerId" th:field="*{customerId}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">客户名称：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="customerName" th:field="*{customerName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label" for="reApply">是否继续申请：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select id="reApply" name="p_B_reApply" class="form-control m-b"> |
||||
|
<option value="true">重新申请</option> |
||||
|
<!-- <option value="false">结束流程</option>--> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
</form> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<th:block th:include="include :: datetimepicker-js" /> |
||||
|
<th:block th:include="include :: summernote-js" /> |
||||
|
<script th:inline="javascript"> |
||||
|
var prefix = ctx + "aftersales/aftersalesOrder"; |
||||
|
$("#form-aftersalesOrder-edit").validate({ |
||||
|
focusCleanup: true |
||||
|
}); |
||||
|
|
||||
|
function submitHandler() { |
||||
|
if ($.validate.form()) { |
||||
|
var taskId = [[${taskId}]]; |
||||
|
$.operate.save(prefix + "/complete/" + taskId, $('#form-aftersalesOrder-edit').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
$("input[name='startDate']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
$("input[name='applyTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
$(function() { |
||||
|
$('.summernote').each(function(i) { |
||||
|
$('#' + this.id).summernote({ |
||||
|
lang: 'zh-CN', |
||||
|
callbacks: { |
||||
|
onChange: function(contents, $edittable) { |
||||
|
$("input[name='" + this.id + "']").val(contents); |
||||
|
}, |
||||
|
onImageUpload: function(files) { |
||||
|
var obj = this; |
||||
|
var data = new FormData(); |
||||
|
data.append("file", files[0]); |
||||
|
$.ajax({ |
||||
|
type: "post", |
||||
|
url: ctx + "common/upload", |
||||
|
data: data, |
||||
|
cache: false, |
||||
|
contentType: false, |
||||
|
processData: false, |
||||
|
dataType: 'json', |
||||
|
success: function(result) { |
||||
|
if (result.code == web_status.SUCCESS) { |
||||
|
$('#' + obj.id).summernote('insertImage', result.url); |
||||
|
} else { |
||||
|
$.modal.alertError(result.msg); |
||||
|
} |
||||
|
}, |
||||
|
error: function(error) { |
||||
|
$.modal.alertWarning("图片上传失败。"); |
||||
|
} |
||||
|
}); |
||||
|
} |
||||
|
} |
||||
|
}); |
||||
|
var content = $("input[name='" + this.id + "']").val(); |
||||
|
$('#' + this.id).summernote('code', content); |
||||
|
}) |
||||
|
}); |
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,147 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
||||
|
<head> |
||||
|
<th:block th:include="include :: header('业务经理审核售后单')" /> |
||||
|
<th:block th:include="include :: datetimepicker-css" /> |
||||
|
<th:block th:include="include :: summernote-css" /> |
||||
|
</head> |
||||
|
<body class="white-bg"> |
||||
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
||||
|
<form class="form-horizontal m" id="form-aftersalesOrder-ywjl" th:object="${formData}"> |
||||
|
<input name="aftersalesOrderId" th:field="*{aftersalesOrderId}" type="hidden"> |
||||
|
<input name="taskId" th:field="*{taskId}" type="hidden"> |
||||
|
<input type="hidden" name="p_COM_comment" /> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">售后单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="aftersalesOrderCode" th:field="*{aftersalesOrderCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">关联销售订单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">关联生产订单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="makeNo" th:field="*{makeNo}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">用户ID：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="userId" th:field="*{userId}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">业务员：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="businessName" th:field="*{businessName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">售后员：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="aftersalesName" th:field="*{aftersalesName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">客户ID：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="customerId" th:field="*{customerId}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">客户名称：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="customerName" th:field="*{customerName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label is-required" for="ywjlVerifyApproved">审批意见：</label> |
||||
|
<div class="col-sm-6"> |
||||
|
<select name="p_B_ywjlVerifyApproved" id="ywjlVerifyApproved" class="form-control" required> |
||||
|
<option value=""></option> |
||||
|
<option value="true">同意</option> |
||||
|
<option value="false">拒绝</option> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
</form> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<th:block th:include="include :: datetimepicker-js" /> |
||||
|
<th:block th:include="include :: summernote-js" /> |
||||
|
<script th:src="@{/js/activiti.js}"></script> |
||||
|
<script th:inline="javascript"> |
||||
|
var prefix = ctx + "aftersales/aftersalesOrder"; |
||||
|
$("#form-aftersalesOrder-ywjl").validate({ |
||||
|
focusCleanup: true |
||||
|
}); |
||||
|
|
||||
|
function submitHandler() { |
||||
|
if ($.validate.form()) { |
||||
|
if ($('textarea[name="comment"]').val()) { |
||||
|
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); |
||||
|
} |
||||
|
var taskId = [[${taskId}]]; |
||||
|
$.operate.save(prefix + "/complete/" + taskId, $('#form-aftersalesOrder-ywjl').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
$("input[name='startDate']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
$("input[name='applyTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
$(function() { |
||||
|
$('.summernote').each(function(i) { |
||||
|
$('#' + this.id).summernote({ |
||||
|
lang: 'zh-CN', |
||||
|
callbacks: { |
||||
|
onChange: function(contents, $edittable) { |
||||
|
$("input[name='" + this.id + "']").val(contents); |
||||
|
}, |
||||
|
onImageUpload: function(files) { |
||||
|
var obj = this; |
||||
|
var data = new FormData(); |
||||
|
data.append("file", files[0]); |
||||
|
$.ajax({ |
||||
|
type: "post", |
||||
|
url: ctx + "common/upload", |
||||
|
data: data, |
||||
|
cache: false, |
||||
|
contentType: false, |
||||
|
processData: false, |
||||
|
dataType: 'json', |
||||
|
success: function(result) { |
||||
|
if (result.code == web_status.SUCCESS) { |
||||
|
$('#' + obj.id).summernote('insertImage', result.url); |
||||
|
} else { |
||||
|
$.modal.alertError(result.msg); |
||||
|
} |
||||
|
}, |
||||
|
error: function(error) { |
||||
|
$.modal.alertWarning("图片上传失败。"); |
||||
|
} |
||||
|
}); |
||||
|
} |
||||
|
} |
||||
|
}); |
||||
|
var content = $("input[name='" + this.id + "']").val(); |
||||
|
$('#' + this.id).summernote('code', content); |
||||
|
}) |
||||
|
}); |
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,147 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
||||
|
<head> |
||||
|
<th:block th:include="include :: header('业务经理审核售后单')" /> |
||||
|
<th:block th:include="include :: datetimepicker-css" /> |
||||
|
<th:block th:include="include :: summernote-css" /> |
||||
|
</head> |
||||
|
<body class="white-bg"> |
||||
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
||||
|
<form class="form-horizontal m" id="form-aftersalesOrder-ywzg" th:object="${formData}"> |
||||
|
<input name="aftersalesOrderId" th:field="*{aftersalesOrderId}" type="hidden"> |
||||
|
<input name="taskId" th:field="*{taskId}" type="hidden"> |
||||
|
<input type="hidden" name="p_COM_comment" /> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">售后单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="aftersalesOrderCode" th:field="*{aftersalesOrderCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">关联销售订单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">关联生产订单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="makeNo" th:field="*{makeNo}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">用户ID：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="userId" th:field="*{userId}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">业务员：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="businessName" th:field="*{businessName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">售后员：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="aftersalesName" th:field="*{aftersalesName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">客户ID：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="customerId" th:field="*{customerId}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">客户名称：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="customerName" th:field="*{customerName}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label is-required" for="ywzgVerifyApproved">审批意见：</label> |
||||
|
<div class="col-sm-6"> |
||||
|
<select name="p_B_ywzgVerifyApproved" id="ywzgVerifyApproved" class="form-control" required> |
||||
|
<option value=""></option> |
||||
|
<option value="true">同意</option> |
||||
|
<option value="false">拒绝</option> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
</form> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<th:block th:include="include :: datetimepicker-js" /> |
||||
|
<th:block th:include="include :: summernote-js" /> |
||||
|
<script th:src="@{/js/activiti.js}"></script> |
||||
|
<script th:inline="javascript"> |
||||
|
var prefix = ctx + "aftersales/aftersalesOrder"; |
||||
|
$("#form-aftersalesOrder-ywzg").validate({ |
||||
|
focusCleanup: true |
||||
|
}); |
||||
|
|
||||
|
function submitHandler() { |
||||
|
if ($.validate.form()) { |
||||
|
if ($('textarea[name="comment"]').val()) { |
||||
|
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); |
||||
|
} |
||||
|
var taskId = [[${taskId}]]; |
||||
|
$.operate.save(prefix + "/complete/" + taskId, $('#form-aftersalesOrder-ywzg').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
$("input[name='startDate']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
$("input[name='applyTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
$(function() { |
||||
|
$('.summernote').each(function(i) { |
||||
|
$('#' + this.id).summernote({ |
||||
|
lang: 'zh-CN', |
||||
|
callbacks: { |
||||
|
onChange: function(contents, $edittable) { |
||||
|
$("input[name='" + this.id + "']").val(contents); |
||||
|
}, |
||||
|
onImageUpload: function(files) { |
||||
|
var obj = this; |
||||
|
var data = new FormData(); |
||||
|
data.append("file", files[0]); |
||||
|
$.ajax({ |
||||
|
type: "post", |
||||
|
url: ctx + "common/upload", |
||||
|
data: data, |
||||
|
cache: false, |
||||
|
contentType: false, |
||||
|
processData: false, |
||||
|
dataType: 'json', |
||||
|
success: function(result) { |
||||
|
if (result.code == web_status.SUCCESS) { |
||||
|
$('#' + obj.id).summernote('insertImage', result.url); |
||||
|
} else { |
||||
|
$.modal.alertError(result.msg); |
||||
|
} |
||||
|
}, |
||||
|
error: function(error) { |
||||
|
$.modal.alertWarning("图片上传失败。"); |
||||
|
} |
||||
|
}); |
||||
|
} |
||||
|
} |
||||
|
}); |
||||
|
var content = $("input[name='" + this.id + "']").val(); |
||||
|
$('#' + this.id).summernote('code', content); |
||||
|
}) |
||||
|
}); |
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
Loading…
Reference in new issue