From 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 17 七月 2024 16:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/tbBaseCheckScore/selectTbBaseCheckScorePage.html | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/templates/tr/tbBaseCheckScore/selectTbBaseCheckScorePage.html b/src/main/resources/templates/tr/tbBaseCheckScore/selectTbBaseCheckScorePage.html
index 9fb9a07..3f04b6e 100644
--- a/src/main/resources/templates/tr/tbBaseCheckScore/selectTbBaseCheckScorePage.html
+++ b/src/main/resources/templates/tr/tbBaseCheckScore/selectTbBaseCheckScorePage.html
@@ -62,30 +62,40 @@
url: prefix + "/list",
queryParams: queryParams,
cleanUrl: prefix + "/clean",
- createUrl: prefix + "/add",
- detailUrl: prefix + "/detail/{id}",
+ createUrl:"/tr/TBSpecialCheckScoreAndDangerLog/add/{id}",
+ detailUrl: "/tr/TBSpecialCheckScoreAndDangerLog/{id}",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
sortName: "createTime",
sortOrder: "desc",
- modalName: "任务上报",
+ modalName: "评分细则",
columns: [
{
- field: 'indexId',
- title: '检查序号'
+ title: "序号",
+ formatter: function (value, row, index) {
+ return $.table.serialNumber(index);
+ }
},
{
- field: 'checkContent',
- title: '检查内容'
+ field: 'isReject',
+ title: '是否为否决项',
+ align: 'center',
+ formatter: function (value, row, index) {
+ if (value == "1") {
+ return "是";
+ } else if (value == "0") {
+ return "否";
+ }
+ }
},
{
- field: 'checkBasis',
- title: '检查依据'
+ field: 'deductIllustrate',
+ title: '扣分说明'
},
{
- field: 'applicablePlace',
- title: '适用场所'
+ field: 'deductPoint',
+ title: '扣分分值'
},
{
field: 'createDate',
@@ -100,8 +110,8 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
- actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.edit(" + row.id + ")'><i class='fa fa-edit'></i>评分</a> ");
- actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.detail(" + row.id + ")'><i class='fa fa-search'></i>评分记录</a> ");
+ actions.push('<a class="btn btn-success btn-xs" href="#" onclick="$.operate.add(\'' + row.id + ','+ row.checkItemId + '\')"><i class="fa fa-edit"></i>评分</a> ');
+ actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\',1600)"><i class="fa fa-edit"></i>评分记录</a> ');
return actions.join('');
}
}
@@ -109,12 +119,19 @@
};
$.table.init(options);
});
+
function queryParams(params) {
var search = $.table.queryParams(params);
// 所属风险单元
search.id = $("#riskId").val();
return search;
}
+
+ /* 检查项上报 */
+ function openAdd(id) {
+ var detailDangerExamineUrl = "/tr/TBSpecialCheckScoreAndDangerLog/add/{id}";
+ $.operate.add("新增评分", detailDangerExamineUrl.replace("{id}", id),1600);
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.2