项目管理调整

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ProjectDataManageController.cs

@@ -47,7 +47,25 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 项目资料查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexView()
+        {
+            return View();
+        }
 
+        /// <summary>
+        /// 项目资料查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/FormView.cshtml

@@ -0,0 +1,35 @@
+@{
+    ViewBag.Title = "项目资料管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">项目<font face="宋体">*</font></div>
+        <div id="PId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">项目阶段<font face="宋体">*</font></div>
+        <div id="PPId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">项目资料名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"  readonly="readonly"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage" id="FilesDiv">
+        <div class="lr-form-item-title">资料文件</div>
+        <div id="Files" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">负责部门</div>
+        <div id="DepartmentId" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">负责人</div>
+        <div id="ManagerId" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ProjectDataManage/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/FormView.js

@@ -0,0 +1,119 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-21 15:49
+ * 描  述：项目资料管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var PPId = request("PPId");//项目阶段id
+var PId = request("PId");//项目Id
+var type = request("type");//项目Id
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#PId').lrselect({
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LogisticsManagement/ProjectManage/GetList',
+                value: "Id",
+                text: "Name",
+            });
+            if (!!PId) {
+                $('#PId').lrselectSet(PId);
+            }
+            $('#PPId').lrselect({
+                type: 'tree',
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LogisticsManagement/ProjectPhaseManage/GetTree',
+                select: function (item) {
+                    if (item != null && item != undefined) {
+
+                    }
+                }
+            });
+            if (!!PPId) {
+                $('#PPId').lrselectSet(PPId);
+            }
+            $('#Files').lrUploader();
+            $('#DepartmentId').lrDataSourceSelect({
+                code: 'classdata',
+                value: 'id',
+                text: 'name',
+                select: function (item) {
+                    var DeptCode = $('#DepartmentId').lrselectGet();
+                    if (DeptCode != null && DeptCode != "" && DeptCode != undefined) {
+                        $('#ManagerId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=BaseUser',
+                            value: 'f_userid',
+                            text: 'f_realname',
+                            param: { strWhere: " 1=1 and f_departmentid in ('" + DeptCode + "')" },
+                            maxHeight: 200,
+                        });
+                    }
+                }
+            });
+            $('#ManagerId').lrselect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=BaseUser',
+                value: 'f_userid',
+                text: 'f_realname',
+                param: { strWhere: " 1=2 " },
+                maxHeight: 200,
+            });
+            
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+
+                });
+            }
+        }
+    };
+    //// 保存数据
+    //acceptClick = function (callBack) {
+    //    if (!$('body').lrValidform()) {
+    //        return false;
+    //    }
+    //    var postData = {
+    //        strEntity: JSON.stringify($('body').lrGetFormData())
+    //    };
+    //    if (type == 2) {
+    //        $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/SaveData?keyValue=' + keyValue, postData, function (res) {
+    //            // 保存成功后才回调
+    //            if (!!callBack) {
+    //                callBack();
+    //            }
+    //        });
+    //    } else {
+    //        $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+    //            // 保存成功后才回调
+    //            if (!!callBack) {
+    //                callBack();
+    //            }
+    //        });
+    //    }
+    //};
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/IndexData.cshtml

@@ -43,6 +43,7 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_data" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 上传项目资料</a>
+                        <a id="lr_dataview" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 查看项目资料</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/IndexData.js

