From 4a615badcc2b1d1fe34a7fe7b0bd71dc49b9ee31 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 11 十月 2023 17:05:40 +0800
Subject: [PATCH] 新增核查人
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
index fff794f..b3116fd 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
@@ -19,8 +19,8 @@
<div class="form-group" style="font-size: 25px;color: #4CAF50;">
<label class="col-sm-3 control-label">按期改：<span id="onTimeRectifyNum"></span></label>
<label class="col-sm-3 control-label">按期率：<span id="onTimeRectifyRate"></span></label>
- <label class="col-sm-3 control-label">超期改：<span id="overdueRectifyNum"></span></label>
- <label class="col-sm-3 control-label">超期率：<span id="overdueRectifyRate"></span></label>
+ <label class="col-sm-3 control-label">超期改：<span>0</span></label>
+ <label class="col-sm-3 control-label">超期率：<span>0%</span></label>
</div>
<div class="form-group" style="font-size: 25px;color: #4CAF50;">
@@ -80,16 +80,19 @@
</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">
- <input name="rectifyDeptIdLedger" type="hidden" id="rectifyDeptIdLedger">
+ <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>
@@ -132,6 +135,26 @@
$("#monthOnMonthRate").text([[${monthOnMonthRate}]]);
$("#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 = {
@@ -268,11 +291,7 @@
label = "验收未通过";
}
}
- if (compareDate(item.rectifyDeadlineTime, item.rectifyCompleteTime)) {
- label += "（按期改）";
- } else {
- label += "（超期改）";
- }
+
}
}
return label;
@@ -314,7 +333,6 @@
};
$.table.init(options);
});
-
var compareDate = function (date1, date2) {
var oDate1 = new Date(date1);
--
Gitblit v1.9.2