public/cyx-ament-pc
public
/
cyx-ament-pc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
duxp 2023-09-12 08:51:31 +08:00
parent 9374b05a2c f64c28f318
commit 3dfbe59b89
21 changed files with 285 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cyx-admin/src/main/java/com/cyx/web/base/controller/BaseDeptController.java
View File

@ -9,6 +9,9 @@ import com.cyx.common.core.domain.entity.SysDept;
import com.cyx.common.enums.BusinessType; import com.cyx.common.enums.BusinessType;
import com.cyx.common.utils.StringUtils; import com.cyx.common.utils.StringUtils;
import com.cyx.system.service.ISysDeptService; import com.cyx.system.service.ISysDeptService;
import com.cyx.web.base.domain.TAmentBranch;
import com.cyx.web.base.domain.TAmentPersonnel;
import com.cyx.web.base.service.ITAmentPersonnelService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -48,6 +51,9 @@ public class BaseDeptController extends BaseController
return deptList; return deptList;
} }
@Autowired
private ITAmentPersonnelService personnelService;
/** /**
* 新增部门 * 新增部门
*/ */
@ -59,6 +65,7 @@ public class BaseDeptController extends BaseController
parentId = getSysUser().getDeptId(); parentId = getSysUser().getDeptId();
} }
mmap.put("dept", deptService.selectDeptById(parentId)); mmap.put("dept", deptService.selectDeptById(parentId));
mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel()));
return prefix + "/add"; return prefix + "/add";
} }
@ -93,6 +100,7 @@ public class BaseDeptController extends BaseController
dept.setParentName("无"); dept.setParentName("无");
} }
mmap.put("dept", dept); mmap.put("dept", dept);
mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel()));
return prefix + "/edit"; return prefix + "/edit";
} }

11
cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java
View File

@ -8,6 +8,8 @@ import com.cyx.common.core.domain.AjaxResult;
import com.cyx.common.core.page.TableDataInfo; import com.cyx.common.core.page.TableDataInfo;
import com.cyx.common.enums.BusinessType; import com.cyx.common.enums.BusinessType;
import com.cyx.common.utils.poi.ExcelUtil; import com.cyx.common.utils.poi.ExcelUtil;
import com.cyx.web.base.domain.TAmentPersonnel;
import com.cyx.web.base.service.ITAmentPersonnelService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -34,6 +36,8 @@ public class TAmentBranchController extends BaseController
@Autowired @Autowired
private ITAmentBranchService tAmentBranchService; private ITAmentBranchService tAmentBranchService;
@Autowired
private ITAmentPersonnelService personnelService;
@RequiresPermissions("base:branch:view") @RequiresPermissions("base:branch:view")
@GetMapping() @GetMapping()
@ -73,9 +77,12 @@ public class TAmentBranchController extends BaseController
* 新增支部 * 新增支部
*/ */
@GetMapping("/add") @GetMapping("/add")
public String add() public String add( ModelMap mmap)
{ {
mmap.put("branchList",tAmentBranchService.selectTAmentBranchList(new TAmentBranch()));
mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel()));
return prefix + "/add"; return prefix + "/add";
} }
/** /**
@ -99,6 +106,8 @@ public class TAmentBranchController extends BaseController
{ {
TAmentBranch tAmentBranch = tAmentBranchService.selectTAmentBranchByBranchId(branchId); TAmentBranch tAmentBranch = tAmentBranchService.selectTAmentBranchByBranchId(branchId);
mmap.put("tAmentBranch", tAmentBranch); mmap.put("tAmentBranch", tAmentBranch);
mmap.put("branchList",tAmentBranchService.selectTAmentBranchList(new TAmentBranch()));
mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel()));
return prefix + "/edit"; return prefix + "/edit";
} }

22
cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
View File

@ -9,15 +9,13 @@ import com.alibaba.fastjson.JSONObject;
import com.cyx.common.annotation.Log; import com.cyx.common.annotation.Log;
import com.cyx.common.core.controller.BaseController; import com.cyx.common.core.controller.BaseController;
import com.cyx.common.core.domain.AjaxResult; import com.cyx.common.core.domain.AjaxResult;
import com.cyx.common.core.domain.entity.SysDept;
import com.cyx.common.core.page.TableDataInfo; import com.cyx.common.core.page.TableDataInfo;
import com.cyx.common.enums.BusinessType; import com.cyx.common.enums.BusinessType;
import com.cyx.common.utils.poi.ExcelUtil; import com.cyx.common.utils.poi.ExcelUtil;
import com.cyx.web.base.domain.TAmentCommitHis; import com.cyx.system.service.ISysDeptService;
import com.cyx.web.base.domain.TAmentPersonnel; import com.cyx.web.base.domain.*;
import com.cyx.web.base.domain.TAmentReviewedHis; import com.cyx.web.base.service.*;
import com.cyx.web.base.service.ITAmentCommitHisService;
import com.cyx.web.base.service.ITAmentPersonnelService;
import com.cyx.web.base.service.ITAmentReviewedHisService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -27,8 +25,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.cyx.web.base.domain.TAmentPartyAffairs;
import com.cyx.web.base.service.ITAmentPartyAffairsService;
/** /**
* 党务Controller * 党务Controller
@ -40,6 +36,13 @@ import com.cyx.web.base.service.ITAmentPartyAffairsService;
@RequestMapping("/base/affairs") @RequestMapping("/base/affairs")
public class TAmentPartyAffairsController extends BaseController public class TAmentPartyAffairsController extends BaseController
{ {
@Autowired
private ITAmentPersonnelService personnelService;
@Autowired
private ISysDeptService deptService;
@Autowired
private ITAmentBranchService branchService;
/** /**
* 待办预警 * 待办预警
*/ */
@ -324,6 +327,9 @@ public class TAmentPartyAffairsController extends BaseController
{ {
TAmentPartyAffairs tAmentPartyAffairs = tAmentPartyAffairsService.selectTAmentPartyAffairsById(id); TAmentPartyAffairs tAmentPartyAffairs = tAmentPartyAffairsService.selectTAmentPartyAffairsById(id);
mmap.put("tAmentPartyAffairs", tAmentPartyAffairs); mmap.put("tAmentPartyAffairs", tAmentPartyAffairs);
mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel()));
mmap.put("deptList",deptService.selectDeptList(new SysDept()));
mmap.put("branchList",branchService.selectTAmentBranchList(new TAmentBranch()));
return prefix + "/edit"; return prefix + "/edit";
} }

