diff --git a/base-server/src/main/resources/template/js/teamBusiness/teamBusinessEdit.js b/base-server/src/main/resources/template/js/teamBusiness/teamBusinessEdit.js index d075b76684a355d058948649b604faad6aa3b551..e82451d9cdde44fd39285be32ee66c99c2e05e5c 100644 --- a/base-server/src/main/resources/template/js/teamBusiness/teamBusinessEdit.js +++ b/base-server/src/main/resources/template/js/teamBusiness/teamBusinessEdit.js @@ -1,4 +1,6 @@ +var userList = new Array(); + layui.config({ base: basePath, version: skyeyeVersion @@ -29,6 +31,11 @@ layui.config({ ajaxSendLoadBefore: function(hdb, json) {}, ajaxSendAfter: function (json) { loadTreeTable(); + userList.push(json.bean.chargeUserMation); + $.each(userList, function(i, item) { + $("#chargeUser").val(item.name); + }); + // 解析成员信息 $.each(json.bean.teamRoleList, function (i, item) { treeTableData.push({ @@ -80,6 +87,7 @@ layui.config({ objectKey: objectKey, teamTemplateId: json.bean.teamTemplateId, teamRoleList: JSON.stringify(teamRoleList), + chargeUser: userList[0].id, teamObjectPermissionList: JSON.stringify(teamObjectPermissionList) }; AjaxPostUtil.request({url: reqBasePath + "updateTeamBusiness", params: params, type: 'json', method: "POST", callback: function (json) { @@ -315,6 +323,22 @@ layui.config({ }}); }); + // 团队经理选择 + $("body").on("click", "#chargeUserSelPeople", function (e) { + systemCommonUtil.userReturnList = [].concat(userList); + systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含 + systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要 + systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选 + systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) { + // 重置数据 + userList = [].concat(userReturnList); + // 添加选择 + $.each(userList, function(i, item) { + $("#chargeUser").val(item.name); + }); + }); + }); + $("body").on("click", "#cancle", function() { location.href = "../../tpl/teamBusiness/teamBusinessDetails.html?objectId=" + objectId + "&objectKey=" + objectKey + "&objectType=" + objectType; diff --git a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateAdd.js b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateAdd.js index cbcfa27e063a1da4d7499cbb377a90d40452bdff..852d909160dc3613bbab6c58a1e8189bf36e223a 100644 --- a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateAdd.js +++ b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateAdd.js @@ -1,4 +1,6 @@ +var userList = new Array(); + layui.config({ base: basePath, version: skyeyeVersion @@ -119,6 +121,7 @@ layui.config({ enabled: $("#enabled input:radio:checked").val(), remark: $("#remark").val(), teamRoleList: JSON.stringify(teamRoleList), + chargeUser: userList[0].id, teamObjectPermissionList: JSON.stringify(teamObjectPermissionList) }; AjaxPostUtil.request({url: reqBasePath + "writeTeamTemplate", params: params, type: 'json', method: "POST", callback: function (json) { @@ -268,6 +271,22 @@ layui.config({ }}); }); + // 团队经理选择 + $("body").on("click", "#chargeUserSelPeople", function (e) { + systemCommonUtil.userReturnList = [].concat(userList); + systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含 + systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要 + systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选 + systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) { + // 重置数据 + userList = [].concat(userReturnList); + // 添加选择 + $.each(userList, function(i, item) { + $("#chargeUser").val(item.name); + }); + }); + }); + $("body").on("click", "#cancle", function() { parent.layer.close(index); }); diff --git a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateEdit.js b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateEdit.js index d2cb111f605818af664f1f3c97d3392c68fd6d9b..a5de2c28c08320f034178a738941a480b5d00fa1 100644 --- a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateEdit.js +++ b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateEdit.js @@ -1,4 +1,6 @@ +var userList = new Array(); + layui.config({ base: basePath, version: skyeyeVersion @@ -29,6 +31,11 @@ layui.config({ skyeyeClassEnumUtil.showEnumDataListByClassName("teamObjectType", 'select', "objectType", json.bean.objectType, form); skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", json.bean.enabled, form); + userList.push(json.bean.chargeUserMation); + $.each(userList, function(i, item) { + $("#chargeUser").val(item.name); + }); + loadTreeTable(); // 解析成员信息 $.each(json.bean.teamRoleList, function (i, item) { @@ -82,6 +89,7 @@ layui.config({ enabled: $("#enabled input:radio:checked").val(), remark: $("#remark").val(), teamRoleList: JSON.stringify(teamRoleList), + chargeUser: userList[0].id, teamObjectPermissionList: JSON.stringify(teamObjectPermissionList) }; AjaxPostUtil.request({url: reqBasePath + "writeTeamTemplate", params: params, type: 'json', method: "POST", callback: function (json) { @@ -318,6 +326,22 @@ layui.config({ }}); }); + // 团队经理选择 + $("body").on("click", "#chargeUserSelPeople", function (e) { + systemCommonUtil.userReturnList = [].concat(userList); + systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含 + systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要 + systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选 + systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) { + // 重置数据 + userList = [].concat(userReturnList); + // 添加选择 + $.each(userList, function(i, item) { + $("#chargeUser").val(item.name); + }); + }); + }); + $("body").on("click", "#cancle", function() { parent.layer.close(index); }); diff --git a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateList.js b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateList.js index 99ffea26407bb1f78ca74d3e41f8eef77fc681b9..ccc6f047347a90075a1e980b7f31992f4b610f2d 100644 --- a/base-server/src/main/resources/template/js/teamTemplate/teamTemplateList.js +++ b/base-server/src/main/resources/template/js/teamTemplate/teamTemplateList.js @@ -38,6 +38,7 @@ layui.config({ { field: 'isUsed', title: '使用状态', align: 'center', width: 100, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("isUsed", 'id', d.isUsed, 'name'); }}, + { field: 'chargeUserName', title: '团队经理', width: 120 }, { field: 'remark', title: '备注', width: 300 }, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, diff --git a/base-server/src/main/resources/template/tpl/teamBusiness/teamBusinessDetails.html b/base-server/src/main/resources/template/tpl/teamBusiness/teamBusinessDetails.html index a2107216cc23d38d75fbc34e59de396701a074bf..094a88e233f80be1bb971c87a9ebc99d2d6893e1 100644 --- a/base-server/src/main/resources/template/tpl/teamBusiness/teamBusinessDetails.html +++ b/base-server/src/main/resources/template/tpl/teamBusiness/teamBusinessDetails.html @@ -18,6 +18,15 @@
+
+ 基本信息
+
+
+ +
+ {{chargeUserMation.name}} +
+
成员信息
diff --git a/base-server/src/main/resources/template/tpl/teamBusiness/teamBusinessEdit.html b/base-server/src/main/resources/template/tpl/teamBusiness/teamBusinessEdit.html index a50892c3b45dd1b743097bbe6fa10f0be7201de3..5eb0f7db3bb1c2b556166bca7a4edf73501678b9 100644 --- a/base-server/src/main/resources/template/tpl/teamBusiness/teamBusinessEdit.html +++ b/base-server/src/main/resources/template/tpl/teamBusiness/teamBusinessEdit.html @@ -15,6 +15,17 @@