From ee7ef8775cc7d45a0c6b70897aedbc9cfad75a9a Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Tue, 24 Nov 2020 16:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetManagementSystem/Views/Ass_PurchaseApply/Index.js  | 1 +
 .../Views/Utility/ListContentIndex.cshtml                   | 3 ++-
 .../Views/Utility/ListContentIndex.js                       | 6 +++++-
 .../Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs       | 4 ++++
 .../Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs            | 6 ++++++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_PurchaseApply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_PurchaseApply/Index.js
index de7782be3..99e1dd6a8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_PurchaseApply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_PurchaseApply/Index.js	
@@ -250,6 +250,7 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    { label: "是否入库", name: "PIsInStorage", width: 130, align: "left" },
                 ],
                 mainId: 'PAId',
                 isPage: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml
index 6dc3742b4..4581f7574 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml	
@@ -1,7 +1,7 @@
 
 @{
     ViewBag.Title = "ListContentIndex";
-    Layout = "~/Views/Shared/_Index.cshtml";
+    Layout = "~/Views/Shared/_Form.cshtml";
 }
 <link rel="stylesheet" type="text/css" href="~/Content/news/css/common.css">
 <link rel="stylesheet" type="text/css" href="~/Content/news/css/style.css">
@@ -26,6 +26,7 @@
             <div class="listDotBox" id="F_NewsContent">
                
             </div>
+            <div id="F_NewsImage"></div>
         </div>
     </div>
     <div class="list_sec2s list_sec">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js
index 74ea506a5..cfc21c109 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js	
@@ -11,9 +11,10 @@ var bootstrap = function ($, learun) {
 
     var page = {
         init: function () {
+            $('#F_NewsImage').lrUploader({ isUpload:false});
             $('.warpper').lrscroll();
             var item = top['dtlist' + id];
-            if (!!item) {
+            if(false){// (!!item) {
                 $("#F_FullHead").text(item.f_title);
                 $("#F_CreateDate").text(item.f_createdate);
                 $("#F_CreateUserName").text(item.f_createusername);
@@ -26,6 +27,7 @@ var bootstrap = function ($, learun) {
                     $("#F_CreateUserName").text(data.F_CreateUserName);
                     $("#F_Category").text(data.F_Category);
                     $("#F_NewsContent").html($('<div></div>').html(data.F_NewsContent));
+                    $('#F_NewsImage').lrUploaderSet(data.F_NewsImage);
                 });
             }
             //阅读
@@ -43,6 +45,8 @@ var bootstrap = function ($, learun) {
                     $('#readlist').html(html);
                 }
             });
+
+
         }
     };
     page.init();
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs
index 9d1d71ce3..92592e266 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs	
@@ -277,6 +277,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     //读入库申请记录
                     var assinfoapp = db.FindEntity<Ass_AssetsInfoApplyEntity>(m => m.AAProcessId == processId);
                     var assPurchase = db.FindEntity<Ass_PurchaseEntity>(a => a.PId == assinfoapp.PId);
+                    //通知申请人
+                    var purchaseApplyEntity = db.FindEntity<Ass_PurchaseApplyEntity>(a => a.PAId = assPurchase.PAId);
+                    purchaseApplyEntity.PIsInStorage = "已入库";
+                    db.Update(purchaseApplyEntity);
                     if (null != assPurchase)
                     {
                         assPurchase.PStoregeStatus = 2;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs
index 0d5923de6..9418856c5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs	
@@ -84,6 +84,12 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         [Column("POPINION")]
         public string POpinion { get; set; }
+
+        /// <summary>
+        /// 是否入库
+        /// </summary>
+        [Column("PISINSTORAGE")]
+        public string PIsInStorage { get; set; }
         #endregion
 
         #region  扩展操作