From c0d6e7b5da697bb7dff873839fd28f14a490d247 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 21 八月 2023 15:38:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html | 5 +++--
src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html | 41 +++++++++++++++++++++++++++++++++++------
2 files changed, 38 insertions(+), 8 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..fff794f 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
@@ -78,13 +78,20 @@
<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>
+<!-- <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">
+ <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>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -356,7 +363,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
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
index 6feaca0..7e11c4d 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
@@ -312,8 +312,9 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">隐患整改资金：</label>
- <div class="col-sm-8">
- <input name="rectifyFund" class="form-control" type="text" required>
+ <div class="col-sm-8" style="display: flex;align-items: center">
+ <input name="rectifyFund" class="form-control" type="number" placeholder="请输入数字（单位：万）" required>
+ <span style="width: 50px;background: #ccc;height:34px;text-align: center;line-height: 34px">万</span>
</div>
</div>
<div class="form-group">
--
Gitblit v1.9.2