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 @@