From 5962f3291b3305651a613f5665961ee3d1a14ef7 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 11 九月 2023 14:14:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html | 2 +-
src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editNextConfirm.html | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html
index f055cc2..6390a4c 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/dangerExamine.html
@@ -145,7 +145,7 @@
formatter: function (value, row, index) {
var actions = [];
if (row.examineStatus == 0) {
- actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="nextConfirm(\'' + row.id + '\')"><i class="fa fa-edit"></i>下一步核查</a> ');
+ actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="nextConfirm(\'' + row.id + '\')"><i class="fa fa-edit"></i>下一步核查</a> ');
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="editDangerExamine(\'' + row.id + '\')"><i class="fa fa-edit"></i>核查</a> ');
return actions.join('');
} else if (row.examineStatus == 1) {
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editNextConfirm.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editNextConfirm.html
index d49226b..629b073 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editNextConfirm.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerExamine/editNextConfirm.html
@@ -304,8 +304,12 @@
// var examineUserName = $("select[name='examineUserId']").find("option:selected").text();//整改人名称
// data.push({"name": "examineUserName", "value": examineUserName});
}
-
- $.operate.save(prefix + "/editNextConfirmSave", data);
+ var newData = {
+ id: data.id,
+ examineUserId: data.examineUserId,
+ examineUserName: data.examineUserName
+ }
+ $.operate.save(prefix + "/editNextConfirmSave", newData);
}
}
--
Gitblit v1.9.2