项目审核查看、角色等级
hanbo
parent
6fe0776908
commit
7aefe59152
|
|
@ -376,6 +376,7 @@ public class ProjectController extends BaseController {
|
|||
Project project = projectService.getProject(id);
|
||||
EstimateBean estimateBean = projectEstimateService.getEstimate(project);
|
||||
model.put("estimateBean", estimateBean);
|
||||
model.put("adminId", InterfaceUtil.getAdminId());
|
||||
model.put("project", project);
|
||||
model.put("formerBean", projectSettleService.getFormerSettle(project, time));
|
||||
model.put("monthBean", projectSettleService.getMonthSettle(project, time));
|
||||
|
|
@ -403,6 +404,8 @@ public class ProjectController extends BaseController {
|
|||
model.put("finalBean", projectFinalSevice.getFinal(project));
|
||||
//freemarker可以利用的静态方法
|
||||
model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
|
||||
List<ProjectTaskRecord> list = projectTaskRecordService.list(id);
|
||||
model.put("taskRecords", list);
|
||||
return "admin/project_approve";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ public class SysRoleService {
|
|||
|
||||
SysRole role=new SysRole();
|
||||
role.setName(reqMap.get("roleName")!=null?reqMap.get("roleName").toString():null);
|
||||
//role.setLevel(reqMap.containsKey("roleLevel")?Integer.parseInt(reqMap.get("roleLevel").toString()):1);//第一个版本 默认都是省级
|
||||
role.setLevel(Integer.parseInt(reqMap.get("level").toString()));
|
||||
role.setIsEnable(Integer.parseInt(reqMap.get("isActive").toString()));
|
||||
//role.setType(Integer.parseInt(reqMap.get("roleType").toString()));
|
||||
role.setCreatedBy(InterfaceUtil.getAdminId());//当前登录人
|
||||
|
|
@ -249,7 +249,7 @@ public class SysRoleService {
|
|||
|
||||
SysRole role =sysRoleRepository.findSysRoleById(roleId);
|
||||
role.setName(reqMap.get("roleName").toString());
|
||||
//role.setLevel(Integer.parseInt(reqMap.get("roleLevel").toString()));
|
||||
role.setLevel(Integer.parseInt(reqMap.get("level").toString()));
|
||||
//role.setType(Integer.parseInt(reqMap.get("roleType").toString()));
|
||||
role.setIsEnable(Integer.parseInt(reqMap.get("isActive").toString()));
|
||||
role.setLastUpdatedBy(InterfaceUtil.getAdminId());
|
||||
|
|
|
|||
|
|
@ -10,22 +10,6 @@ function calculateFinal() {
|
|||
calIncomeFinalTotal();
|
||||
});
|
||||
|
||||
/**
|
||||
* 收入决算总额(不含税)，有一项没填就置空
|
||||
*/
|
||||
function calIncomeFinalTotal() {
|
||||
var incomeDeviceFinalTotal = $("input[name='incomeDeviceFinalTotal']").val();
|
||||
var incomeEngineerFinalTotal = $("input[name='incomeEngineerFinalTotal']").val();
|
||||
var incomeServiceFinalTotal = $("input[name='incomeServiceFinalTotal']").val();
|
||||
|
||||
var incomeFinalTotal = $("input[name='incomeFinalTotal']");
|
||||
|
||||
if(incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal){
|
||||
incomeFinalTotal.val(parseFloat(incomeDeviceFinalTotal)+parseFloat(incomeEngineerFinalTotal)+parseFloat(incomeServiceFinalTotal));
|
||||
}else {
|
||||
incomeFinalTotal.val("");
|
||||
}
|
||||
}
|
||||
|
||||
$("input[name='costPurchaseDeviceFinalTotal']").change(function () {
|
||||
calCostFinalTotal();
|
||||
|
|
@ -106,6 +90,25 @@ function calculateFinal() {
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* 收入决算总额(不含税)，有一项没填就置空
|
||||
*/
|
||||
function calIncomeFinalTotal() {
|
||||
var incomeDeviceFinalTotal = $("input[name='incomeDeviceFinalTotal']").val();
|
||||
var incomeEngineerFinalTotal = $("input[name='incomeEngineerFinalTotal']").val();
|
||||
var incomeServiceFinalTotal = $("input[name='incomeServiceFinalTotal']").val();
|
||||
|
||||
var incomeFinalTotal = $("input[name='incomeFinalTotal']");
|
||||
console.log("incomeEngineerFinalTotal" + incomeEngineerFinalTotal);
|
||||
|
||||
if(incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal){
|
||||
console.log("incomeServiceFinalTotal" + incomeServiceFinalTotal);
|
||||
incomeFinalTotal.val(parseFloat(incomeDeviceFinalTotal)+parseFloat(incomeEngineerFinalTotal));
|
||||
}else {
|
||||
incomeFinalTotal.val("");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 成本决算总额(不含税)，有一项没填就置空
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1725,12 +1725,32 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="am-tabs am-margin" data-am-tabs>
|
||||
<div class="am-tabs-bd">
|
||||
<div class="am-tab-panel am-fade am-in am-active">
|
||||
<div class="am-g am-form-group am-margin-top" style="display: flex;">
|
||||
<div class="am-u-sm-4 am-u-md-2 am-text-right">
|
||||
审核意见
|
||||
</div>
|
||||
<div class="am-u-sm-8 am-u-md-10 am-text-left">
|
||||
<#list taskRecords as node>
|
||||
<span>${node.assigneeName} : ${node.taskComment} ${node.createTime}</span>
|
||||
<hr/>
|
||||
</#list>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--选项卡（tabs）end-->
|
||||
<div class="am-margin">
|
||||
<button type="button" class="am-btn am-btn-warning am-btn-xs" onclick="javascript:history.go(-1);">
|
||||
返回上一级
|
||||
</button>
|
||||
<#if project.creatorId!=project.approveId && adminId==project.approveId>
|
||||
<button type="submit" class="am-btn am-btn-primary am-btn-xs" id="saveFinal">审核</button>
|
||||
</#if>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@
|
|||
<#list pager.list as list>
|
||||
<tr>
|
||||
<td>${list.id!}</td>
|
||||
<td>${list.name!}</td>
|
||||
<td><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/detail?id=${list.id}'">${list.name!}</a></td>
|
||||
<td>${list.typeDesc!}</td>
|
||||
<td>${list.statusDesc!}</td>
|
||||
<td>${list.approveStatusDesc!}</td>
|
||||
|
|
@ -266,11 +266,11 @@
|
|||
</button>
|
||||
</#if>
|
||||
|
||||
<button type="button"
|
||||
<#--<button type="button"
|
||||
class="am-btn am-btn-default am-btn-xs am-text-secondary"
|
||||
onclick="location.href='${base}/project/detail?id=${list.id}'"><span
|
||||
class="am-icon-pencil-square-o"></span>查看
|
||||
</button>
|
||||
</button>-->
|
||||
|
||||
|
||||
<#if list.creatorId!=list.approveId && adminId==list.approveId>
|
||||
|
|
|
|||
|
|
@ -34,6 +34,21 @@
|
|||
<div class="am-u-sm-2 am-u-md-4 input-msg" id="role_name_valid"></div>
|
||||
</div>
|
||||
|
||||
<div class="am-g am-form-group am-margin-top" style="display: flex;">
|
||||
<div class="am-u-sm-4 am-u-md-2 am-text-right">
|
||||
<span style="color: red;">*</span>角色等级</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<select data-am-selected="{btnWidth: '40%', btnSize: 'sm'" id="level" name="level">
|
||||
<option value="1" <#if role.level! ==1>selected</#if> >一级</option>
|
||||
<option value="2" <#if role.level! ==2>selected</#if> >二级</option>
|
||||
<option value="3" <#if role.level! ==3>selected</#if> >三级</option>
|
||||
<option value="4" <#if role.level! ==4>selected</#if> >四级</option>
|
||||
<option value="5" <#if role.level! ==5>selected</#if> >五级</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
</div>
|
||||
|
||||
<input type="hidden" id="roleLevel" name="roleLevel" value='1' />
|
||||
<!--radio begin-->
|
||||
<div class="am-g am-form-group am-margin-top">
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@
|
|||
<th class="table-check">
|
||||
<input type="checkbox" id="allCheck"></th>
|
||||
<th class="table-title">角色名称</th>
|
||||
<th class="table-title">角色等级</th>
|
||||
<th class="table-title">是否启用</th>
|
||||
<th class="table-date">创建日期</th>
|
||||
<th class="table-date">最后更新日期</th>
|
||||
|
|
@ -65,6 +66,19 @@
|
|||
<input type="checkbox" name="ids" value="${list.id}"/>
|
||||
</td>
|
||||
<td>${list.name!}</td>
|
||||
<td>
|
||||
<#if list.level ==1 >
|
||||
一级
|
||||
<#elseif list.level ==2>
|
||||
二级
|
||||
<#elseif list.level ==3>
|
||||
三级
|
||||
<#elseif list.level ==4>
|
||||
四级
|
||||
<#elseif list.level ==5>
|
||||
五级
|
||||
</#if>
|
||||
</td>
|
||||
<td>
|
||||
<#if list.isEnable ==1 >
|
||||
是
|
||||
|
|
|
|||
Loading…
Reference in New Issue