From df9309d20fd4984b490f1caa5acbad9fdd8c2d03 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 16 五月 2023 10:56:33 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/TroubleAndRisk
---
src/main/resources/templates/tr/baseCheckPoint/add.html | 27 ++++++++++++-
src/main/resources/templates/tr/riskEvaluationPlan/add.html | 39 ++++++++++++++++++-
2 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/tr/baseCheckPoint/add.html b/src/main/resources/templates/tr/baseCheckPoint/add.html
index 0c3df92..190d7b8 100644
--- a/src/main/resources/templates/tr/baseCheckPoint/add.html
+++ b/src/main/resources/templates/tr/baseCheckPoint/add.html
@@ -32,8 +32,8 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">风险管控措施：</label>
- <div class="col-sm-8">
- <select name="controlMeasureId" class="form-control m-b">
+ <div class="col-sm-8" id="container">
+ <select id="mySelect" name="controlMeasureId" class="form-control m-b">
<option value="">--请选择风险管控措施--</option>
<option th:each="u :${measureList}" th:value="${u.id}" th:text="${u.checkContent}"></option>
</select>
@@ -62,6 +62,29 @@
$.operate.save(prefix + "/add", $('#form-baseCheckPoint-add').serialize());
}
}
+
+ var select = document.getElementById("mySelect");
+ var options = select.options;
+ var input = document.createElement("input");
+ var container = document.getElementById("container");
+ container.insertBefore(input, select);
+
+ input.addEventListener("keyup", function() {
+ var value = input.value.toLowerCase().trim();
+ for(var i=0; i<options.length; i++) {
+ var option = options[i];
+ if(option.value.toLowerCase().indexOf(value) > -1 || option.text.toLowerCase().indexOf(value) > -1) {
+ option.style.display = "";
+ } else {
+ option.style.display = "none";
+ }
+ }
+ });
+ input.style.width = "100%"
+ input.style.height = "34px"
+ input.style.paddingLeft = "20px"
+ input.style.marginBottom = "10px"
+ input.placeholder = "输入关键词以缩小选择范围"
</script>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/tr/riskEvaluationPlan/add.html b/src/main/resources/templates/tr/riskEvaluationPlan/add.html
index 894367b..4c08dec 100644
--- a/src/main/resources/templates/tr/riskEvaluationPlan/add.html
+++ b/src/main/resources/templates/tr/riskEvaluationPlan/add.html
@@ -114,11 +114,46 @@
//选择辨识人员
function selectIdentifyUserId() {
- var url = "/system/user/selectUserByCompanyId";
- $.modal.openNoConfirm("用户选择", url, '700', '500');
+ var url = ctx + "system/user/selectUserListByParentSonCompanyConfirm";
+ // $.modal.openNoConfirm("用户选择", url, '700', '500');
+ var options = {
+ title: '用户选择',
+ width: "800",
+ height: "500",
+ url: url,
+ callBack: doSubmitSelectExecuteUser
+ };
+ $.modal.openOptions(options);
}
+ function doSubmitSelectExecuteUser(index, layero) {
+ var rows = layero.find("iframe")[0].contentWindow.table.rememberSelecteds["bootstrap-table"];
+ // console.log(rows);
+ //
+ // var userId = layero.find("iframe")[0].contentWindow.$.table.selectColumns('userId');
+ // var userName = layero.find("iframe")[0].contentWindow.$.table.selectColumns('userName');
+ //
+ // console.log(userId);
+ // console.log(userName);
+ // var rows = layero.find("iframe")[0].contentWindow.$("#bootstrap-table").bootstrapTable('getSelections');
+ if (rows.length > 0) {
+ var executeUserIdString = "";
+ var executeUserNameString = "";
+
+ $.each(rows, function (i, row) {
+ executeUserIdString = executeUserIdString != "" ? executeUserIdString + "," + row.userId : row.userId;
+ executeUserNameString = executeUserNameString != "" ? executeUserNameString + "," + row.userName : row.userName;
+ });
+
+ $("#userId").val(executeUserIdString);
+ $("#userName").val(executeUserNameString);
+
+ layer.close(index);
+ } else {
+ $.modal.alertWarning("请至少选择一个执行人");
+ }
+ }
</script>
</body>
--
Gitblit v1.9.2