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/riskEvaluationPlan/add.html |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 deletions(-)

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