档案借阅、归还

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/ArchiveUserController.cs

@@ -37,6 +37,26 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
         {
              return View();
         }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexData()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 归还
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormGH()
+        {
+            return View();
+        }
+        
+
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveUser/Form.cshtml

@@ -1,19 +1,24 @@
 @{
-    ViewBag.Title = "档案利用";
+    ViewBag.Title = "档案借阅";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="ArchiveUser" >
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveUser">
         <div class="lr-form-item-title">档案</div>
-        <div id="ArchiveId"  ></div>
+        <input id="Type" value="借阅" style="display: none" />
+        <div id="ArchiveId"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ArchiveUser" >
-        <div class="lr-form-item-title">归还时间</div>
-        <input id="ReturnTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ReturnTime').trigger('change'); } })"   />
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveUser">
+        <div class="lr-form-item-title">借阅人</div>
+        <div id="UserId"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ArchiveUser" >
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveUser">
+        <div class="lr-form-item-title">预计归还时间</div>
+        <input id="ReturnTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ReturnTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveUser">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/CustomFunction/Views/ArchiveUser/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveUser/Form.js

@@ -5,7 +5,8 @@
  * 描  述：档案利用
  */
 var acceptClick;
-var keyValue = request('keyValue');
+var keyValue='';
+var ArchiveId = request('ArchiveId');
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -15,14 +16,16 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#ArchiveId').lrDataSourceSelect({ code: 'ArchiveInfo',value: 'id',text: 'name' });
+            $('#ArchiveId').lrDataSourceSelect({ code: 'ArchiveInfo', value: 'id', text: 'name' });
+            $('#UserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#ArchiveId').lrselectSet(ArchiveId);
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/CustomFunction/ArchiveUser/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
-                        if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        if (data[id] && !!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
@@ -37,8 +40,10 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
+        var strEntity = JSON.stringify($('body').lrGetFormData());
+        //strEntity.Type = '借阅';
         var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
+            strEntity: strEntity
         };
         $.lrSaveForm(top.$.rootUrl + '/CustomFunction/ArchiveUser/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveUser/FormGH.cshtml

@@ -0,0 +1,24 @@
+@{
+    ViewBag.Title = "档案归还";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveUser">
+        <div class="lr-form-item-title">档案</div>
+        <input id="Type" value="归还" style="display: none" />
+        <div id="ArchiveId"></div>
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="ArchiveUser">
+            <div class="lr-form-item-title">借阅人</div>
+            <div id="UserId"></div>
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="ArchiveUser">
+            <div class="lr-form-item-title">预计归还时间</div>
+            <input id="ReturnTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ReturnTime').trigger('change'); } })" />
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveUser">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/ArchiveUser/FormGH.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveUser/FormGH.js

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-07-06 15:32
+ * 描  述：档案归还
+ */
+var acceptClick;
+var keyValue='';
+var ArchiveId = request('ArchiveId');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#ArchiveId').lrDataSourceSelect({ code: 'ArchiveInfo', value: 'id', text: 'name' });
+            //$('#UserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#ArchiveId').lrselectSet(ArchiveId);
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/ArchiveUser/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (data[id] && !!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/CustomFunction/ArchiveUser/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveUser/Index.cshtml

@@ -35,8 +35,10 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_data" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;利用记录</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_jy" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;借阅</a>
+                        <a id="lr_gh" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;归还</a>
+                        <a id="lr_data" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;利用记录</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveUser/Index.js

@@ -21,20 +21,47 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/CustomFunction/ArchiveUser/Form',
-                    width: 600,
-                    height: 400,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
+            // 借阅
+            $('#lr_jy').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != '1' && Status != '0') {
+                        return learun.alert.warning("当前状态无法借阅！");
                     }
-                });
+                    learun.layerForm({
+                        id: 'form',
+                        title: '借阅',
+                        url: top.$.rootUrl + '/CustomFunction/ArchiveUser/Form?ArchiveId=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
             });
-            // 编辑
+            // 归还
+            $('#lr_gh').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != '2') {
+                        return learun.alert.warning("选中项未借阅，无需归还！");
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '归还',
+                        url: top.$.rootUrl + '/CustomFunction/ArchiveUser/FormGH?ArchiveId=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 利用记录
             $('#lr_data').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 var Name = $('#gridtable').jfGridValue('Name');
@@ -117,6 +144,20 @@ var bootstrap = function ($, learun) {
                     { label: "备注", name: "Remark", width: 200, align: "left" },
                     { label: "创建人", name: "CreateUserName", width: 100, align: "left" },
                     { label: "创建时间", name: "CreateTime", width: 150, align: "left" },
+                    {
+                        label: "状态", name: "Status", width: 150, align: "left", formatter: function (value) {
+                            //(1正常，2借阅，3移交，99销毁)
+                            if (value == '2') {
+                                return "<span class=\"label label-warning\">借阅</span>";
+                            } else if (value == '3') {
+                                return "<span class=\"label label-warning\">移交</span>";
+                            } else if (value == '99') {
+                                return "<span class=\"label label-warning\">销毁</span>";
+                            } else {
+                                return "<span class=\"label label-success\">正常</span>";
+                            }
+                        }
+                    },
                 ],
                 mainId: 'Id',
                 isPage: true,
@@ -140,7 +181,7 @@ var bootstrap = function ($, learun) {
                                         });
                                 }
                             },
