diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Form.js index 08f6e9dac..3c36fd670 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Form.js @@ -6,7 +6,8 @@ */ var acceptClick; var keyValue = request('keyValue'); -var PPId = request("PPId"); +var PPId = request("PPId");//项目阶段id +var PId = request("PId");//项目Id var bootstrap = function ($, learun) { "use strict"; var page = { @@ -26,6 +27,9 @@ var bootstrap = function ($, learun) { value: "Id", text: "Name", }); + if (!!PId) { + $('#PId').lrselectSet(PId); + } $('#PPId').lrselect({ type: 'tree', // 展开最大高度 @@ -43,7 +47,6 @@ var bootstrap = function ($, learun) { if (!!PPId) { $('#PPId').lrselectSet(PPId); } - $('#Files').lrUploader(); $('#DepartmentId').lrDepartmentSelect(); $('#ManagerId').lrUserSelect(0); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Index.js index e6c339937..9ff098575 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Index.js @@ -6,6 +6,7 @@ */ var refreshGirdData; var PPId; +var PId = request("PId");//项目Id var bootstrap = function ($, learun) { "use strict"; var page = { @@ -33,7 +34,7 @@ var bootstrap = function ($, learun) { learun.layerForm({ id: 'ProjectDataManageform', title: '新增', - url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/Form?PPId=' + PPId, + url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/Form?PPId=' + PPId + '&PId=' + PId, width: 800, height: 600, callBack: function (id) { @@ -125,6 +126,7 @@ var bootstrap = function ($, learun) { search: function (param) { param = param || {}; param.PPId = PPId; + param.PId = PId; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Form.js index 181f3e26f..97f812dd9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Form.js @@ -6,7 +6,7 @@ */ var acceptClick; var keyValue = request('keyValue'); -var PTId = request("PTId"); +var PTId = request("PTId");//项目类型id var bootstrap = function ($, learun) { "use strict"; var page = { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index.js index d2592c468..dea7f9a8a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index.js @@ -72,6 +72,17 @@ var bootstrap = function ($, learun) { }); //  上传项目资料 $('#lr_data').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'ProjectDataManageIndex', + title: '项目资料管理', + url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/Index?PId=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } }); }, inittree: function () {