2
cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java
View File

@ -149,6 +149,8 @@ public class TAmentPersonnelController extends BaseController
{ {
TAmentPersonnel tAmentPersonnel = tAmentPersonnelService.selectTAmentPersonnelById(id); TAmentPersonnel tAmentPersonnel = tAmentPersonnelService.selectTAmentPersonnelById(id);
mmap.put("tAmentPersonnel", tAmentPersonnel); mmap.put("tAmentPersonnel", tAmentPersonnel);
mmap.put("deptList",deptService.selectDeptList(new SysDept()));
mmap.put("branchList",branchService.selectTAmentBranchList(new TAmentBranch()));
return prefix + "/edit"; return prefix + "/edit";
} }

2
cyx-admin/src/main/resources/templates/base/advanceddept/add.html
View File

@ -69,7 +69,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">指标综合评分：</label> <label class="col-sm-3 control-label">指标综合评分：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="score" class="form-control" type="text"> <input name="score" class="form-control" type="number">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

2
cyx-admin/src/main/resources/templates/base/advanceddept/edit.html
View File

@ -62,7 +62,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">指标综合评分：</label> <label class="col-sm-3 control-label">指标综合评分：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="score" th:field="*{score}" class="form-control" type="text"> <input name="score" th:field="*{score}" class="form-control" type="number">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

4
cyx-admin/src/main/resources/templates/base/affairs/add.html
View File

@ -53,7 +53,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label" id="score">达标分：</label> <label class="col-sm-3 control-label" id="score">达标分：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input required name="score" class="form-control" /> <input required name="score" class="form-control" type="number"/>
</div> </div>
</div> </div>
<div class="form-group dy" style="display: none"> <div class="form-group dy" style="display: none">
@ -102,7 +102,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">支部ID：</label> <label class="col-sm-3 control-label">支部：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="branchId" id="branchId" class="form-control m-b"> <select name="branchId" id="branchId" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>

6
cyx-admin/src/main/resources/templates/base/affairs/day.html
View File