-                            { label: "操作时间", name: "CreateTime", width: 100, align: "left" },
+                            { label: "操作时间", name: "CreateTime", width: 150, align: "left" },
                             { label: "操作人", name: "CreateUserName", width: 100, align: "left" },
                             { label: "备注", name: "Remark", width: 100, align: "left" },
                         ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -937,6 +937,7 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Index.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveInfo\FormRecord.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveInfo\IndexRecord.js" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveUser\FormGH.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexData.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeLessonSync\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeLessonSync\Index.js" />
@@ -7262,6 +7263,7 @@
     <Content Include="Areas\EducationalAdministration\Views\DtStuLeave\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\DtStuLeave\Index.cshtml" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexData.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveUser\FormGH.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ArchiveInfo/ArchiveInfoEntity.cs

@@ -95,7 +95,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         [Column("PARTNUM")]
         public string PartNum { get; set; }
         /// <summary>
-        /// 状态
+        /// 状态(1正常，2借阅，3移交，99销毁)
         /// </summary>
         [Column("STATUS")]
         public int? Status { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ArchiveUser/ArchiveUserEntity.cs

@@ -1,6 +1,7 @@
 using Learun.Util;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
+using LoginUserInfo = Learun.Util.LoginUserInfo;
 
 namespace Learun.Application.TwoDevelopment.CustomFunction
 {
@@ -70,6 +71,10 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            var userinfo = LoginUserInfo.Get();
+            this.CreateUserId = userinfo.userId;
+            this.CreateUserName = userinfo.realName;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ArchiveUser/ArchiveUserService.cs

@@ -172,6 +172,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// <param name="entity">实体</param>
         public void SaveEntity(string keyValue, ArchiveUserEntity entity)
         {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
                 if (!string.IsNullOrEmpty(keyValue))
@@ -182,11 +183,31 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 else
                 {
                     entity.Create();
-                    this.BaseRepository("CollegeMIS").Insert(entity);
+                    db.Insert(entity);
+                    var archiveInfoEntity = db.FindEntity<ArchiveInfoEntity>(x => x.Id == entity.ArchiveId);
+                    switch (entity.Type)
+                    {
+                        case "借阅":
+                            //状态(1正常，2借阅，3移交，99销毁)
+                            archiveInfoEntity.Status = 2;
+                            break;
+                        case "归还":
+                            archiveInfoEntity.Status = 1;
+                            break;
+                        case "移交":
+                            archiveInfoEntity.Status = 3;
+                            break;
+                        case "销毁":
+                            archiveInfoEntity.Status = 99;
+                            break;
+                    }
+                    db.Update(archiveInfoEntity);
+                    db.Commit();
                 }
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;