From dd0677a5cea030bbd94ed263faa9824074ee533b Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Mon, 24 May 2021 17:55:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=B1=E7=89=A9=E6=8B=9B?= =?UTF-8?q?=E9=A2=86=EF=BC=8C=E5=9C=A8=E5=86=8C=E8=B5=84=E4=BA=A7=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8A=A0=E8=B5=84=E4=BA=A7=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Ass_AssetsInfoItem/Form.cshtml | 17 ++++++++-------- .../Views/Ass_AssetsInfoItem/FormView.cshtml | 16 ++++++++++----- .../Views/Ass_AssetsInfoItem/Index.cshtml | 2 +- .../Views/LostArticleInfo/Form.cshtml | 9 +++++++-- .../Views/LostArticleInfo/Index.js | 13 +++++++----- .../Controllers/CompanyController.cs | 7 +++++++ .../Views/Company/Form.js | 20 +++++++++++++++++-- .../LostArticleInfo/LostArticleInfoEntity.cs | 7 ++++++- .../LostArticleInfo/LostArticleInfoService.cs | 10 +++++----- .../Ass_AssetsInfoItemService.cs | 8 ++++---- 10 files changed, 76 insertions(+), 33 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml index cebb77f71..414624ba1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml @@ -9,9 +9,9 @@ @*
-
序号
- -
*@ +
序号
+ + *@
资产编号
@@ -22,12 +22,16 @@
房间号
-
+
资产名称
+
+
资产分类
+
+
资产规格
@@ -149,10 +153,7 @@
报废提示时间*
-
-
资产分类
-
-
+
增加方式
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml index b7ff0ab5e..fa3cd0bb2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml @@ -16,13 +16,13 @@
明细编号*
- @*
-
序号*
-
*@ -
-
+ @*
+
序号*
+ +
*@ +
资产编号
@@ -47,6 +47,12 @@
资产名称
+
+
+
+
资产分类
+
+
资产规格
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml index 8fd65635a..0d694dc94 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml @@ -15,7 +15,7 @@
-
资产属性
+
资产分类
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Form.cshtml index b3c54da1c..59aef738d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Form.cshtml @@ -5,19 +5,24 @@
-
公告标题*
+
标题*
发布时间*
+
+
捡拾人*
+ +
+
标题图片
-
公告内容
+
内容
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Index.js index f9ae6c191..a9277eb47 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Index.js +++ b/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 "草稿"; else if (cellvalue == 1) - return "已发布"; - else if (cellvalue == 3) - return "已撤下"; + return "待认领"; + else if (cellvalue == 2) + return "已认领"; + //else if (cellvalue == 3) + // return "已撤下"; } }, //{ label: "创建时间", name: "F_CreateTime", index: "F_CreateDate", width: 130, align: 'left' } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs index eeca1f1b5..0d4f03ddb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs +++ b/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); } /// @@ -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)) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js index 7314020ad..5a6b5cc21 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js +++ b/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); + + //}; } } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoEntity.cs index 805e0e776..3df9d54d2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoEntity.cs +++ b/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; } /// + /// 拾捡人 + /// + [Column("F_PICKER")] + public string F_Picker { get; set; } + /// /// 发布人员 /// [Column("F_CREATEUSERNAME")] @@ -50,7 +55,7 @@ namespace Learun.Application.OA [Column("F_CREATETIME")] public DateTime? F_CreateTime { get; set; } /// - /// 状态 草稿0、已发布1、已认领2、撤下3 + /// 状态 草稿0、待认领1、已认领2 /// [Column("F_STATE")] public int? F_State { get; set; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoService.cs index 2d254a8b4..8c0047cfb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoService.cs +++ b/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) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs index 3a40a79a0..a98657418 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs +++ b/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(keyValue); var Ass_AssetsInfo = db.FindEntity(m => m.AId == Ass_AssetsInfoItemEntity.AId); - if (Ass_AssetsInfo.HasDetail == true) + if (Ass_AssetsInfo != null && Ass_AssetsInfo.HasDetail == true) { //库存更新 var itemcount = db.FindList(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,