新闻展示,项目进展情况显示创建人,富文本框

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsForm.js

@@ -111,11 +111,11 @@ var bootstrap = function ($, learun) {
                 param: {}
             });
             $('#AOStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
-            
+
             $('#Ass_AssetsOutItemApply').jfGrid({
                 headData: [
                     {
-                        label: '资产编号', name: 'AOICode', width: 150, align: 'left'
+                        label: '资产编号', name: 'AOICode', width: 200, align: 'left'
                     },
                     {
                         label: '资产名称', name: 'AOIName', width: 150, align: 'left'
@@ -199,6 +199,7 @@ var bootstrap = function ($, learun) {
             } else {
                 $("#AOCode").val(NewAOCode);
             }
+
         }
     };
     refreshGirdData = function (temprow) {
@@ -207,7 +208,6 @@ var bootstrap = function ($, learun) {
         $.each(temprow,
             function (i, item) {
                 var entity = {
-                    //AOICode: item.AICode,
                     AOICode: item.AICodeNumJY,
                     AOIName: item.AIASSName,
                     AOISpecification: item.AISpecification,
@@ -228,7 +228,6 @@ var bootstrap = function ($, learun) {
             function (j, item2) {
                 $.each(tempdatra,
                     function (key, val) {
-
                         if (tempdatra[key].AOICode === item2.AOICode) {
                             tempdatra[key] = item2;
                             ifnewrow = false;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsIndex.js

@@ -130,7 +130,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutItemApply/DeleteForm', { keyValue: keyValue }, function () {
+                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -149,7 +149,7 @@ var bootstrap = function ($, learun) {
                     learun.layerConfirm('是否确认提交该项！', function (res) {
                         if (res) {
                             processId = learun.newGuid();
-                            learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutItemApply/ChangeStatusById', { keyValue: keyValue, processId: processId }, function (res) {
+                            learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/ChangeStatusById', { keyValue: keyValue, processId: processId }, function (res) {
                                 refreshGirdData(res, {});
                             });
                         }
@@ -184,7 +184,6 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/GetPageList',
                 headData: [
-                    { label: "调拨单流水号", name: "AOCode", width: 200, align: "left" },
                     { label: "调拨总价", name: "AOPrice", width: 100, align: "left" },
                     //{
                     //    label: "出库原因", name: "AOReasonType", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolNews/Form.cshtml

@@ -44,6 +44,20 @@
         <div class="lr-form-item-title">标题图片</div>
         <div id="F_NewsImage"  ></div>
     </div>
+    <style>
+        #editor {
+            height: 400px;
+            overflow: auto;
+            position: relative  
+        }
+        #edui1 {
+            padding-top: 80px
+        }
+        #edui1_toolbarbox {
+            position: absolute !important;
+            top:0
+        }
+    </style>
     <div class="col-xs-12 lr-form-item"  data-table="LR_OA_SchoolNews" >
         <div class="lr-form-item-title">内容</div>
         <div id="editor" style="height:300px;"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolNews/Form.js

@@ -29,6 +29,8 @@ var bootstrap = function ($, learun) {
             $('#F_SendPostId').lrPostSelect({ type: 'treemultiple' });
             //内容编辑器
             ue = UE.getEditor('editor');
+            
+
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -15,6 +15,10 @@
         <div class="lr-form-item-title">项目周期</div>
         <input id="Period" type="text" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ProjectManage" > 
+        <div class="lr-form-item-title">项目费用</div> 
+        <input id="ItemAmount" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" /> 
+    </div> 
     <div class="col-xs-12 lr-form-item" data-table="ProjectManage">
         <div class="lr-form-item-title">负责部门</div>
         <div id="DepartmentId"></div>

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

@@ -17,6 +17,7 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+           // $('#CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -60,7 +61,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/ProjectProcessManage/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/ProjectProcessManage/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -77,10 +78,24 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LogisticsManagement/ProjectProcessManage/GetPageList',
                 headData: [
-                    { label: "项目进展情况", name: "Progress", width: 100, align: "left"},
-                    { label: "时间", name: "ProcessTime", width: 100, align: "left"},
+                    { label: "项目进展情况", name: "Progress", width: 100, align: "left" },
+                    { label: "时间", name: "ProcessTime", width: 100, align: "left" },
+                    {
+                        label: "申请人", name: "CreateUserId", 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: "CreateTime", width: 200, align: "left",
+                    }
                 ],
-                mainId:'Id',
+                mainId: 'Id',
                 isPage: true
             });
             page.search();
@@ -101,7 +116,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.PPId = PPId;
             param.PId = PId;
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

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

@@ -130,6 +130,23 @@ var bootstrap = function ($, learun) {
                                         formatter: function (value) {
                                             return learun.formatDate(value, 'yyyy-MM-dd');
                                         }
+                                    },
+                                    {
+                                        label: "申请人", name: "CreateUserId", 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: "CreateTime", width: 200, align: "left" ,
+                                        //formatter: function (value) {
+                                        //    return learun.formatDate(value, 'yyyy-MM-dd');
+                                        //}
                                     }
                                 ],
                                 mainId: 'Id',

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/news/css/common.css

@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "utf-8";
 /* CSS Document */
 body,html{
 	font-size:12px;
@@ -60,4 +60,6 @@ a,img{border:0;}
 a{outline:none !important;}
 
 img{border:0 none;}
+.listDotBox img {
 
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml

@@ -13,7 +13,7 @@
     }
 </style>
 <!--  / warpper  -->
-<div class="warpper" style="margin-top: 50px;">
+<div class="warpper" style="margin-top: 50px; width: 60%;margin:0 auto">
     <!--  / list_sec1  -->
     <div class="list_sec list_sec1">
         <div class="index_box">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ProjectManage/ProjectManageEntity.cs

@@ -64,6 +64,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         [Column("CREATEUSERID")]
         public string CreateUserId { get; set; }
+        /// <summary>
+        /// 项目费用
+        /// </summary>
+        [Column("ITEMAMOUNT")]
+        public decimal? ItemAmount { get; set; }
+        
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ProjectProcessManage/ProjectProcessManageService.cs

@@ -31,11 +31,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.Progress,
-                t.ProcessTime
-                ");
+                strSql.Append(@" * ");
                 strSql.Append("  FROM ProjectProcessManage t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -83,9 +79,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"
-                t.Id,
-                t.Progress,
-                t.ProcessTime
+                t.*
                 ");
                 strSql.Append("  FROM ProjectProcessManage t ");
                 strSql.Append("  WHERE 1=1 ");