From 5a1272724970f701ba9dc17890387d4337bffb9a Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 20 Jul 2021 11:14:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AD=A6=E6=A0=A1=E7=AE=80?=
 =?UTF-8?q?=E4=BB=8B=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml          | 4 ++--
 .../LR_OrganizationModule/Controllers/CompanyController.cs | 5 ++++-
 .../Areas/LR_OrganizationModule/Views/Company/Form.js      | 7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml
index 90dbfdc10..efc9d90bf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml	
@@ -14,8 +14,8 @@
         <div id="AAITId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">耗材编号<font face="宋体">*</font></div>
-        <input id="AAICode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">耗材编号</div>
+        <input id="AAICode" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">耗材名称<font face="宋体">*</font></div>
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 0d4f03ddb..045da684c 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	
@@ -106,8 +106,10 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveForm(string keyValue, CompanyEntity entity)
+        [ValidateInput(false)]
+        public ActionResult SaveForm(string keyValue, string strEntity)
         {
+            CompanyEntity entity = strEntity.ToObject<CompanyEntity>();
             entity.SyncFlag = false;
             entity.F_BriefIntroduction = WebHelper.HtmlEncode(entity.F_BriefIntroduction);
             entity.F_EnrollmentInformation = WebHelper.HtmlEncode(entity.F_EnrollmentInformation);
@@ -126,6 +128,7 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
                     entity.SyncFlag = false;
                 }
 
+
                 list = list.Where(m => m.F_CompanyId != keyValue).ToList();
             }
             if (list.Any(a => a.F_FullName == entity.F_FullName))
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 ae70b3773..777db052e 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	
@@ -61,7 +61,12 @@ var bootstrap = function ($, learun) {
         if (postData["F_ParentId"] == '' || postData["F_ParentId"] == '&nbsp;') {
             postData["F_ParentId"] = '0';
         }
-        $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        postData["F_BriefIntroduction"] = F_BriefIntroductionUE.getContent(null, null, true);
+        postData["F_EnrollmentInformation"] = F_EnrollmentInformationUE.getContent(null, null, true);
+        var postDatas = {
+            strEntity: JSON.stringify(postData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postDatas, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();