@ -86,6 +86,12 @@
var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]]; var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
var prefix = ctx + "base/affairs"; var prefix = ctx + "base/affairs";
if(window.parent.parent){
$("#shotName").val(window.parent.parent._shotName)
}else {
$("#shotName").val('')
}
$(document).ready(function () { $(document).ready(function () {
$.ajax({ $.ajax({
type: "post", type: "post",

140
cyx-admin/src/main/resources/templates/base/affairs/edit.html
View File

@ -8,48 +8,71 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-affairs-edit" th:object="${tAmentPartyAffairs}"> <form class="form-horizontal m" id="form-affairs-edit" th:object="${tAmentPartyAffairs}">
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<!-- <div class="form-group"> --> <!-- <select required name="type" id="type-selector" class="form-control m-b">-->
<!-- <label class="col-sm-3 control-label">单位名称：</label>--> <!-- <option value="">请选择</option>-->
<!-- <div class="col-sm-8">--> <!-- <option value="党务及意识形态">党务及意识形态</option>-->
<!-- <input name="unit" th:field="*{unit}" class="form-control" type="text">--> <!-- <option value="党风廉政建设">党风廉政建设</option>-->
<!-- </div>--> <!-- <option value="日常考核指标">日常考核指标</option>-->
<!-- </div>--> <!-- <option value="季度考核指标">季度考核指标</option>-->
<!-- </select>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">目标项：</label> <label class="col-sm-3 control-label">目标项：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="target" th:field="*{target}" class="form-control" type="text"> <select name="type" th:field="*{type}" readonly="true" disabled id="type-selector" class="form-control">
<option value="">请选择</option>
<option value="党务及意识形态">党务及意识形态</option>
<option value="党风廉政建设">党风廉政建设</option>
<option value="日常考核指标">日常考核指标</option>
<option value="季度考核指标">季度考核指标</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">目标项：</label>
<div class="col-sm-8">
<input name="target" readonly="true" th:field="*{target}" 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="shotName" th:field="*{shotName}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">目标要求：</label> <label class="col-sm-3 control-label">目标要求：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="demand" class="form-control">[[*{demand}]]</textarea> <textarea name="demand" readonly="true" class="form-control">[[*{demand}]]</textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">评分细则：</label> <label class="col-sm-3 control-label">评分细则：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="detailed" class="form-control">[[*{detailed}]]</textarea> <textarea name="detailed" readonly="true" class="form-control">[[*{detailed}]]</textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">达标分：</label> <label class="col-sm-3 control-label">达标分：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="score" th:field="*{score}" class="form-control" type="text"> <input name="score" th:field="*{score}" class="form-control" type="number">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">考核方式：</label> <label class="col-sm-3 control-label">考核方式：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="method" class="form-control">[[*{method}]]</textarea> <textarea name="method" readonly="true" class="form-control">[[*{method}]]</textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">负责人：</label> <label class="col-sm-3 control-label">负责人：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="head" th:field="*{head}" id="head" class="form-control m-b"> <select name="parentId" th:field="*{head}" id="parentId" class="form-control">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.id}"></option>
</select> </select>
<!-- <select name="head" th:field="*{head}" id="head" class="form-control m-b">-->
<!-- <option value="">请选择</option>-->
<!-- </select>-->
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -57,6 +80,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<select name="reviewed" th:field="*{reviewed}" id="reviewed" class="form-control m-b"> <select name="reviewed" th:field="*{reviewed}" id="reviewed" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.id}"></option>
</select> </select>
<!-- <input name="reviewed" th:field="*{reviewed}" class="form-control" type="text">--> <!-- <input name="reviewed" th:field="*{reviewed}" class="form-control" type="text">-->
</div> </div>
@ -71,27 +95,30 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">操作人员ID：</label> <label class="col-sm-3 control-label">操作人员：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="perId" th:field="*{perId}" id="perId" class="form-control m-b"> <select name="perId" th:field="*{perId}" id="perId" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.id}"></option>
</select> </select>
<!-- <input name="perId" th:field="*{perId}" class="form-control" type="text">--> <!-- <input name="perId" th:field="*{perId}" class="form-control" type="text">-->
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">部门ID：</label> <label class="col-sm-3 control-label">部门：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="deptId" th:field="*{deptId}" id="deptId" class="form-control m-b"> <select name="deptId" th:field="*{deptId}" id="deptId" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${deptList}" th:text="${item.deptName}" th:value="${item.deptId}"></option>
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">支部ID：</label> <label class="col-sm-3 control-label">支部：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="branchId" th:field="*{branchId}" id="branchId" class="form-control m-b"> <select name="branchId" th:field="*{branchId}" id="branchId" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -111,53 +138,48 @@
focusCleanup: true focusCleanup: true
}); });
refresh() $("#type-selector").on("change", function() {
function refresh(){ var type = $(this).val();
$.ajax({ var target = $("#target");
type: "post", var demand = $("#demand");
url: ctx + "base/personnel/personnelList", var detailed = $("#detailed");
data: { var score = $("#score");
}, switch (type) {
success: function(data) { case "党务及意识形态":
var opt = ''; $("#dw").show()
data.data.forEach(d=>{ $(".dy").hide()
opt += '<option value="'+d.id+'">'+d.name+'</option>'; target[0].innerHTML = '目标项：'
}) demand[0].innerHTML = '目标要求：'
$("#head")[0].innerHTML=opt; detailed[0].innerHTML = '工作任务：'
$("#reviewed")[0].innerHTML=opt; score[0].innerHTML = '达标分：'
$("#perId")[0].innerHTML=opt; break;
case "党风廉政建设":
$("#dw").show()
$(".dy").hide()
target[0].innerHTML = '责任类别：'
demand[0].innerHTML = '目标要求：'
detailed[0].innerHTML = '工作任务：'
score[0].innerHTML = '达标分：'
break;
case "日常考核指标":
$("#dw").hide()
$(".dy").show()
target[0].innerHTML = '考核内容：'
demand[0].innerHTML = '考核目标：'
detailed[0].innerHTML = '工作任务：'
score[0].innerHTML = '分值：'
break;
case "季度考核指标":
$("#dw").hide()
$(".dy").show()
target[0].innerHTML = '考核内容：'
demand[0].innerHTML = '考核目标：'
detailed[0].innerHTML = '评分办法：'
score[0].innerHTML = '分值：'
break;
} }
}); });
$.ajax({
type: "post",
url: ctx + "base/personnel/deptList",
data: {
},
success: function(data) {
var opt = '';
data.data.forEach(d=>{
opt += '<option value="'+d.deptId+'">'+d.deptName+'</option>';
})
$("#deptId")[0].innerHTML=opt;
}
});
$.ajax({
type: "post",
url: ctx + "base/personnel/branchList",
data: {
},
success: function(data) {
var opt = '';
data.data.forEach(d=>{
opt += '<option value="'+d.branchId+'">'+d.branchName+'</option>';
})
$("#branchId")[0].innerHTML=opt;
}
});
}
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-affairs-edit').serialize()); $.operate.save(prefix + "/edit", $('#form-affairs-edit').serialize());

28
cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
View File

@ -32,20 +32,20 @@
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <!-- <div class="btn-group-sm" id="toolbar" role="group">-->
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="base:affairs:add"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="base:affairs:add">-->
<i class="fa fa-plus"></i> 添加 <!-- <i class="fa fa-plus"></i> 添加-->
</a> <!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="base:affairs:edit"> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="base:affairs:edit">-->
<i class="fa fa-edit"></i> 修改 <!-- <i class="fa fa-edit"></i> 修改-->
</a> <!-- </a>-->
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove"> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove">-->
<i class="fa fa-remove"></i> 删除 <!-- <i class="fa fa-remove"></i> 删除-->
</a> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export"> <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">-->
<i class="fa fa-download"></i> 导出 <!-- <i class="fa fa-download"></i> 导出-->
</a> <!-- </a>-->
</div> <!-- </div>-->
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>

50
cyx-admin/src/main/resources/templates/base/affairs/reviewed.html
View File

@ -12,7 +12,8 @@
<div class="form-group col-sm-6 col-md-6"> <div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 col-md-4 control-label">提交时间</label> <label class="col-sm-4 col-md-4 control-label">提交时间</label>
<div class="col-sm-8 col-md-8"> <div class="col-sm-8 col-md-8">
<input type="text" required class="form-control" id="datetimepicker-demo-1" placeholder="yyyy-MM-dd HH:mm"> <input id="updatetime" readonly type="text" class="form-control">
<!-- <input type="text" required class="form-control" id="datetimepicker-demo-1" placeholder="yyyy-MM-dd HH:mm">-->
</div> </div>
</div> </div>
<div class="form-group col-sm-6 col-md-6"> <div class="form-group col-sm-6 col-md-6">
@ -28,25 +29,48 @@
<input id="deptName" readonly type="text" class="form-control" name="deptName"> <input id="deptName" readonly type="text" class="form-control" name="deptName">
</div> </div>
</div> </div>
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 col-md-4 control-label">提交指标</label>
<div class="col-sm-8 col-md-8">
<!-- <p class="form-control-static" id="shotName" name="shotName"></p>-->
<input id="shotName" readonly type="text" class="form-control" name="shotName">
</div>
</div>
<div class="form-group col-sm-6 col-md-6"> <div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 col-md-4 control-label">审核人</label> <label class="col-sm-4 col-md-4 control-label">审核人</label>
<div class="col-sm-8 col-md-8"> <div class="col-sm-8 col-md-8">
<input id="reviewer" readonly type="text" class="form-control" name="reviewer"> <input id="reviewer" readonly type="text" class="form-control" name="reviewer">
</div> </div>
</div> </div>
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 col-md-4 control-label">类型</label>
<div class="col-sm-8 col-md-8">
<input id="type" readonly type="text" class="form-control" name="type">
</div>
</div>
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 col-md-4 control-label">提交指标</label>
<div class="col-sm-8 col-md-8">
<input id="shotName" readonly type="text" class="form-control" name="shotName">
</div>
</div>
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 col-md-4 control-label">达标分</label>
<div class="col-sm-8 col-md-8">
<input id="score" readonly type="number" class="form-control">
</div>
</div>
<div class="form-group col-sm-6 col-md-6"> <div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 col-md-4 control-label">评分</label> <label class="col-sm-4 col-md-4 control-label">评分</label>
<div class="col-sm-8 col-md-8"> <div class="col-sm-8 col-md-8">
<input id="nowScore" required type="number" class="form-control" name="nowScore"> <input id="nowScore" required type="number" class="form-control" name="nowScore">
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12">
<label class="col-sm-2 col-md-2 control-label">目标要求</label>
<div class="col-sm-10 col-md-10">
<input id="demand" readonly type="text" class="form-control" name="demand">
</div>
</div>
<div class="form-group col-sm-12 col-md-12">
<label class="col-sm-2 col-md-2 control-label">工作任务</label>
<div class="col-sm-10 col-md-10">
<textarea id="detailed" readonly class="form-control" name="detailed"></textarea>
</div>
</div>
<div class="form-group col-sm-12 col-md-12"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-2 col-md-2 control-label">审批意见</label> <label class="col-sm-2 col-md-2 control-label">审批意见</label>
<div class="col-sm-10 col-md-10"> <div class="col-sm-10 col-md-10">
@ -110,12 +134,22 @@
let deptName = parent.parent.a_deptName; let deptName = parent.parent.a_deptName;
let shotName = parent.parent.a_shotName; let shotName = parent.parent.a_shotName;
let reviewer = parent.parent.a_reviewer; let reviewer = parent.parent.a_reviewer;
let type = parent.parent.a_type;
let demand = parent.parent.a_demand;
let detailed = parent.parent.a_detailed;
let updatetime = parent.parent.a_updatetime;
let score = parent.parent.a_score;
$("#id").val(_id) $("#id").val(_id)
$("#reviewer").val(reviewer) $("#reviewer").val(reviewer)
$("#type").val(type)
$("#demand").val(demand)
$("#detailed").val(detailed)
$("#shotName").val(shotName) $("#shotName").val(shotName)
$("#header").val(header) $("#header").val(header)
$("#deptName").val(deptName) $("#deptName").val(deptName)
$("#commitTime").val(new Date()) $("#commitTime").val(new Date())
$("#updatetime").val(updatetime)
$("#score").val(score)
}); });
</script> </script>
</body> </body>

