调整失物招领，在册资产明细加资产分类

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml

@@ -9,9 +9,9 @@
         <input id="AICode" hidden="hidden" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">序号</div>
-        <input id="AICodeNum" type="text" class="form-control" />
-    </div>*@
+            <div class="lr-form-item-title">序号</div>
+            <input id="AICodeNum" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产编号</div>
         <input id="AICodeNumJY" type="text" class="form-control" />
@@ -22,12 +22,16 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">房间号</div>
-        <div id="AIIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
+        <div id="AIIStoragePosition"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产名称</div>
         <input id="AIASSName" type="text" class="form-control" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+        <div class="lr-form-item-title">资产分类</div>
+        <div id="AIASSClass"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产规格</div>
         <input id="AISpecification" type="text" class="form-control" />
@@ -149,10 +153,7 @@
                 <div class="lr-form-item-title">报废提示时间<font face="宋体">*</font></div>
                 <div id="ScrapRemindTime"> </div>
             </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">资产分类</div>
-            <div id="AIASSClass"></div>
-        </div>
+
         <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
             <div class="lr-form-item-title">增加方式</div>
             <div id="AIAddType"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml

@@ -16,13 +16,13 @@
         <div class="lr-form-item-title">明细编号<font face="宋体">*</font></div>
         <input id="AICode" hidden="hidden" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-
     @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">序号<font face="宋体">*</font></div>
-        <input id="AICodeNum" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>*@
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">序号<font face="宋体">*</font></div>
+            <input id="AICodeNum" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+        </div>*@
+
     <img id="photo" />
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title" readonly="readonly">资产编号</div>
@@ -47,6 +47,12 @@
         <div class="lr-form-item-title">资产名称</div>
         <input id="AIASSName" readonly="readonly" type="text" class="form-control" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+        <div class="lr-form-item-title">资产分类</div>
+        <div id="AIASSClass"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产规格</div>
         <input id="AISpecification" readonly="readonly" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml

@@ -15,7 +15,7 @@
 <div class="lr-layout lr-layout-left-center ">
     <div class="lr-layout-left">
         <div class="lr-layout-wrap">
-            <div class="lr-layout-title lrlt ">资产属性</div>
+            <div class="lr-layout-title lrlt ">资产分类</div>
             <div id="dataTree" class="lr-layout-body"></div>
         </div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Form.cshtml

@@ -5,19 +5,24 @@
 
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="OANews">
-        <div class="lr-form-item-title">公告标题<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">标题<font face="宋体">*</font></div>
         <input id="F_FullHead" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请输入标题" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">发布时间<font face="宋体">*</font></div>
         <input id="F_ReleaseTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd HH:mm' })" isvalid="yes" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy/MM/dd HH:mm")" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="OANews">
+        <div class="lr-form-item-title">捡拾人<font face="宋体">*</font></div>
+        <input id="F_Picker" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请输入捡拾人" />
+    </div>
+    
     <div class="col-xs-12 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">标题图片</div>
         <div id="F_Image"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="OANews">
-        <div class="lr-form-item-title">公告内容</div>
+        <div class="lr-form-item-title">内容</div>
         <div id="editor" style="height:300px;"></div>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Index.js

