diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml
index 8439d9669..15c281c86 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.cshtml	
@@ -23,6 +23,10 @@
         <div class="lr-form-item-title">奖励名称<font face="宋体">*</font></div>
         <input id="EncourgeName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
+        <div class="lr-form-item-title">奖励类型<font face="宋体">*</font></div>
+        <div id="AwardType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
         <div class="lr-form-item-title">奖励原因<font face="宋体">*</font></div>
         <input id="Reason" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -35,5 +39,9 @@
         <div class="lr-form-item-title">奖励日期<font face="宋体">*</font></div>
         <input id="EncourgeDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" isvalid="yes" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy/MM/dd")" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEncourgement/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js
index 3bada9dba..04d37ae6f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Form.js	
@@ -93,13 +93,15 @@ var bootstrap = function ($, learun) {
                 }
 
             });
+            $('#FilePath').lrUploader();
+            $("#AwardType").lrDataItemSelect({ code: 'TLMAwardType' });
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js
index 1960822bb..f7cbe69ad 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js	
@@ -19,12 +19,12 @@ var bootstrap = function ($, learun) {
             });
             // 新增
             $('#lr_add').on('click', function () {
-               learun.layerForm({
+                learun.layerForm({
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/Form',
                     width: 600,
-                    height: 400,
+                    height: 500,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/Form?keyValue=' + keyValue,
                         width: 600,
-                        height: 400,
+                        height: 500,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -50,9 +50,9 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                   learun.layerConfirm('是否确认删除该项！', function (res) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -65,21 +65,33 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left"},
-                    { label: "姓名", name: "StuName", width: 100, align: "left"},
-                    { label: "奖励名称", name: "EncourgeName", width: 100, align: "left"},
-                    { label: "奖励原因", name: "Reason", width: 100, align: "left"},
-                    { label: "奖励金额", name: "Fee", width: 100, align: "left"},
-                    { label: "奖励日期", name: "EncourgeDate", width: 100, align: "left"},
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "奖励名称", name: "EncourgeName", width: 200, align: "left" },
+                    {
+                        label: "奖励类型", name: "AwardType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'TLMAwardType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "奖励原因", name: "Reason", width: 200, align: "left" },
+                    { label: "奖励金额", name: "Fee", width: 100, align: "left" },
+                    { label: "奖励日期", name: "EncourgeDate", width: 100, align: "left" },
                 ],
-                mainId:'ID',
+                mainId: 'ID',
                 isPage: true
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
index cdab5f3d2..26f5ee6ee 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config	
@@ -65,7 +65,7 @@
 
 	<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
 	<!-- ==================注意附件上传地址  修改到部署目录下的Resource要不然飞星会报错================== -->
-	<add key="AnnexesFile" value="E:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
+	<add key="AnnexesFile" value="D:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
 	<!-- ================== 8：流程服务地址 ================== -->
 	<add key="workflowapi" value="http://localhost:8013" />
 	<!--Redis 缓存前缀 -->
@@ -77,11 +77,11 @@
 	<add key="RedisExchangeHosts" value="127.0.0.1:6379,allowadmin=true"/>
 
 	<!--head 头像存储地址 -->
-	<add key="fileHeadImg" value="E:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />
+	<add key="fileHeadImg" value="D:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />
 	<add key="fileAppDTImg" value="C:/fileAppDTImg" />
 	<add key="fileLogoImg" value="C:/fileLogoImg" />
 	<!--印章管理存储图片路径 -->
-	<add key="Stamp" value="E:\授权版706\Learun.Application.Web\Resource/StampImg" />
+	<add key="Stamp" value="D:\授权版706\Learun.Application.Web\Resource/StampImg" />
 	<add key="Intervals" value="1"/>
 
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs
index 2a0bbabc7..609c14f85 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs	
@@ -40,7 +40,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("STUNAME")]
         public string StuName { get; set; }
-        
+
         /// <summary>
         /// 奖励名称
         /// </summary>
@@ -106,6 +106,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("CHECKMARK")]
         public string CheckMark { get; set; }
+        /// <summary>
+        /// 附件路径
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
+        /// <summary>
+        /// 奖励类型
+        /// </summary>
+        [Column("AWARDTYPE")]
+        public string AwardType { get; set; }
+
         #endregion
 
         #region  扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs
index 19ea322af..729330e9f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs	
@@ -38,7 +38,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.EncourgeName,
                 t.Reason,
                 t.Fee,
-                t.EncourgeDate
+                t.EncourgeDate,
+                t.FilePath,
+                t.AwardType
                 ");
                 strSql.Append("  FROM StuEncourgement t ");
                 strSql.Append("  WHERE 1=1 ");