47
cyx-admin/src/main/resources/templates/base/affairs/warn.html
View File

@ -39,20 +39,20 @@
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <!-- <div class="btn-group-sm" id="toolbar" role="group">-->
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="base:affairs:add"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="base:affairs:add">-->
<i class="fa fa-plus"></i> 添加 <!-- <i class="fa fa-plus"></i> 添加-->
</a> <!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="base:affairs:edit"> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="base:affairs:edit">-->
<i class="fa fa-edit"></i> 修改 <!-- <i class="fa fa-edit"></i> 修改-->
</a> <!-- </a>-->
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove"> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove">-->
<i class="fa fa-remove"></i> 删除 <!-- <i class="fa fa-remove"></i> 删除-->
</a> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export"> <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">-->
<i class="fa fa-download"></i> 导出 <!-- <i class="fa fa-download"></i> 导出-->
</a> <!-- </a>-->
</div> <!-- </div>-->
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
@ -124,7 +124,12 @@
}, },
{ {
field: 'commitTime', field: 'commitTime',
title: '提交时间' title: '提交时间',
formatter: function(value, row, index) {
if (row.status === '2'){
return row.updateTime
}
}
}, },
{ {
field: 'finishDate', field: 'finishDate',
@ -163,7 +168,7 @@
if (row.status === '1'){ if (row.status === '1'){
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.upload(\'' + row.id + '\')"><i class="fa fa-edit"></i>上传附件</a> '); actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.upload(\'' + row.id + '\')"><i class="fa fa-edit"></i>上传附件</a> ');
}else if (row.status === '2'){ }else if (row.status === '2'){
actions.push('<a data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-reviewer="'+row.reviewer+'" data-nowscore="'+row.nowScore+'" class="shenhe btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)">审批</a> '); actions.push('<a data-id="'+row.id+'" data-header="'+row.header+'" data-score="'+row.score+'" data-updatetime="'+row.updateTime+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-reviewer="'+row.reviewer+'" data-detailed="'+row.detailed+'" data-demand="'+row.demand+'" data-type="'+row.type+'" data-nowscore="'+row.nowScore+'" class="shenhe btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)">审批</a> ');
}else if (row.status === '3'){ }else if (row.status === '3'){
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)">已驳回</a> '); actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)">已驳回</a> ');
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.upload(\'' + row.id + '\')"><i class="fa fa-edit"></i>重新上传附件</a> '); actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.upload(\'' + row.id + '\')"><i class="fa fa-edit"></i>重新上传附件</a> ');
@ -180,10 +185,15 @@
$("#bootstrap-table").on('click','.shenhe',function () { $("#bootstrap-table").on('click','.shenhe',function () {
let _id = $(this)[0].dataset.id; let _id = $(this)[0].dataset.id;
let header = $(this)[0].dataset.header; let header = $(this)[0].dataset.header;
let score = $(this)[0].dataset.score;
let nowScore = $(this)[0].dataset.nowscore; let nowScore = $(this)[0].dataset.nowscore;
let deptName = $(this)[0].dataset.deptname; let deptName = $(this)[0].dataset.deptname;
let shotName = $(this)[0].dataset.shotname; let shotName = $(this)[0].dataset.shotname;
let reviewer = $(this)[0].dataset.reviewer; let reviewer = $(this)[0].dataset.reviewer;
let updatetime = $(this)[0].dataset.updatetime;
let type = $(this)[0].dataset.type;
let demand = $(this)[0].dataset.demand;
let detailed = $(this)[0].dataset.detailed;
layer.open({ layer.open({
title:'审批', title:'审批',
area:['40%','50%'], area:['40%','50%'],
@ -194,11 +204,16 @@
parent.a_upload_id = _id; parent.a_upload_id = _id;
parent.a_header = header; parent.a_header = header;
parent.a_nowScore = nowScore; parent.a_nowScore = nowScore;
parent.a_score = score;
parent.a_deptName = deptName; parent.a_deptName = deptName;
parent.a_shotName = shotName; parent.a_shotName = shotName;
parent.a_reviewer = reviewer; parent.a_reviewer = reviewer;
parent.a_updatetime = updatetime;
parent.a_upload_index = index; parent.a_upload_index = index;
parent.a_upload_type = "1"; parent.a_upload_type = "1";
parent.a_type = type;
parent.a_demand = demand;
parent.a_detailed = detailed;
}, },
end(){ end(){
$.table.search() $.table.search()

13
cyx-admin/src/main/resources/templates/base/branch/add.html
View File

@ -7,9 +7,12 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-branch-add"> <form class="form-horizontal m" id="form-branch-add">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">父支部id：</label> <label class="col-sm-3 control-label">父支部：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="parentId" class="form-control" type="text"> <select name="parentId" id="parentId" class="form-control">
<option value="">请选择</option>
<option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option>
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -27,7 +30,11 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">负责人：</label> <label class="col-sm-3 control-label">负责人：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="leader" class="form-control" type="text"> <select name="leader" id="leader" class="form-control">
<option value="">请选择</option>
<option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.name}"></option>
</select>
<!-- <input name="leader" class="form-control" type="text">-->
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

14
cyx-admin/src/main/resources/templates/base/branch/edit.html
View File

@ -8,9 +8,13 @@
<form class="form-horizontal m" id="form-branch-edit" th:object="${tAmentBranch}"> <form class="form-horizontal m" id="form-branch-edit" th:object="${tAmentBranch}">
<input name="branchId" th:field="*{branchId}" type="hidden"> <input name="branchId" th:field="*{branchId}" type="hidden">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">父支部id：</label> <label class="col-sm-3 control-label">父支部：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="parentId" th:field="*{parentId}" class="form-control" type="text"> <select name="parentId" th:field="*{parentId}" id="parentId" class="form-control">
<option value="">请选择</option>
<option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option>
</select>
<!-- <input name="parentId" th:field="*{parentId}" class="form-control" type="text">-->
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -28,7 +32,11 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">负责人：</label> <label class="col-sm-3 control-label">负责人：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="leader" th:field="*{leader}" class="form-control" type="text"> <select name="leader" th:field="*{leader}" id="leader" class="form-control">
<option value="">请选择</option>
<option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.name}"></option>
</select>
<!-- <input name="leader" th:field="*{leader}" class="form-control" type="text">-->
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

5
cyx-admin/src/main/resources/templates/base/dept/add.html
View File

@ -31,7 +31,10 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">负责人：</label> <label class="col-sm-3 control-label">负责人：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" type="text" name="leader"> <select name="leader" id="leader" class="form-control">
<option value="">请选择</option>
<option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.name}"></option>
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

5
cyx-admin/src/main/resources/templates/base/dept/edit.html
View File

@ -32,7 +32,10 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">负责人：</label> <label class="col-sm-3 control-label">负责人：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" type="text" name="leader" th:field="*{leader}"> <select name="leader" th:field="*{leader}" id="leader" class="form-control">
<option value="">请选择</option>
<option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.name}"></option>
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

19
cyx-admin/src/main/resources/templates/base/personnel/add.html
View File

@ -9,9 +9,11 @@
<form class="form-horizontal m" id="form-personnel-add"> <form class="form-horizontal m" id="form-personnel-add">
<div class="row"> <div class="row">
<div class="form-group col-sm-6 col-md-6"> <div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">单位名称：</label> <label class="col-sm-4 control-label">支部名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="unit" class="form-control" type="text"> <select name="branchId" id="branchId" class="form-control">
<option value="">请选择</option>
</select>
</div> </div>
</div> </div>
<div class="form-group col-sm-6 col-md-6"> <div class="form-group col-sm-6 col-md-6">
@ -135,6 +137,19 @@
$("#deptId")[0].innerHTML=opt; $("#deptId")[0].innerHTML=opt;
} }
}); });
$.ajax({
type: "post",
url: ctx + "base/personnel/branchList",
data: {
},
success: function(data) {
var opt = '<option value="">请选择</option>';
data.data.forEach(d=>{
opt += '<option value="'+d.branchId+'">'+d.branchName+'</option>';
})
$("#branchId")[0].innerHTML=opt;
}
});
}) })
function submitHandler() { function submitHandler() {

37
cyx-admin/src/main/resources/templates/base/personnel/edit.html
View File

@ -20,6 +20,15 @@
<input name="name" th:field="*{name}" class="form-control" type="text"> <input name="name" th:field="*{name}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8">
<select required name="sex" th:field="*{sex}" class="form-control ">
<option value="1">男</option>
<option value="2">女</option>
</select>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">民族：</label> <label class="col-sm-3 control-label">民族：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -30,6 +39,8 @@
<label class="col-sm-3 control-label">部门：</label> <label class="col-sm-3 control-label">部门：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="deptId" th:field="*{deptId}" id="deptId" class="form-control"> <select name="deptId" th:field="*{deptId}" id="deptId" class="form-control">
<option value="">请选择</option>
<option th:each="item : ${deptList}" th:text="${item.deptName}" th:value="${item.deptId}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -79,9 +90,12 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">支部ID：</label> <label class="col-sm-3 control-label">支部名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="branchId" th:field="*{branchId}" class="form-control" type="text"> <select name="branchId" th:field="*{branchId}" id="branchId" class="form-control">
<option value="">请选择</option>
<option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option>
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -115,25 +129,6 @@
focusCleanup: true focusCleanup: true
}); });
$(document).ready(function () {
$("#deptId").on("change", function() {
console.log($(this).val())
});
$.ajax({
type: "post",
url: ctx + "base/personnel/deptList",
data: {
},
success: function(data) {
var opt = '<option value="">请选择</option>';
data.data.forEach(d=>{
opt += '<option value="'+d.deptId+'">'+d.deptName+'</option>';
})
$("#deptId").html(opt);
}
});
})
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-personnel-edit').serialize()); $.operate.save(prefix + "/edit", $('#form-personnel-edit').serialize());