@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
             $('#lr_add').on('click', function () {
                 learun.layerForm({
                     id: 'form',
-                    title: '添加公告',
+                    title: '添加',
                     url: top.$.rootUrl + '/LR_OAModule/LostArticleInfo/Form',
                     width: 1000,
                     height: 650,
@@ -62,7 +62,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerForm({
                         id: 'formedit',
-                        title: '编辑公告',
+                        title: '编辑',
                         url: top.$.rootUrl + '/LR_OAModule/LostArticleInfo/Form?keyValue=' + keyValue,
                         width: 1000,
                         height: 650,
@@ -188,15 +188,18 @@ var bootstrap = function ($, learun) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm');
                         }
                     },
+                    { label: '拾捡人', name: 'F_Picker', index: 'F_Picker', width: 100, align: 'left' },
                     {
                         label: "状态", name: "F_State", index: "F_State", width: 140, align: "left",
                         formatter: function(cellvalue) {
                             if (cellvalue == 0)
                                 return "<span class=\"label label-default\">草稿</span>";
                             else if (cellvalue == 1)
-                                return "<span class=\"label label-success\">已发布</span>";
-                            else if (cellvalue == 3)
-                                return "<span class=\"label label-warning\">已撤下</span>";
+                                return "<span class=\"label label-warning\">待认领</span>";
+                            else if (cellvalue == 2)
+                                return "<span class=\"label label-success\">已认领</span>";
+                            //else if (cellvalue == 3)
+                            //    return "<span class=\"label label-warning\">已撤下</span>";
                         }
         },
                     //{ label: "创建时间", name: "F_CreateTime", index: "F_CreateDate", width: 130, align: 'left' }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs

@@ -51,6 +51,11 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         public ActionResult GetList(string keyword)
         {
             var data = companyIBLL.GetList(keyword);
+            foreach (var item in data)
+            {
+                item.F_BriefIntroduction = WebHelper.HtmlDecode(item.F_BriefIntroduction);
+                item.F_EnrollmentInformation = WebHelper.HtmlDecode(item.F_EnrollmentInformation);
+            }
             return JsonResult(data);
         }
         /// <summary>
@@ -104,6 +109,8 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         public ActionResult SaveForm(string keyValue, CompanyEntity entity)
         {
             entity.SyncFlag = false;
+            entity.F_BriefIntroduction = WebHelper.HtmlEncode(entity.F_BriefIntroduction);
+            entity.F_EnrollmentInformation = WebHelper.HtmlEncode(entity.F_EnrollmentInformation);
             var list = companyIBLL.GetList();
             if (!string.IsNullOrEmpty(keyValue))
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js

@@ -10,6 +10,8 @@ var acceptClick;
 var keyValue = '';
 var bootstrap = function ($, learun) {
     "use strict";
+    var F_BriefIntroductionUE;
+    var F_EnrollmentInformationUE;
     var selectedRow = learun.frameTab.currentIframe().selectedRow;
     var page = {
         init: function () {
@@ -24,15 +26,29 @@ var bootstrap = function ($, learun) {
             // 省市区
             $('#area').lrAreaSelect();
             $('#F_Photo').lrUploader();
-            var F_BriefIntroductionUE = UE.getEditor('F_BriefIntroduction');
+            F_BriefIntroductionUE = UE.getEditor('F_BriefIntroduction');
             $('#F_BriefIntroduction')[0].ue = F_BriefIntroductionUE;
-            var F_EnrollmentInformationUE = UE.getEditor('F_EnrollmentInformation');
+            
+            F_EnrollmentInformationUE = UE.getEditor('F_EnrollmentInformation');
             $('#F_EnrollmentInformation')[0].ue = F_EnrollmentInformationUE;
         },
         initData: function () {
             if (!!selectedRow) {
                 keyValue = selectedRow.F_CompanyId;
+                
                 $('#form').lrSetFormData(selectedRow);
+                //if (selectedRow.F_BriefIntroduction) {
+                //    setTimeout(function () {
+                //        F_BriefIntroductionUE.setContent(selectedRow.F_BriefIntroduction);
+                //    }, 100);
+                    
+                //};
+                //if (selectedRow.F_EnrollmentInformation) {
+                //    setTimeout(function () {
+                //        F_EnrollmentInformationUE.setContent(selectedRow.F_EnrollmentInformation);
+                //    }, 100);
+                    
+                //};
             }
         }
     };

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoEntity.cs

@@ -35,6 +35,11 @@ namespace Learun.Application.OA
         [Column("F_CONTENT")]
         public string F_Content { get; set; }
         /// <summary>
+        /// 拾捡人
+        /// </summary>
+        [Column("F_PICKER")]
+        public string F_Picker { get; set; }
+        /// <summary>
         /// 发布人员
         /// </summary>
         [Column("F_CREATEUSERNAME")]
@@ -50,7 +55,7 @@ namespace Learun.Application.OA
         [Column("F_CREATETIME")]
         public DateTime? F_CreateTime { get; set; }
         /// <summary>
-        /// 状态 草稿0、已发布1、已认领2、撤下3
+        /// 状态 草稿0、待认领1、已认领2
         /// </summary>
         [Column("F_STATE")]
         public int? F_State { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoService.cs

@@ -155,7 +155,7 @@ namespace Learun.Application.OA
         {
             try
             {
-                //草稿0、已发布1、已认领2、撤下3
+                //草稿0、待认领1、已认领2
                 string sql = $"update LostArticleInfo set F_State=1 where F_LId='{keyValue}'";
                 this.BaseRepository().ExecuteBySql(sql);
             }
@@ -180,9 +180,9 @@ namespace Learun.Application.OA
         {
             try
             {
-                //草稿0、已发布1、已认领2、撤下3
+                //草稿0、待认领1、已认领2
                 UserInfo userInfo = LoginUserInfo.Get();
-                string sql = $@"update LostArticleInfo set F_State=3,F_User='{entity.F_User}',F_UserTime='{entity.F_UserTime}',F_ClaimImage='{entity.F_ClaimImage}',
+                string sql = $@"update LostArticleInfo set F_State=2,F_User='{entity.F_User}',F_UserTime='{entity.F_UserTime}',F_ClaimImage='{entity.F_ClaimImage}',
                                 F_ManageUserId='{userInfo.userId}',F_ManageUserName='{userInfo.realName}' where F_LId='{keyValue}'";
                 this.BaseRepository().ExecuteBySql(sql);
             }
@@ -207,8 +207,8 @@ namespace Learun.Application.OA
         {
             try
             {
-                //草稿0、已发布1、已认领2、撤下3
-                string sql = $"update LostArticleInfo set F_State=3 where F_LId='{keyValue}'";
+                //草稿0、待认领1、已认领2
+                string sql = $"update LostArticleInfo set F_State=0 where F_LId='{keyValue}'";
                 this.BaseRepository().ExecuteBySql(sql);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs

@@ -477,7 +477,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     var Ass_AssetsInfoItemEntity = db.FindEntity<Ass_AssetsInfoItemEntity>(keyValue);
                     var Ass_AssetsInfo =
                         db.FindEntity<Ass_AssetsInfoEntity>(m => m.AId == Ass_AssetsInfoItemEntity.AId);
-                    if (Ass_AssetsInfo.HasDetail == true)
+                    if (Ass_AssetsInfo != null && Ass_AssetsInfo.HasDetail == true)
                     {
                         //库存更新
                         var itemcount = db.FindList<Ass_AssetsInfoItemEntity>(m => m.AId == Ass_AssetsInfoItemEntity.AId).Count(m => m.AIIsInStorage == true);
@@ -707,10 +707,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 else
                 {
                     entity.Create();
-                    var assinfoEntity=new Ass_AssetsInfoEntity()
+                    var assinfoEntity = new Ass_AssetsInfoEntity()
                     {
-                        AName= entity.AIASSName,
-                        ATId=entity.AIASSClass,
+                        AName = entity.AIASSName,
+                        ATId = entity.AIASSClass,
                         AModel = entity.AISpecificationtype,
                         AManufacturer = entity.AIManufacturer,
                         ASource = entity.AIAddType,