已完成项目、未完成的项目

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/SRProjectBasicController.cs

@@ -46,7 +46,34 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
         {
             return View();
         }
-
+        /// <summary>
+        /// 已完成的项目
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexCompleted()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 未完成的项目
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexNoCompleted()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 修改进度
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormNoCompleted()
+        {
+            return View();
+        }
+        
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/SRProjectBasic/FormNoCompleted.cshtml

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "项目基本信息管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item"  data-table="SRProjectBasic" >
+        <div class="lr-form-item-title">项目编号</div>
+        <input id="EnCode" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SRProjectBasic" >
+        <div class="lr-form-item-title">项目名称</div>
+        <input id="Name" type="text" class="form-control"  readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SRProjectBasic" >
+        <div class="lr-form-item-title">项目进度(%)</div>
+        <input id="Progress" type="number" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectBasic/FormNoCompleted.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/SRProjectBasic/FormNoCompleted.js

@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-15 15:53
+ * 描  述：项目基本信息管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+           
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/SRProjectBasic/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())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/CustomFunction/SRProjectBasic/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/SRProjectBasic/IndexCompleted.cshtml

@@ -0,0 +1,50 @@
+@{
+    ViewBag.Title = "项目基本信息管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <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="EnCode" type="text" class="form-control" />
+                                </div>
+                                <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="Type"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">项目级别</div>
+                                    <div id="Lev"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">立项组织</div>
+                                    <div id="ProjectOrganization"></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_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectBasic/IndexCompleted.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/SRProjectBasic/IndexCompleted.js

@@ -0,0 +1,89 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-15 15:53
+ * 描  述：项目基本信息管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 320, 400);
+            $('#Type').lrDataItemSelect({ code: 'ProjectType_ZZ' });
+            $('#Lev').lrDataItemSelect({ code: 'ProjectLev_ZZ' });
+            $('#ProjectOrganization').lrDataItemSelect({ code: 'ProjectOrganization_ZZ' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CustomFunction/SRProjectBasic/GetPageList',
+                headData: [
+                    { label: "项目编号", name: "EnCode", width: 100, align: "left"},
+                    { label: "项目名称", name: "Name", width: 100, align: "left"},
+                    { label: "项目类型", name: "Type", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'ProjectType_ZZ',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "项目级别", name: "Lev", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'ProjectLev_ZZ',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "立项组织", name: "ProjectOrganization", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'ProjectOrganization_ZZ',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "项目总经费", name: "CostSum", width: 100, align: "left"},
+                    { label: "开始时间", name: "StartTime", width: 100, align: "left"},
+                    { label: "结束时间", name: "EndTime", width: 100, align: "left"},
+                    { label: "项目来源", name: "Source", width: 100, align: "left"},
+                    { label: "项目合同号", name: "ContractNo", width: 100, align: "left"},
+                ],
+                mainId:'ID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = ' and Progress=100 ';
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/SRProjectBasic/IndexNoCompleted.cshtml

@@ -0,0 +1,51 @@
+@{
+    ViewBag.Title = "项目基本信息管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <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="EnCode" type="text" class="form-control" />
+                                </div>
+                                <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="Type"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">项目级别</div>
+                                    <div id="Lev"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">立项组织</div>
+                                    <div id="ProjectOrganization"></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_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改进度</a> 
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectBasic/IndexNoCompleted.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/SRProjectBasic/IndexNoCompleted.js

@@ -0,0 +1,134 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-15 15:53
+ * 描  述：项目基本信息管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 320, 400);
+            $('#Type').lrDataItemSelect({ code: 'ProjectType_ZZ' });
+            $('#Lev').lrDataItemSelect({ code: 'ProjectLev_ZZ' });
+            $('#ProjectOrganization').lrDataItemSelect({ code: 'ProjectOrganization_ZZ' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/SRProjectBasic/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑项目进度
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/CustomFunction/SRProjectBasic/FormNoCompleted?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/SRProjectBasic/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CustomFunction/SRProjectBasic/GetPageList',
+                headData: [
+                    { label: "项目编号", name: "EnCode", width: 100, align: "left"},
+                    { label: "项目名称", name: "Name", width: 100, align: "left"},
+                    { label: "项目类型", name: "Type", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'ProjectType_ZZ',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "项目级别", name: "Lev", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'ProjectLev_ZZ',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "立项组织", name: "ProjectOrganization", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'ProjectOrganization_ZZ',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }
+                    },
+
+                    { label: "项目总经费", name: "CostSum", width: 100, align: "left"},
+                    { label: "开始时间", name: "StartTime", width: 100, align: "left"},
+                    { label: "结束时间", name: "EndTime", width: 100, align: "left" },
+                    { label: "项目进度(%)", name: "Progress", width: 100, align: "left" },
+                    { label: "项目来源", name: "Source", width: 100, align: "left"},
+                    { label: "项目合同号", name: "ContractNo", width: 100, align: "left"},
+                ],
+                mainId:'ID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = ' and (Progress is null or Progress<>100) ';
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -939,6 +939,9 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Index.js" />
     <Content Include="Areas\CustomFunction\Views\SRProjectAchievement\IndexYJ.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectBasic\FormNoCompleted.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectBasic\IndexNoCompleted.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectBasic\IndexCompleted.js" />
     <Content Include="Areas\CustomFunction\Views\SRProjectBasic\IndexTJ.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeLessonSync\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeLessonSync\Index.js" />
@@ -7348,6 +7351,9 @@
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\PrintSpecial.cshtml" />
     <Content Include="Areas\CustomFunction\Views\SRProjectBasic\IndexTJ.cshtml" />
     <Content Include="Areas\CustomFunction\Views\SRProjectAchievement\IndexYJ.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectBasic\IndexCompleted.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectBasic\IndexNoCompleted.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectBasic\FormNoCompleted.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectBasic/SRProjectBasicEntity.cs

@@ -80,6 +80,11 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         [Column("PDESC")]
         public string PDesc { get; set; }
         /// <summary>
+        /// 项目进度
+        /// </summary>
+        [Column("PROGRESS")]
+        public int? Progress { get; set; }
+        /// <summary>
         /// 创建人
         /// </summary>
         [Column("CREATEUSERID")]
@@ -117,6 +122,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             this.ID = keyValue;
         }
         #endregion
+
         #region 扩展字段
         [NotMapped]
         public string ManageName { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectBasic/SRProjectBasicService.cs

@@ -42,7 +42,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 t.StartTime,
                 t.EndTime,
                 t.Source,
-                t.ContractNo
+                t.ContractNo,t.Progress
                 ");
                 strSql.Append("  FROM SRProjectBasic t ");
                 strSql.Append("  WHERE 1=1 ");
@@ -61,20 +61,25 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 }
                 if (!queryParam["Type"].IsEmpty())
                 {
-                    dp.Add("Type",queryParam["Type"].ToString(), DbType.String);
+                    dp.Add("Type", queryParam["Type"].ToString(), DbType.String);
                     strSql.Append(" AND t.Type = @Type ");
                 }
                 if (!queryParam["Lev"].IsEmpty())
                 {
-                    dp.Add("Lev",queryParam["Lev"].ToString(), DbType.String);
+                    dp.Add("Lev", queryParam["Lev"].ToString(), DbType.String);
                     strSql.Append(" AND t.Lev = @Lev ");
                 }
                 if (!queryParam["ProjectOrganization"].IsEmpty())
                 {
-                    dp.Add("ProjectOrganization",queryParam["ProjectOrganization"].ToString(), DbType.String);
+                    dp.Add("ProjectOrganization", queryParam["ProjectOrganization"].ToString(), DbType.String);
                     strSql.Append(" AND t.ProjectOrganization = @ProjectOrganization ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<SRProjectBasicEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["SqlParameter"].IsEmpty())
+                {
+                    strSql.Append(queryParam["SqlParameter"].ToString());
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<SRProjectBasicEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -219,7 +224,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<SRProjectBasicEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<SRProjectBasicEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1631692860" Name="Physical Data Model 1" Objects="3609" Symbols="407" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1632382299" Name="Physical Data Model 1" Objects="3596" Symbols="405" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -53142,7 +53142,7 @@ B9AF
 <a:Code>SRProjectBasic</a:Code>
 <a:CreationDate>1584686845</a:CreationDate>
 <a:Creator>edy</a:Creator>
-<a:ModificationDate>1631679132</a:ModificationDate>
+<a:ModificationDate>1632382299</a:ModificationDate>
 <a:Modifier>edy</a:Modifier>
 <a:Comment>项目基本信息管理</a:Comment>
 <a:TotalSavingCurrency/>
@@ -53336,9 +53336,20 @@ B9AF
 <a:Modifier>edy</a:Modifier>
 <a:DataType>datetime</a:DataType>
 </o:Column>
+<o:Column Id="o3513">
+<a:ObjectID>53548D55-92AF-453D-98DE-1FC66308A94D</a:ObjectID>
+<a:Name>Progress</a:Name>
+<a:Code>Progress</a:Code>
+<a:CreationDate>1632382045</a:CreationDate>
+<a:Creator>edy</a:Creator>
+<a:ModificationDate>1632382299</a:ModificationDate>
+<a:Modifier>edy</a:Modifier>
+<a:Comment>项目进度%</a:Comment>
+<a:DataType>int</a:DataType>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o3513">
+<o:Key Id="o3514">
 <a:ObjectID>21FBD03F-50A7-48C6-809D-D95DD9006EDC</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -53352,10 +53363,10 @@ B9AF
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o3513"/>
+<o:Key Ref="o3514"/>
 </c:PrimaryKey>
 <c:ClusterObject>
-<o:Key Ref="o3513"/>
+<o:Key Ref="o3514"/>
 </c:ClusterObject>
 </o:Table>
 <o:Table Id="o668">
@@ -53369,7 +53380,7 @@ B9AF
 <a:Comment>项目人员管理</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o3514">
+<o:Column Id="o3515">
 <a:ObjectID>3BF9BB4E-E838-44FE-B792-5DDF7AB4A218</a:ObjectID>
 <a:Name>ID</a:Name>
 <a:Code>ID</a:Code>
@@ -53381,7 +53392,7 @@ B9AF
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o3515">
+<o:Column Id="o3516">
 <a:ObjectID>6EBBBD89-14E0-4AFC-A465-A5905EE5A642</a:ObjectID>
 <a:Name>SRProjectBasicId</a:Name>
 <a:Code>SRProjectBasicId</a:Code>
@@ -53393,7 +53404,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3516">
+<o:Column Id="o3517">
 <a:ObjectID>4439D426-80D1-4EF6-9F18-40B460A673FE</a:ObjectID>
 <a:Name>ManageName</a:Name>
 <a:Code>ManageName</a:Code>
@@ -53405,7 +53416,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3517">
+<o:Column Id="o3518">
 <a:ObjectID>4796F026-118C-4370-ACE9-22898B9BB847</a:ObjectID>
 <a:Name>Players</a:Name>
 <a:Code>Players</a:Code>
@@ -53417,7 +53428,7 @@ B9AF
 <a:DataType>nvarchar(500)</a:DataType>
 <a:Length>500</a:Length>
 </o:Column>
-<o:Column Id="o3518">
+<o:Column Id="o3519">
 <a:ObjectID>3454FD0E-88E0-4706-940B-21DC0909F5D5</a:ObjectID>
 <a:Name>CreateUserId</a:Name>
 <a:Code>CreateUserId</a:Code>
@@ -53429,7 +53440,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3519">
+<o:Column Id="o3520">
 <a:ObjectID>BA1BE91B-E7E2-45C1-8750-88CDDF80A506</a:ObjectID>
 <a:Name>CreateUserName</a:Name>
 <a:Code>CreateUserName</a:Code>
@@ -53441,7 +53452,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3520">
+<o:Column Id="o3521">
 <a:ObjectID>A9049D1E-1351-477C-B63C-33CBB51BE877</a:ObjectID>
 <a:Name>CreateTime</a:Name>
 <a:Code>CreateTime</a:Code>
@@ -53453,7 +53464,7 @@ B9AF
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o3521">
+<o:Key Id="o3522">
 <a:ObjectID>5479F52C-C942-46AB-8DBA-F9FFCD9D7C40</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -53462,15 +53473,15 @@ B9AF
 <a:ModificationDate>1631690604</a:ModificationDate>
 <a:Modifier>edy</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o3514"/>
+<o:Column Ref="o3515"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o3521"/>
+<o:Key Ref="o3522"/>
 </c:PrimaryKey>
 <c:ClusterObject>
-<o:Key Ref="o3521"/>
+<o:Key Ref="o3522"/>
 </c:ClusterObject>
 </o:Table>
 <o:Table Id="o670">
@@ -53484,7 +53495,7 @@ B9AF
 <a:Comment>项目成果管理</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o3522">
+<o:Column Id="o3523">
 <a:ObjectID>AE255663-1B18-4FBC-BEFB-3FFDAC61B5DB</a:ObjectID>
 <a:Name>ID</a:Name>
 <a:Code>ID</a:Code>
@@ -53496,7 +53507,7 @@ B9AF
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o3523">
+<o:Column Id="o3524">
 <a:ObjectID>9FA988C2-B264-4D8F-A0B8-17172F53D958</a:ObjectID>
 <a:Name>SRProjectBasicId</a:Name>
 <a:Code>SRProjectBasicId</a:Code>
@@ -53508,7 +53519,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3524">
+<o:Column Id="o3525">
 <a:ObjectID>F1DF1EEC-F591-448A-A11E-280D0E1731B9</a:ObjectID>
 <a:Name>ManageName</a:Name>
 <a:Code>ManageName</a:Code>
@@ -53520,7 +53531,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3525">
+<o:Column Id="o3526">
 <a:ObjectID>D54F57C5-4827-4C66-9AF8-BDB663B9353E</a:ObjectID>
 <a:Name>Name</a:Name>
 <a:Code>Name</a:Code>
@@ -53532,7 +53543,7 @@ B9AF
 <a:DataType>nvarchar(200)</a:DataType>
 <a:Length>200</a:Length>
 </o:Column>
-<o:Column Id="o3526">
+<o:Column Id="o3527">
 <a:ObjectID>52951284-D68E-4461-B22F-F948DAE3E62D</a:ObjectID>
 <a:Name>Url</a:Name>
 <a:Code>Url</a:Code>
@@ -53544,7 +53555,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3527">
+<o:Column Id="o3528">
 <a:ObjectID>61E9E683-AF34-4B46-B337-700997AEEA07</a:ObjectID>
 <a:Name>CreateUserId</a:Name>
 <a:Code>CreateUserId</a:Code>
@@ -53556,7 +53567,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3528">
+<o:Column Id="o3529">
 <a:ObjectID>947F14E5-80DF-4918-A030-424F8D159E69</a:ObjectID>
 <a:Name>CreateUserName</a:Name>
 <a:Code>CreateUserName</a:Code>
@@ -53568,7 +53579,7 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o3529">
+<o:Column Id="o3530">
 <a:ObjectID>574EB7AA-6552-4DD8-98E9-C24134A62E1B</a:ObjectID>
 <a:Name>CreateTime</a:Name>
 <a:Code>CreateTime</a:Code>
@@ -53580,7 +53591,7 @@ B9AF
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o3530">
+<o:Key Id="o3531">
 <a:ObjectID>4D78F5DB-A528-420D-8183-17C62D92BA8F</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -53589,15 +53600,15 @@ B9AF
 <a:ModificationDate>1631690874</a:ModificationDate>
 <a:Modifier>edy</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o3522"/>
+<o:Column Ref="o3523"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o3530"/>
+<o:Key Ref="o3531"/>
 </c:PrimaryKey>
 <c:ClusterObject>
-<o:Key Ref="o3530"/>
+<o:Key Ref="o3531"/>
 </c:ClusterObject>
 </o:Table>
 </c:Tables>
@@ -53622,7 +53633,7 @@ B9AF
 <o:Key Ref="o835"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3531">
+<o:ReferenceJoin Id="o3532">
 <a:ObjectID>81527A47-E565-49C2-AAA7-F0555E81CE72</a:ObjectID>
 <a:CreationDate>1553245426</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -53657,7 +53668,7 @@ B9AF
 <o:Key Ref="o846"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3532">
+<o:ReferenceJoin Id="o3533">
 <a:ObjectID>A3225D9D-069C-4A67-ABF0-43DC2FA55CF0</a:ObjectID>
 <a:CreationDate>1553247802</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -53691,7 +53702,7 @@ B9AF
 <o:Key Ref="o745"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3533">
+<o:ReferenceJoin Id="o3534">
 <a:ObjectID>B458081F-CEE1-4251-9E7A-5E9CC93519D5</a:ObjectID>
 <a:CreationDate>1553248376</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -53726,7 +53737,7 @@ B9AF
 <o:Key Ref="o824"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3534">
+<o:ReferenceJoin Id="o3535">
 <a:ObjectID>8397C4F6-A728-4D3F-B2F8-FAC56886462B</a:ObjectID>
 <a:CreationDate>1553248622</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -53760,7 +53771,7 @@ B9AF
 <o:Key Ref="o884"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3535">
+<o:ReferenceJoin Id="o3536">
 <a:ObjectID>2F8BC700-F31E-41CC-9DA8-9505EAC5DA85</a:ObjectID>
 <a:CreationDate>1553483161</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -53794,7 +53805,7 @@ B9AF
 <o:Key Ref="o929"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3536">
+<o:ReferenceJoin Id="o3537">
 <a:ObjectID>0E2D2049-564F-4247-9F5B-B0AA82F9BE96</a:ObjectID>
 <a:CreationDate>1555404296</a:CreationDate>
 <a:Creator>admin</a:Creator>
@@ -53811,7 +53822,7 @@ B9AF
 </o:Reference>
 </c:References>
 <c:DefaultGroups>
-<o:Group Id="o3537">
+<o:Group Id="o3538">
 <a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -54074,7 +54085,7 @@ B9AF
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o3538">
+<o:TargetModel Id="o3539">
 <a:ObjectID>B1BAD530-6C69-4A9D-BD41-F62F564CA348</a:ObjectID>
 <a:Name>Microsoft SQL Server 2008</a:Name>
 <a:Code>MSSQLSRV2008</a:Code>