4
cyx-admin/src/main/resources/templates/login.html
View File

@ -35,8 +35,8 @@
<div style="width: 350px;margin: 0 auto;position: absolute;left: 25%"> <div style="width: 350px;margin: 0 auto;position: absolute;left: 25%">
<form autocomplete="off" id="signupForm"> <form autocomplete="off" id="signupForm">
<h4 class="no-margins" style="font-size: 22px">请登录：业务绩效考核系统</h4> <h4 class="no-margins" style="font-size: 22px">请登录：业务绩效考核系统</h4>
<input class="form-control uname" name="username" placeholder="用户名" type="text" value="admin"/> <input class="form-control uname" name="username" placeholder="用户名" type="text" value=""/>
<input class="form-control pword" name="password" placeholder="密码" type="password" value="admin123"/> <input class="form-control pword" name="password" placeholder="密码" type="password" value=""/>
<div class="row m-t" th:if="${captchaEnabled==true}"> <div class="row m-t" th:if="${captchaEnabled==true}">
<div class="col-xs-6"> <div class="col-xs-6">
<input class="form-control code" maxlength="5" name="validateCode" placeholder="验证码" <input class="form-control code" maxlength="5" name="validateCode" placeholder="验证码"

5
cyx-admin/src/main/resources/templates/main.html
View File

