From 9eb8ac94bec507ab7f0435400035adcf41997b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Wed, 2 Apr 2025 16:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=EF=BC=8C?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84=EF=BC=8C=E8=AF=84=E4=BB=B7=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/TeamEvaluateServiceImpl.java      |  2 +-
 .../static/js/evaluate/org/addForm.js         | 14 ++++++------
 .../static/pages/evaluate/org/addForm.html    | 22 +++++++++++--------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamEvaluateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamEvaluateServiceImpl.java
index 5a0392f..9f69b88 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamEvaluateServiceImpl.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamEvaluateServiceImpl.java
@@ -85,7 +85,7 @@ public class TeamEvaluateServiceImpl implements TeamEvaluateService {
                 phoneArray = new String[]{phones};
             }
             KtySmsUtil ktySmsUtil = new KtySmsUtil();
-            String content = "【甘肃教育培训系统提醒您】您有一个已退场的班组未进行评价，请抓紧评价！";
+            String content = "【博诺思】您有一个已退场的班组未进行评价，请抓紧评价！";
 
             boolean allSentSuccessfully = true;
             for (String phone : phoneArray) {
diff --git a/src/main/resources/static/js/evaluate/org/addForm.js b/src/main/resources/static/js/evaluate/org/addForm.js
index a737e4c..f5c5db2 100644
--- a/src/main/resources/static/js/evaluate/org/addForm.js
+++ b/src/main/resources/static/js/evaluate/org/addForm.js
@@ -10,7 +10,7 @@ function getData() {
         $("#form4").remove();
         $("#form5").remove();
         getProList();
-        // getLeaderList();
+        getLeaderList();
     } else if (Number(objParam.type) === 1) {
         $("#form").remove();
         $("#form2").removeAttr("style");
@@ -233,18 +233,18 @@ function submitApply(data) {
     let url = `${ctxPath}` + "/organizational/addData";
     if (Number(objParam.type) === 0) {
         // 项目
-        if (selectDtreeObj == null) {
+        /*if (selectDtreeObj == null) {
             layer.msg("请选择项目");
             return;
-        }
+        }*/
         item = {
-            ...selectDtreeObj,
+            /*...selectDtreeObj,*/
+            name:$("#proId").val(),
             parentId: objParam.id,
             level: 3,
             tableSource: "pm_dept",
-            // userId : data.field.personInChargeId,
-            userId: "",
-            userName: $("#personInChargeId").val(),
+            userId : data.field.personInChargeId,
+            userName : $('#personInChargeId').find('option:checked').text()
         };
     } else if (Number(objParam.type) === 1) {
         // 外包商
diff --git a/src/main/resources/static/pages/evaluate/org/addForm.html b/src/main/resources/static/pages/evaluate/org/addForm.html
index 292f2cb..1a6427b 100644
--- a/src/main/resources/static/pages/evaluate/org/addForm.html
+++ b/src/main/resources/static/pages/evaluate/org/addForm.html
@@ -68,24 +68,28 @@
     <div id="main-box">
         <div class="form">
             <form class="layui-form" onsubmit="return false;" id="form" style="display: none;" onclick="return false;">
-                <div style="width: 100%;height: 100%;display: flex">
-                    <div class="layui-form-item" style="margin-top: 1%;display: flex;width: 50%">
+                <div style="width: 100%;height: 100%">
+                    <div class="layui-form-item" style="margin-top: 1%;display: flex;width: 100%">
                         <label class="layui-form-label"><span class="required_icon">*</span>所属上级</label>
-                        <div class="layui-input-inline" style="overflow: auto;max-height: 360px;">
+                       <!-- <div class="layui-input-inline" style="overflow: auto;max-height: 360px;">
                             <ul id="proId" class="dtree" data-id="0" data-value="001"></ul>
+                        </div>-->
+                        <div class="layui-input-inline" style="width: 200px;">
+                            <input type="text" required lay-verify="required" id="proId"
+                                   name="proId" autocomplete="off" class="layui-input">
                         </div>
                     </div>
-                    <div class="layui-form-item" style="margin-top: 1%;height: 100%;display: flex;width: 50%">
+                    <div class="layui-form-item" style="margin-top: 1%;display: flex;width: 100%">
                         <label class="layui-form-label"><span class="required_icon">*</span>负责人</label>
-                        <!-- <div class="layui-input-inline" style="overflow: hidden;height: 360px;">
+                         <div class="layui-input-inline" style="width: 256px;">
                             <select id="personInChargeId" name="personInChargeId" class="layui-select" lay-search
                                 lay-verify="required" style="height: 360px;"></select>
-                        </div> -->
+                        </div>
 
-                        <div class="layui-input-block" style="width: 100%; margin-right: 10px;">
+                       <!-- <div class="layui-input-block" style="width: 100%; margin-right: 10px;">
                             <input type="text" required lay-verify="required" id="personInChargeId"
                                 name="personInChargeId" placeholder="请输入负责人姓名" autocomplete="off" class="layui-input">
-                        </div>
+                        </div>-->
                     </div>
                 </div>
                 <button type="submit" id="formSubmit" class="layui-btn" lay-submit="" lay-filter="formData"
@@ -228,4 +232,4 @@
 <script src="../../../layui/layui_ext/dtree/dtree.js"></script>
 <script src="../../../js/evaluate/org/addForm.js?v=1"></script>
 
-</html>
\ No newline at end of file
+</html>