From 4fb65d8e3c5fc8ddb8882a355cd31ecb9d51f3d9 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 18 六月 2024 15:13:38 +0800
Subject: [PATCH] 评分项内容拆分
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
index c1497c9..18a6d5b 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
@@ -78,13 +78,23 @@
<option value="超期改">超期改</option>
</select>
</li>
- <li>
+ <li style="display: flex;align-items: center">
<label>整改部门：</label>
- <select name="rectifyDeptIdLedger">
- <option value="">所有</option>
- <option th:each="dept : ${deptList}" th:text="${dept.deptName}"
- th:value="${dept.deptId}"></option>
- </select>
+ <div class="input-group" style="width: 200px;position: relative">
+ <input name="rectifyDeptIdLedger" id="rectifyDeptIdLedger" style="position: absolute;z-index: -1;top: 0;left: 0">
+ <input onclick="selectDangerDeptTree()" id="dangerDeptName" type="text"
+ placeholder="请选择部门" class="form-control" required
+ readonly="readonly">
+ <span class="input-group-addon"><i class="fa fa-search"></i></span>
+ </div>
+ </li>
+ <li style="display: flex;align-items: center">
+ <label>隐患登记人：</label>
+ <div class="input-group" style="width: 200px;position: relative">
+ <input id="registerUserId" name="registerUserId" style="position: absolute;z-index: -1;top: 0;left: 0">
+ <input id="registerUserName" placeholder="请选择登记人" class="form-control" type="text" onclick="selectAcceptUser()" maxlength="30" readonly="true" required>
+ <span class="input-group-addon"><i class="fa fa-search"></i></span>
+ </div>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -126,6 +136,26 @@
$("#yearOnYearRate").text([[${yearOnYearRate}]]);
});
+ /*验收人 选择 start*/
+ function selectAcceptUser() {
+ var url = ctx + "system/user/selectUserListByParentSonCompany";
+ var options = {
+ title: '用户选择',
+ width: "800",
+ url: url,
+ };
+ $.modal.openOptionsByCallback(options, function (layero, index) {
+ var body = layer.getChildFrame('body', index);
+ body.on("click", ".selectUser", function () {
+ var userId = $(this).data("userid");
+ var userName = $(this).data("username");
+ $("#registerUserId").val(userId);
+ $("#registerUserName").val(userName);
+ layer.close(index);
+ });
+ });
+ }
+
$(function () {
var options = {
url: prefix + "/list",
@@ -142,6 +172,10 @@
field: 'id',
title: '隐患检查点ID',
visible: false
+ },
+ {
+ field: 'registerCreateTime',
+ title: '登记时间'
},
{
field: 'checkType',
@@ -261,11 +295,7 @@
label = "验收未通过";
}
}
- if (compareDate(item.rectifyDeadlineTime, item.rectifyCompleteTime)) {
- label += "（按期改）";
- } else {
- label += "（超期改）";
- }
+
}
}
return label;
@@ -279,6 +309,7 @@
if (row.stage) {
if (row.stage == 3) {
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="detailDangerExamine(\'' + row.id + '\')"><i class="fa fa-search"></i>查看</a> ');
+ actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="editType(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a>');
if (common == "common") {
actions.push('<a class="btn btn-danger btn-xs " href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
}
@@ -286,6 +317,7 @@
return actions.join('');
} else if (row.stage == 4) {
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="detailDangerRectify(\'' + row.id + '\')"><i class="fa fa-search"></i>查看</a> ');
+ actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="editType(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a>');
if (common == "common") {
actions.push('<a class="btn btn-danger btn-xs " href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
}
@@ -293,11 +325,10 @@
return actions.join('');
} else if (row.stage == 5) {
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="detailDangerAccept(\'' + row.id + '\')"><i class="fa fa-search"></i>查看</a> ');
-
+ actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="editType(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a>');
if (common == "common") {
actions.push('<a class="btn btn-danger btn-xs " href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
}
-
return actions.join('');
}
}
@@ -307,7 +338,6 @@
};
$.table.init(options);
});
-
var compareDate = function (date1, date2) {
var oDate1 = new Date(date1);
@@ -324,6 +354,13 @@
function editDangerExamine(id) {
var editDangerExamineUrl = ctx + "tr/hiddenDangerCheck/dangerExamine/editDangerExamine/{id}";
$.modal.open("隐患核查", editDangerExamineUrl.replace("{id}", id));
+ }
+
+ /* 隐患核查--修改 */
+ function editType(id) {
+ var editTypeUrl = prefix + "/editDangerLevel/{id}";
+ console.log(id,'id')
+ $.modal.open("修改", editTypeUrl.replace("{id}", id));
}
/* 隐患核查--查看 */
@@ -356,7 +393,29 @@
$.operate.openDetailInfo("查看隐患验收信息", detailDangerAcceptUrl.replace("{id}", id));
}
+ /*隐患责任部门 选择 start*/
+ function selectDangerDeptTree() {
+ var treeId = $("#rectifyDeptIdLedger").val();
+ var deptId = $.common.isEmpty(treeId) ? "100" : $("#rectifyDeptIdLedger").val();
+ var url = ctx + "system/dept/selectDeptTreeByCompanyId/" + deptId;
+ var options = {
+ title: '选择部门',
+ width: "380",
+ url: url,
+ callBack: doSubmitBeCheckedDept
+ };
+ $.modal.openOptions(options);
+ }
+ function doSubmitBeCheckedDept(index, layero) {
+ var tree = layero.find("iframe")[0].contentWindow.$._tree;
+ // if ($.tree.notAllowParents(tree)) {
+ var body = layer.getChildFrame('body', index);
+ $("#rectifyDeptIdLedger").val(body.find('#treeId').val());
+ $("#dangerDeptName").val(body.find('#treeName').val());
+ layer.close(index);
+ // }
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.2