@ -243,7 +243,6 @@
chart.setOption(option); chart.setOption(option);
//通过点击事件，传递参数刷新中间表格数据 //通过点击事件，传递参数刷新中间表格数据
chart.on('click', function (params) { chart.on('click', function (params) {
console.log(params, 'params')
window.parent._shotName = params.name; window.parent._shotName = params.name;
$.modal.openTab("党务及意识形态", prefix + '',true); $.modal.openTab("党务及意识形态", prefix + '',true);
}) })
@ -454,6 +453,10 @@
}; };
// 使用刚指定的配置项和数据显示图表。 // 使用刚指定的配置项和数据显示图表。
chart.setOption(option); chart.setOption(option);
chart.on('click', function (params) {
window.parent._shotName = params.name;
$.modal.openTab("日常考核指标", prefix + '/day',true);
})
} }
}) })
}; };

3
cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="type" column="type" /> <result property="type" column="type" />
<result property="unit" column="unit" /> <result property="unit" column="unit" />
<result property="target" column="target" /> <result property="target" column="target" />
<result property="shotName" column="shot_name" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="demand" column="demand" /> <result property="demand" column="demand" />
<result property="detailed" column="detailed" /> <result property="detailed" column="detailed" />
@ -30,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTAmentPartyAffairsVo"> <sql id="selectTAmentPartyAffairsVo">
select id, type, files, unit, target, status, demand, detailed, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs select id, type,shot_name ,files, unit, target, status, demand, detailed, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs
</sql> </sql>
<select id="selectTAmentPartyAffairsList" parameterType="TAmentPartyAffairs" resultMap="TAmentPartyAffairsResult"> <select id="selectTAmentPartyAffairsList" parameterType="TAmentPartyAffairs" resultMap="TAmentPartyAffairsResult">