@@ -29,6 +29,10 @@ var bootstrap = function ($, learun) {
             $('#lr_data').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 1) {
+                        return learun.alert.warning('只有进行中状态才可以上传！');
+                    }
                     learun.layerForm({
                         id: 'ProjectDataManageIndex',
                         title: '项目资料管理',
@@ -42,6 +46,21 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            //查看项目资料
+            $('#lr_dataview').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'ProjectDataManageIndex',
+                        title: '项目资料查看',
+                        url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/IndexView?PId=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                        
+                    });
+                }
+            });
         },
         inittree: function () {
             // 初始化左侧树形数据
@@ -175,7 +194,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.PTId = PTId;
-            param.SqlParameter = " and [Status]=1";
+            //param.SqlParameter = " and [Status]=1";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/IndexView.cshtml

@@ -0,0 +1,53 @@
+@{
+                /**/
+
+                ViewBag.Title = "项目资料管理";
+                Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title lrlt ">阶段</div>
+            <div id="dataTree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap  ">
+            <div class="lr-layout-title">
+                <span id="titleinfo" class="lrlt">未选择阶段</span> - <span class="lrlt">列表信息</span>
+            </div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">资料名称</div>
+                                    <input id="Name" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">负责部门</div>
+                                    <div id="DepartmentId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">负责人</div>
+                                    <div id="ManagerId"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ProjectDataManage/IndexView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/IndexView.js

@@ -0,0 +1,121 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-21 15:49
+ * 描  述：项目资料管理
+ */
+var refreshGirdData;
+var acceptClick;
+var PPId;
+var PId = request("PId");//项目Id
+var type = request("type");//type==2,上传项目资料
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.inittree();
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#DepartmentId').lrDepartmentSelect();
+            $('#ManagerId').lrUserSelect(0);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+            // 编辑
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'ProjectDataManageform',
+                        title: '查看',
+                        url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/FormView?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
+        },
+        inittree: function () {
+            // 初始化左侧树形数据
+            $('#dataTree').lrtree({
+                url: top.$.rootUrl + '/LogisticsManagement/ProjectPhaseManage/GetTree',
+                nodeClick: page.treeNodeClick
+            });
+        },
+        treeNodeClick: function (item) {
+            PPId = item.id;
+            $('#titleinfo').text(item.text);
+            page.search();
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/GetPageList',
+                headData: [
+                    { label: "项目资料名称", name: "Name", width: 200, align: "left" },
+                    {
+                        label: "负责部门", name: "DepartmentId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "负责人", name: "ManagerId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "是否上传", name: "FileStatus", width: 130, align: "left",
+                        formatter: function (value) {
+                            return value == '1' ? '<span class=\"label label-success\">是</span>' : '<span class=\"label label-warning\">否</span>';
+                        }
+                    },
+                    { label: "上传时间", name: "FileTime", width: 130, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.PPId = PPId;
+            param.PId = PId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!!callBack) {
+            callBack();
+        }
+        learun.layerClose(window.name);
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index.cshtml

@@ -50,6 +50,7 @@
                         <a id="lr_data" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 设置上传项目资料</a>
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 审核</a>
                         <a id="lr_nosubmit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 去审</a>
+                        <a id="lr_file" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 归档</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index.js

@@ -104,6 +104,19 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 归档，将状态改为2
+            $('#lr_file').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认归档该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/LogisticsManagement/ProjectManage/UpdateStatus', { keyValue: keyValue, Status: 2 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             
             //设置上传项目资料
             $('#lr_data').on('click', function () {
@@ -175,7 +188,7 @@ var bootstrap = function ($, learun) {
                             } else if (value == 1) {
                                 return '<span class=\"label label-warning\">进行中</span>';
                             } else if (value == 2) {
-                                return '<span class=\"label label-success\">完成</span>';
+                                return '<span class=\"label label-success\">已完成</span>';
                             }
                         }
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectProcessManage/IndexData.js

@@ -29,6 +29,10 @@ var bootstrap = function ($, learun) {
             $('#lr_data').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 1) {
+                        return learun.alert.warning('只有进行中状态才可填写！');
+                    }
                     learun.layerForm({
                         id: 'ProjectDataManageIndex',
                         title: '项目进展情况管理',

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1207,7 +1207,9 @@
     <Content Include="Areas\LogisticsManagement\Views\APAppointmentPsychologist\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\FormView.js" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\IndexView.js" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\IndexData.js" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Form.js" />
@@ -7366,6 +7368,8 @@
     <Content Include="Areas\LR_Desktop\Views\QualityReport\FormView.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\IndexData.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectProcessManage\IndexData.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\IndexView.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\FormView.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ProjectDataManage/ProjectDataManageService.cs

@@ -197,18 +197,18 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 {
                     entity.Modify(keyValue);
                     db.Update(entity);
-                    if (!string.IsNullOrEmpty(entity.Files))
-                    {
-                        //判断当前项目各阶段是否已全部上传
-                        var list = db.FindList<ProjectDataManageEntity>(x => x.PId == entity.PId && !string.IsNullOrEmpty(x.Files) && x.Id != keyValue);
-                        if (list.Count() <= 0)
-                        {
-                            //如果全部已上传，将项目状态改为已完成
-                            var projectManageEntity = db.FindEntity<ProjectManageEntity>(x => x.Id == entity.PId);
-                            projectManageEntity.Status = "2";
-                            db.Update(projectManageEntity);
-                        }
-                    }
+                    //if (!string.IsNullOrEmpty(entity.Files))
+                    //{
+                    //    //判断当前项目各阶段是否已全部上传
+                    //    var list = db.FindList<ProjectDataManageEntity>(x => x.PId == entity.PId && !string.IsNullOrEmpty(x.Files) && x.Id != keyValue);
+                    //    if (list.Count() <= 0)
+                    //    {
+                    //        //如果全部已上传，将项目状态改为已完成
+                    //        var projectManageEntity = db.FindEntity<ProjectManageEntity>(x => x.Id == entity.PId);
+                    //        projectManageEntity.Status = "2";
+                    //        db.Update(projectManageEntity);
+                    //    }
+                    //}
 
                 }
                 else