Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Formula.js

@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
             $('#Formula').lrGirdSelect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=FormulaMain',
                 selectWord: 'name',
-                value: 'result',
+                value: 'id',
                 text: 'name',
                 headData:
                     [

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);

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) });
         }
     };

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 = {

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 () {