Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_FixAssetsApplyController.cs

@@ -39,6 +39,24 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexView()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_FixAssetsController.cs

@@ -5,6 +5,8 @@ using System.Web.Mvc;
 using Learun.Application.TwoDevelopment.LR_CodeDemo;
 using System.Collections.Generic;
 using Learun.Application.Base.SystemModule;
+using System;
+using System.IO;
 
 namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
 {
@@ -29,7 +31,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -38,7 +40,34 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+        /// <summary>
+        /// 表单查看页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 导入表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ImportForm()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面【老师】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfTeacher()
+        {
+            return View();
         }
         #endregion
 
@@ -74,8 +103,9 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Ass_FixAssetsData = ass_FixAssetsIBLL.GetAss_FixAssetsEntity( keyValue );
-            var jsonData = new {
+            var Ass_FixAssetsData = ass_FixAssetsIBLL.GetAss_FixAssetsEntity(keyValue);
+            var jsonData = new
+            {
                 Ass_FixAssets = Ass_FixAssetsData,
             };
             return Success(jsonData);
@@ -89,8 +119,9 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormDataByProcessId(string processId)
         {
-            var Ass_FixAssetsData = ass_FixAssetsIBLL.GetEntityByProcessId( processId );
-            var jsonData = new {
+            var Ass_FixAssetsData = ass_FixAssetsIBLL.GetEntityByProcessId(processId);
+            var jsonData = new
+            {
                 Ass_FixAssets = Ass_FixAssetsData,
             };
             return Success(jsonData);
@@ -123,12 +154,58 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Ass_FixAssetsEntity entity = strEntity.ToObject<Ass_FixAssetsEntity>();
-            ass_FixAssetsIBLL.SaveEntity(keyValue,entity);
+            var model = ass_FixAssetsIBLL.GetEntityByCode(entity.FACode);
             if (string.IsNullOrEmpty(keyValue))
             {
+                if (model != null)
+                {
+                    return Fail("资产编号已存在！");
+                }
+            }
+            else
+            {
+                if (model != null && model.FAId != keyValue)
+                {
+                    return Fail("资产编号已存在！");
+                }
             }
+            ass_FixAssetsIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult ChangeStatusById(string keyValue, int status, string processId)
+        {
+            ass_FixAssetsIBLL.ChangeStatusById(keyValue, status, processId);
+            return Success("操作成功！");
+        }
+
+        /// <summary>
+        /// 下载文件
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DownTemplate()
+        {
+            FileStreamResult result = null;
+            try
+            {
+                var path = Server.MapPath("~/Content/excel/");
+                var pathoffull = path + "AssFixAssetsImport.xls";
+                FileStream fsread = fsread = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+                result = File(fsread, "application/ms-excel", "固定资产导入模板.xls");
+
+                return result;
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
         #endregion
 
     }

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

@@ -38,7 +38,7 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">财务入账日期<font face="宋体">*</font></div>
-        <input id="FinanceEntryDate" type="text" class="form-control lr-input-wdatepicker colorpink" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#FinanceEntryDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <input id="FinanceEntryDate" type="text" class="form-control lr-input-wdatepicker colorpink" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#FinanceEntryDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">价值类型<font face="宋体">*</font></div>
@@ -98,15 +98,15 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">累计折旧<font face="宋体">*</font></div>
-        <input id="AccumulatedDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly/>
+        <input id="AccumulatedDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">已提折旧月数<font face="宋体">*</font></div>
-        <input id="HaveDepreciationMonths" type="text" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly/>
+        <input id="HaveDepreciationMonths" type="number" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">月折旧额<font face="宋体">*</font></div>
-        <input id="MonthlyDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly/>
+        <input id="MonthlyDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">折旧方法<font face="宋体">*</font></div>
@@ -114,7 +114,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">净值<font face="宋体">*</font></div>
-        <input id="NetValue" type="text" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly/>
+        <input id="NetValue" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">采购组织形式</div>
@@ -129,8 +129,8 @@
         <input id="SpecificationModel" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
-        <div class="lr-form-item-title">存放地点</div>
-        <div id="StorageId"></div>
+        <div class="lr-form-item-title">存放地点<font face="宋体">*</font></div>
+        <div id="StorageId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
         <div class="lr-form-item-title">销售商</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/Form.js

@@ -40,6 +40,7 @@ var bootstrap = function ($, learun) {
             $('.lr-form-wrap').lrscroll();
             page.bind();
             page.initData();
+            page.computed();
         },
         bind: function () {
             $('#ATGId').lrselect({
@@ -59,7 +60,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#ATId').lrselect({ allowSearch: true});
+            $('#ATId').lrselect({ allowSearch: true });
             $('#ValueType').lrDataItemSelect({ code: 'ValueType' });
             $('#GetWay').lrDataItemSelect({ code: 'GetWay' });
             $('#UseCondition').lrDataItemSelect({ code: 'AssState' });
@@ -91,6 +92,92 @@ var bootstrap = function ($, learun) {
                     }
                 });
             }
+        },
+        computed: function () {
+            //财政拨款
+            $('#FinancialAppropriation').on('blur', function () {
+                FinancialAppropriationBlur();
+            });
+            //非财政拨款
+            $('#NonFinancialAppropriation').on('blur', function () {
+                FinancialAppropriationBlur();
+            });
+            let FinancialAppropriationBlur = function () {
+                let fa = $('#FinancialAppropriation').val();
+                let nfa = $('#NonFinancialAppropriation').val();
+                //计算：价值
+                let value = calcValue(fa, nfa);
+                $('#Value').val(value);
+                //计算：月折旧额
+                let depreciationLife = $('#DepreciationLife').val();
+                let monthlyDepreciation = calcMonthlyDepreciation(value, depreciationLife);
+                $('#MonthlyDepreciation').val(monthlyDepreciation);
+                //计算：累计折旧
+                let haveDepreciationMonths = $('#HaveDepreciationMonths').val();
+                let accumulatedDepreciation = calcAccumulatedDepreciation(monthlyDepreciation, haveDepreciationMonths);
+                $('#AccumulatedDepreciation').val(accumulatedDepreciation);
+                //计算：净值
+                let netValue = calcNetValue(value, accumulatedDepreciation);
+                $('#NetValue').val(netValue);
+                netValue == 0 ? $('#NetValue').attr('style', 'color:red;') : $('#NetValue').removeAttr('style');
+            };
+            //折旧年限
+            $('#DepreciationLife').on('blur', function () {
+                //计算：月折旧额
+                let value = $('#Value').val();
+                let depreciationLife = $('#DepreciationLife').val();
+                let monthlyDepreciation = calcMonthlyDepreciation(value, depreciationLife);
+                $('#MonthlyDepreciation').val(monthlyDepreciation);
+                //计算：累计折旧
+                let haveDepreciationMonths = $('#HaveDepreciationMonths').val();
+                let accumulatedDepreciation = calcAccumulatedDepreciation(monthlyDepreciation, haveDepreciationMonths);
+                $('#AccumulatedDepreciation').val(accumulatedDepreciation);
+                //计算：净值
+                let netValue = calcNetValue(value, accumulatedDepreciation);
+                $('#NetValue').val(netValue);
+                netValue == 0 ? $('#NetValue').attr('style', 'color:red;') : $('#NetValue').removeAttr('style');
+            });
+            //入账时间
+            $('#FinanceEntryDate').on('change', function () {
+                //计算：已提折旧月数
+                let financeEntryDate = $(this).val().trim();
+                let haveDepreciationMonths = 0;
+                if (!!financeEntryDate) {
+                    let compareDate = new Date(financeEntryDate);
+                    haveDepreciationMonths = getDistanceMonth(compareDate.getFullYear(), compareDate.getMonth() + 1, compareDate.getDate()) - 1;
+                    if (haveDepreciationMonths < 0) {
+                        haveDepreciationMonths = 0;
+                    }
+                }
+                $('#HaveDepreciationMonths').val(haveDepreciationMonths);
+                //计算：累计折旧
+                let monthlyDepreciation = $('#MonthlyDepreciation').val();
+                let accumulatedDepreciation = calcAccumulatedDepreciation(monthlyDepreciation, haveDepreciationMonths);
+                $('#AccumulatedDepreciation').val(accumulatedDepreciation);
+                //计算：净值
+                let value = $('#Value').val();
+                let netValue = calcNetValue(value, accumulatedDepreciation);
+                $('#NetValue').val(netValue);
+                netValue == 0 ? $('#NetValue').attr('style', 'color:red;') : $('#NetValue').removeAttr('style');
+            });
+            
+            //计算：价值数据=财政拨款 + 非财政拨款
+            let calcValue = function (a, b) {
+                return Number(a) + Number(b);
+            };
+            //计算：月折旧额=价值/折旧年限
+            let calcMonthlyDepreciation = function (a, b) {
+                return Number(b) > 0 ? (Number(a) / Number(b)).toFixed(2) : 0;
+            }
+            //计算：累计折旧=月折旧额*已提折旧月数
+            let calcAccumulatedDepreciation = function (a, b) {
+                return (Number(a) * Number(b)).toFixed(2);
+            }
+            //计算：净值=价值-累计折旧
+            let calcNetValue = function (a, b) {
+                return (Number(a) - Number(b)) > 0 ? (Number(a) - Number(b)) : 0;
+            }
+            
         }
     };
     // 设置表单数据
@@ -137,3 +224,22 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
+
+//某日期-今 的相差月数
+function getDistanceMonth(compareYear, compareMonth, compareDay) {
+    let date = new Date()
+    let year = date.getFullYear()
+    let month = date.getMonth() + 1
+    let day = date.getDate()
+    //console.log(year + "-" + month + "-" + day);
+    let yearToMonth = (year - compareYear) * 12
+    let monthToMonth = month - compareMonth
+    let dateToMonth = 0
+    if (day >= compareDay) {
+        dateToMonth = 0
+    } else {
+        dateToMonth = -1
+    }
+    return yearToMonth + monthToMonth + dateToMonth;
+}
+//console.log(getDistanceMonth(2022, 1, 30));

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

@@ -0,0 +1,160 @@
+@{
+    ViewBag.Title = "固定资产";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<style>
+    .lr-form-item {
+        padding-left: 125px;
+    }
+
+    .lr-form-item-title {
+        width: 125px;
+    }
+
+    .coloreee {
+        background-color: #eee !important;
+    }
+
+    .colorpink {
+        background-color:antiquewhite !important;
+    }
+</style>
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">资产编号<font face="宋体">*</font></div>
+        <input id="FACode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
+        <input id="FAName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">资产国标大类<font face="宋体">*</font></div>
+        <div id="ATGId" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">资产分类<font face="宋体">*</font></div>
+        <div id="ATId" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">财务入账日期<font face="宋体">*</font></div>
+        <input id="FinanceEntryDate" type="text" class="form-control lr-input-wdatepicker colorpink" readonly isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">价值类型<font face="宋体">*</font></div>
+        <div id="ValueType" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">价值<font face="宋体">*</font></div>
+        <input id="Value" type="text" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">取得方式<font face="宋体">*</font></div>
+        <div id="GetWay" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">取得日期<font face="宋体">*</font></div>
+        <input id="GetDate" type="text" class="form-control lr-input-wdatepicker" readonly isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">使用状况<font face="宋体">*</font></div>
+        <div id="UseCondition" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">使用部门<font face="宋体">*</font></div>
+        <div id="UseDepartment" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">管理部门<font face="宋体">*</font></div>
+        <div id="ManageDepartment" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">使用人<font face="宋体">*</font></div>
+        <div id="UsePeople" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
+        <input id="Amount" type="number" class="form-control" readonly isvalid="yes" checkexpession="PositiveInteger" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">制单人<font face="宋体">*</font></div>
+        <input id="MakePeople" type="text" class="form-control" readonly isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">制单时间<font face="宋体">*</font></div>
+        <input id="MakeDate" type="text" class="form-control lr-input-wdatepicker" readonly isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">所属单位<font face="宋体">*</font></div>
+        <div id="Unit" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">卡片状态<font face="宋体">*</font></div>
+        <div id="CardStatus" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">折旧年限<font face="宋体">*</font></div>
+        <input id="DepreciationLife" type="number" class="form-control colorpink" readonly isvalid="yes" checkexpession="PositiveInteger" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">累计折旧<font face="宋体">*</font></div>
+        <input id="AccumulatedDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">已提折旧月数<font face="宋体">*</font></div>
+        <input id="HaveDepreciationMonths" type="number" class="form-control coloreee" isvalid="yes" checkexpession="Num" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">月折旧额<font face="宋体">*</font></div>
+        <input id="MonthlyDepreciation" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">折旧方法<font face="宋体">*</font></div>
+        <div id="DepreciationMothod" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">净值<font face="宋体">*</font></div>
+        <input id="NetValue" type="text" class="form-control coloreee" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">采购组织形式</div>
+        <input id="PurchaseOrganizationForm" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">品牌</div>
+        <input id="Brand" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">规格型号</div>
+        <input id="SpecificationModel" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">存放地点<font face="宋体">*</font></div>
+        <div id="StorageId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">销售商</div>
+        <div id="SupplierId" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">使用权面积/建筑面积<font face="宋体">*</font></div>
+        <input id="UseArea" type="number" class="form-control" isvalid="yes" checkexpession="Num" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">财政拨款<font face="宋体">*</font></div>
+        <input id="FinancialAppropriation" type="number" class="form-control colorpink" isvalid="yes" checkexpession="Num" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">非财政拨款<font face="宋体">*</font></div>
+        <input id="NonFinancialAppropriation" type="number" class="form-control colorpink" isvalid="yes" checkexpession="Num" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">会计凭证号<font face="宋体">*</font></div>
+        <input id="AccountDocumentNumber" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssets">
+        <div class="lr-form-item-title">折旧/摊销状态<font face="宋体">*</font></div>
+        <div id="DepreciationStatus" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssets/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/FormView.js

@@ -0,0 +1,246 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-05-05 14:37
+ * 描  述：固定资产
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+            page.computed();
+        },
+        bind: function () {
+            $('#ATGId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_AssetsType',
+                param: { strWhere: "ATPTId='0' " },
+                value: "atid",
+                text: "aname",
+                select: function (item) {
+                    if (!!item) {
+                        $('#ATId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_AssetsType',
+                            param: { strWhere: "ATPTId='" + item.atid + "' " },
+                            value: "atid",
+                            text: "aname"
+                        });
+                    }
+                }
+            });
+            $('#ATId').lrselect({ allowSearch: true });
+            $('#ValueType').lrDataItemSelect({ code: 'ValueType' });
+            $('#GetWay').lrDataItemSelect({ code: 'GetWay' });
+            $('#UseCondition').lrDataItemSelect({ code: 'AssState' });
+            $('#UseDepartment').lrDepartmentSelect();
+            $('#ManageDepartment').lrDepartmentSelect();
+            $('#UsePeople').lrformselect({
+                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
+                layerUrlW: 400,
+                layerUrlH: 300,
+                dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
+            });
+            $('#Unit').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#CardStatus').lrDataItemSelect({ code: 'CardStatus' });
+            $('#DepreciationMothod').lrDataItemSelect({ code: 'DepreciationMothod' });
+            $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#SupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
+            $('#DepreciationStatus').lrDataItemSelect({ code: 'DepreciationStatus' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        },
+        computed: function () {
+            //财政拨款
+            $('#FinancialAppropriation').on('blur', function () {
+                FinancialAppropriationBlur();
+            });
+            //非财政拨款
+            $('#NonFinancialAppropriation').on('blur', function () {
+                FinancialAppropriationBlur();
+            });
+            let FinancialAppropriationBlur = function () {
+                let fa = $('#FinancialAppropriation').val();
+                let nfa = $('#NonFinancialAppropriation').val();
+                //计算：价值
+                let value = calcValue(fa, nfa);
+                $('#Value').val(value);
+                //计算：月折旧额
+                let depreciationLife = $('#DepreciationLife').val();
+                let monthlyDepreciation = calcMonthlyDepreciation(value, depreciationLife);
+                $('#MonthlyDepreciation').val(monthlyDepreciation);
+                //计算：累计折旧
+                let haveDepreciationMonths = $('#HaveDepreciationMonths').val();
+                let accumulatedDepreciation = calcAccumulatedDepreciation(monthlyDepreciation, haveDepreciationMonths);
+                $('#AccumulatedDepreciation').val(accumulatedDepreciation);
+                //计算：净值
+                let netValue = calcNetValue(value, accumulatedDepreciation);
+                $('#NetValue').val(netValue);
+                netValue == 0 ? $('#NetValue').attr('style', 'color:red;') : $('#NetValue').removeAttr('style');
+            };
+            //折旧年限
+            $('#DepreciationLife').on('blur', function () {
+                //计算：月折旧额
+                let value = $('#Value').val();
+                let depreciationLife = $('#DepreciationLife').val();
+                let monthlyDepreciation = calcMonthlyDepreciation(value, depreciationLife);
+                $('#MonthlyDepreciation').val(monthlyDepreciation);
+                //计算：累计折旧
+                let haveDepreciationMonths = $('#HaveDepreciationMonths').val();
+                let accumulatedDepreciation = calcAccumulatedDepreciation(monthlyDepreciation, haveDepreciationMonths);
+                $('#AccumulatedDepreciation').val(accumulatedDepreciation);
+                //计算：净值
+                let netValue = calcNetValue(value, accumulatedDepreciation);
+                $('#NetValue').val(netValue);
+                netValue == 0 ? $('#NetValue').attr('style', 'color:red;') : $('#NetValue').removeAttr('style');
+            });
+            //入账时间
+            $('#FinanceEntryDate').on('change', function () {
+                //计算：已提折旧月数
+                let financeEntryDate = $(this).val().trim();
+                let haveDepreciationMonths = 0;
+                if (!!financeEntryDate) {
+                    let compareDate = new Date(financeEntryDate);
+                    haveDepreciationMonths = getDistanceMonth(compareDate.getFullYear(), compareDate.getMonth() + 1, compareDate.getDate()) - 1;
+                    if (haveDepreciationMonths < 0) {
+                        haveDepreciationMonths = 0;
+                    }
+                }
+                $('#HaveDepreciationMonths').val(haveDepreciationMonths);
+                //计算：累计折旧
+                let monthlyDepreciation = $('#MonthlyDepreciation').val();
+                let accumulatedDepreciation = calcAccumulatedDepreciation(monthlyDepreciation, haveDepreciationMonths);
+                $('#AccumulatedDepreciation').val(accumulatedDepreciation);
+                //计算：净值
+                let value = $('#Value').val();
+                let netValue = calcNetValue(value, accumulatedDepreciation);
+                $('#NetValue').val(netValue);
+                netValue == 0 ? $('#NetValue').attr('style', 'color:red;') : $('#NetValue').removeAttr('style');
+            });
+            
+            //计算：价值数据=财政拨款 + 非财政拨款
+            let calcValue = function (a, b) {
+                return Number(a) + Number(b);
+            };
+            //计算：月折旧额=价值/折旧年限
+            let calcMonthlyDepreciation = function (a, b) {
+                return Number(b) > 0 ? (Number(a) / Number(b)).toFixed(2) : 0;
+            }
+            //计算：累计折旧=月折旧额*已提折旧月数
+            let calcAccumulatedDepreciation = function (a, b) {
+                return (Number(a) * Number(b)).toFixed(2);
+            }
+            //计算：净值=价值-累计折旧
+            let calcNetValue = function (a, b) {
+                return (Number(a) - Number(b)) > 0 ? (Number(a) - Number(b)) : 0;
+            }
+            
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        console.log('formview@'+processId);
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Ass_FixAssets' && data[id]) {
+                            keyValue = data[id].FAId;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.ProcessId = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}
+
+//某日期-今 的相差月数
+function getDistanceMonth(compareYear, compareMonth, compareDay) {
+    let date = new Date()
+    let year = date.getFullYear()
+    let month = date.getMonth() + 1
+    let day = date.getDate()
+    //console.log(year + "-" + month + "-" + day);
+    let yearToMonth = (year - compareYear) * 12
+    let monthToMonth = month - compareMonth
+    let dateToMonth = 0
+    if (day >= compareDay) {
+        dateToMonth = 0
+    } else {
+        dateToMonth = -1
+    }
+    return yearToMonth + monthToMonth + dateToMonth;
+}
+//console.log(getDistanceMonth(2022, 1, 30));

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/ImportForm.cshtml

@@ -0,0 +1,24 @@
+@{
+    ViewBag.Title = "Form";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<link href="~/Content/webuploader/webuploader.css" rel="stylesheet" />
+<script src="~/Content/webuploader/webuploader.nolog.min.js"></script>
+@Html.AppendCssFile("/Areas/AssetManagementSystem/Views/Ass_FixAssets/ImportForm.css")
+<div class="lr-form-layout lr-form-layout-top-bottom">
+    <div class="lr-form-layout-header">
+        <div id="lr_add_file_btn"><i class="fa fa-cloud-upload"></i><span class="lrlt">上传文件</span></div>
+        <div class="webuploader-pick"  id="lr_down_file_btn"><i class="fa fa-download"></i><span class="lrlt">下载模板</span></div>
+    </div>
+    <div class="lr-form-layout-body">
+        <div class="lr-form-file-queue-wrap" id="lr_form_file_queue">
+            <div class="lr-form-file-queue" id="lr_form_file_queue_list">
+
+            </div>
+            <div class="lr-form-file-queue-bg">
+                <h1><span class="lrlt">试试将电脑里的文件拖拽到此上传</span></h1>
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssets/ImportForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/ImportForm.css

@@ -0,0 +1,136 @@
+.lr-form-layout-body {
+    padding:0 5px 5px 5px;
+}
+.lr-form-file-queue-wrap {
+    position:relative;
+    width:100%;
+    height:100%;
+    border:1px solid #ddd;
+    border-radius:4px;
+}
+.lr-form-file-queue {
+    position:relative;
+}
+.lr-form-file-queue {
+    position:relative;
+}
+.lr-form-file-queue-item {
+    position:relative;
+    width:100%;
+    height:50px;
+    border-bottom:1px solid #ddd;
+    padding-left:60px;
+
+}
+.lr-file-image {
+    position:absolute;
+    top:5px;
+    left:5px;
+}
+.lr-file-image img {
+    width:40px;
+    height:40px;
+}
+.lr-file-name{
+    line-height:50px;
+
+}
+.lr-msg {
+    position:absolute;
+    top:0;
+    right:5px;
+    font-size: 25px;
+    line-height:50px;
+}
+.lr-msg .fa-check-circle{
+    color: #5cb85c;
+}
+.lr-msg .fa-exclamation-circle {
+    color: #b94a48;
+}
+.lr-msg2 {
+    position:absolute;
+    top:0;
+    right:5px;
+    line-height:50px;
+}
+.lr-msg2 span {
+    color:#333;
+    font-size:14px;
+    margin-right:5px;
+}
+
+.lr-tool-bar {
+    position:absolute;
+    top:0;
+    right:35px;
+    font-size: 25px;
+    line-height:50px;
+    color:#666;
+    cursor:pointer;
+}
+.lr-tool-bar > i {
+    margin-left:8px;
+}
+
+.lr-tool-bar .fa-minus-circle {
+    color: #b94a48;
+}
+.lr-tool-bar .fa-cloud-download {
+    color: #3498db;
+}
+
+.lr-uploader-progress {
+    position:absolute;
+    bottom:2px;
+    left:60px;
+    height:4px;
+    width:500px;
+    width:calc(100% - 90px);
+}
+.lr-uploader-progress-bar {
+    position:relative;
+    height:100%;
+    background-color:#039cfd;
+    border-radius:4px;
+}
+
+
+.lr-form-file-queue-bg {
+    position:absolute;
+    top:50%;
+    left:50%;
+    width:300px;
+    height:30px;
+    line-height:30px;
+    
+    margin:-15px 0 0 -150px;
+}
+.lr-form-file-queue-bg h1 {
+    color: #666;
+    font-size: 20px;
+    font-family: Microsoft Yahei;
+    padding-bottom: 2px;
+    margin: 0;
+}
+#lr_down_file_btn {
+    position:absolute;
+    right:5px;
+    background:#fff;
+    border:1px solid #ddd;
+    color:#333;
+}
+#lr_down_file_btn:hover {
+     color:#337ab7;
+}
+/*对百度插件的样式重写*/
+.webuploader-container {
+    position:absolute;
+}
+.webuploader-pick {
+    padding:8px 15px;
+    background-color:#039cfd;
+}
+.webuploader-pick-hover {
+    background-color:#027dcb;
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/ImportForm.js

@@ -0,0 +1,240 @@
+/*
+ * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：陈彬彬
+ * 日 期：2023.03.01
+ * 描 述：导入固定资产信息
+ */
+var id = request('id');
+
+var keyVaule = '';
+
+var bootstrap = function ($, learun) {
+    "use strict";
+
+    var page1 = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#lr_add_format').on('click', function () {
+                currentColRow = null;
+                learun.layerForm({
+                    id: 'FormatForm',
+                    title: '添加',
+                    url: top.$.rootUrl + '/LR_SystemModule/CodeRule/FormatForm',
+                    width: 450,
+                    height: 310,
+                    callBack: function (id) {
+                        return top[id].acceptClick(function (data) {
+                            $('#gridtable').jfGridSet('addRow', { row: data });
+                        });
+                    }
+                });
+            });
+            $('#lr_edit_format').on('click', function () {
+                currentColRow = $('#gridtable').jfGridGet('rowdata');
+                var _id = currentColRow ? currentColRow.itemTypeName : '';
+                if (learun.checkrow(_id)) {
+                    learun.layerForm({
+                        id: 'FormatForm',
+                        title: '修改',
+                        url: top.$.rootUrl + '/LR_SystemModule/CodeRule/FormatForm',
+                        width: 450,
+                        height: 310,
+                        callBack: function (id) {
+                            return top[id].acceptClick(function (data) {
+                                $('#gridtable').jfGridSet('updateRow', { row: data });
+                            });
+                        }
+                    });
+                }
+
+            });
+            $('#lr_delete_format').on('click', function () {
+                currentColRow = null;
+                var row = $('#gridtable').jfGridGet('rowdata');
+                var _id = row ? row.itemTypeName : '';
+                if (learun.checkrow(_id)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res, index) {
+                        if (res) {
+                            $('#gridtable').jfGridSet('removeRow');
+                            top.layer.close(index); //再执行关闭  
+                        }
+                    });
+                }
+            });
+
+            $('#gridtable').jfGrid({
+                headData: [
+                    { label: "前缀", name: "itemTypeName", width: 120, align: "left" },
+                    { label: "格式", name: "formatStr", width: 120, align: "left" },
+                    { label: "步长", name: "stepValue", width: 100, align: "left" },
+                    { label: "初始值", name: "initValue", width: 120, align: "left" },
+                    { label: "说明", name: "description", width: 180, align: "left" }
+                ]
+            });
+
+            /*检测重复项*/
+            $('#F_EnCode').on('blur', function () {
+                $.lrExistField(keyValue, 'F_EnCode', top.$.rootUrl + '/LR_SystemModule/CodeRule/ExistEnCode');
+            });
+            $('#F_FullName').on('blur', function () {
+                $.lrExistField(keyValue, 'F_FullName', top.$.rootUrl + '/LR_SystemModule/CodeRule/ExistFullName');
+            });
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                keyValue = selectedRow.F_RuleId;
+                $('#form').lrSetFormData(selectedRow);
+                var formatdata = JSON.parse(selectedRow.F_RuleFormatJson);
+                $('#gridtable').jfGridSet('refreshdata', formatdata);
+            }
+        }
+    };
+
+    var fileInfo = {};
+
+    // 触发合并文件碎片
+    var mergeFileChunks = function (file) {
+
+         
+        var param = {};
+        param['__RequestVerificationToken'] = $.lrToken;
+        param['fileId'] = fileInfo[file.id].fileGuid;
+        param['chunks'] = fileInfo[file.id].chunks;
+        param['ext'] = file.ext;
+        param['templateId'] = id;
+        learun.httpAsyncPost(top.$.rootUrl + "/LR_SystemModule/ExcelImport/Ass_FixAssetsImport", param, function (res) {
+            var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id);
+            $fileItem.find('.lr-uploader-progress').remove();
+            if (res.code == learun.httpCode.success) {
+                if (res.data.Success != '0') {
+                    learun.alert.success('导入成功' + res.data.Success + '条');
+                }
+                // 文件保存成功后
+                $fileItem.append('<div class="lr-msg2"><span>' + res.data.Success + '</span><span>/</span><span style="color:#b94a48;" >' + res.data.Fail + '</span></div>');
+                // 如果有失败
+                if (res.data.Fail != '0')
+                {
+                    learun.download({ url: top.$.rootUrl + '/LR_SystemModule/ExcelImport/DownImportErrorFile', param: { fileId: fileInfo[file.id].fileGuid, fileName: fileInfo[file.id].name, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+                }
+            }
+            else {
+                $fileItem.append('<div class="lr-msg"><i class="fa fa-exclamation-circle"></i></div>');
+            }
+        });
+    }
+    // 触发清楚文件碎片
+    var reomveFileChunks = function (file) {
+        var param = {};
+        param['__RequestVerificationToken'] = $.lrToken;
+        param['fileGuid'] = fileInfo[file.id].fileGuid;
+        param['chunks'] = fileInfo[file.id].chunks;
+        learun.httpAsyncPost(top.$.rootUrl + "/LR_SystemModule/Annexes/MergeAnnexesFile", param, function (res) { });
+        var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id);
+        $fileItem.find('.lr-uploader-progress').remove();
+        $fileItem.append('<div class="lr-msg"><i class="fa fa-exclamation-circle"></i></div>');
+    }
+
+    var page = {
+        uploader: null,
+        init: function () {
+            /*模板下载*/
+            $('#lr_down_file_btn').on('click', function () {
+                learun.download({ url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/DownTemplate', param: { keyValue: id, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+            });
+            if (!WebUploader.Uploader.support()) {
+                alert('Web Uploader 不支持您的浏览器！如果你使用的是IE浏览器，请尝试升级 flash 播放器');
+                throw new Error('WebUploader does not support the browser you are using.');
+            }
+
+            page.uploader = WebUploader.create({
+                auto: true,
+                swf: top.$.rootUrl + '/Content/webuploader/Uploader.swf',
+                // 文件接收服务端。
+                server: top.$.rootUrl + "/LR_SystemModule/Annexes/UploadAnnexesFileChunk",
+                // 选择文件的按钮。可选。
+                // 内部根据当前运行是创建，可能是input元素，也可能是flash.
+                pick: '#lr_add_file_btn',
+                dnd: '#lr_form_file_queue',
+                paste: 'document.body',
+                disableGlobalDnd: true,
+                accept: {
+                    extensions: "xls,xlsx"
+                },
+                multiple: true,
+                // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
+                resize: false,
+                // 文件分片上传
+                chunked: true,
+                chunkRetry: 3,
+                prepareNextFile: true,
+                chunkSize: '1048576',
+                // 上传参数
+                formData: {
+                    __RequestVerificationToken: $.lrToken
+                }
+            });
+            page.uploader.on('fileQueued', page.fileQueued);
+            page.uploader.on('uploadStart', page.uploadStart);
+            page.uploader.on('uploadBeforeSend', page.uploadBeforeSend);
+            page.uploader.on('uploadProgress', page.uploadProgress);
+            page.uploader.on('uploadSuccess', page.uploadSuccess);
+            page.uploader.on('uploadError', page.uploadError);
+            page.uploader.on('uploadComplete', page.uploadComplete);
+            page.uploader.on('error', page.error);
+
+            $('#lr_form_file_queue').lrscroll();
+
+        },
+        fileQueued: function (file) {// 文件加载到队列
+            fileInfo[file.id] = { name: file.name };
+            $('#lr_form_file_queue .lr-form-file-queue-bg').hide();
+            // 添加一条文件记录
+            var $item = $('<div class="lr-form-file-queue-item" id="lr_filequeue_' + file.id + '" ></div>');
+            $item.append('<div class="lr-file-image"><img src="' + top.$.rootUrl + '/Content/images/filetype/' + file.ext + '.png"></div>');
+            $item.append('<span class="lr-file-name">' + file.name + '(' + learun.countFileSize(file.size) + ')</span>');
+
+            $('#lr_form_file_queue_list').append($item);
+        },
+        uploadStart: function (file) {
+            var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id);
+            $fileItem.append('<div class="lr-uploader-progress"><div class="lr-uploader-progress-bar" style="width:0%;"></div></div>');
+        },
+        uploadBeforeSend: function (object, data, headers) {
+            data.chunk = data.chunk || 0;
+            data.chunks = data.chunks || 1;
+            fileInfo[data.id].fileGuid = fileInfo[data.id].fileGuid || WebUploader.Base.guid();
+            data.fileGuid = fileInfo[data.id].fileGuid;
+            fileInfo[data.id].chunks = data.chunks;
+        },
+        uploadProgress: function (file, percentage) {
+            var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id);
+            $fileItem.find('.lr-uploader-progress-bar').css('width', (percentage * 100 + '%'));
+        },
+        uploadSuccess: function (file, res) {
+            if (res.code == 200) {// 上传成功
+                mergeFileChunks(file);
+            }
+            else {// 上传失败
+                reomveFileChunks(file);
+            }
+        },
+        uploadError: function (file, code) {
+            reomveFileChunks(file);
+        },
+        uploadComplete: function (file) {
+        },
+        error: function (type) {
+            switch (type) {
+                case 'Q_TYPE_DENIED':
+                    learun.alert.error('当前文件类型不允许上传');
+                    break;
+            };
+        }
+    };
+    page.init();
+
+}

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

@@ -86,6 +86,7 @@
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-arrow-up"></i>&nbsp;提交</a>
+                        <a id="lr_import" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;导入</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/Index.js

@@ -16,13 +16,29 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 350, 450);
-            $('#ATGId').lrDataSourceSelect({ code: 'Ass_AssetsType', value: 'atid', text: 'aname' });
-            $('#ATId').lrDataSourceSelect({ code: 'Ass_AssetsType', value: 'atid', text: 'aname' });
+            }, 350, 500);
+            $('#ATGId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_AssetsType',
+                param: { strWhere: "ATPTId='0' " },
+                value: "atid",
+                text: "aname",
+                select: function (item) {
+                    if (!!item) {
+                        $('#ATId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_AssetsType',
+                            param: { strWhere: "ATPTId='" + item.atid + "' " },
+                            value: "atid",
+                            text: "aname"
+                        });
+                    }
+                }
+            });
+            $('#ATId').lrselect({ allowSearch: true });
             $('#GetWay').lrDataItemSelect({ code: 'GetWay' });
             $('#UseCondition').lrDataItemSelect({ code: 'AssState' });
-            $('#UseDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
-            $('#ManageDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
+            $('#UseDepartment').lrDepartmentSelect();
+            $('#ManageDepartment').lrDepartmentSelect();
             $('#UsePeople').lrUserSelect(0);
             $('#CardStatus').lrDataItemSelect({ code: 'CardStatus' });
             $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
@@ -95,14 +111,14 @@ var bootstrap = function ($, learun) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
+                                page.search();
                             });
                         }
                     });
                 }
             });
 
-            // 查看申请
+            // 查看
             $('#lr_view').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('FAId');
                 if (learun.checkrow(keyValue)) {
@@ -129,18 +145,32 @@ var bootstrap = function ($, learun) {
                     learun.layerConfirm('是否确认提交该项！', function (res) {
                         if (res) {
                             processId = learun.newGuid();
-                            learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/ModifyStatus', { keyValue: keyValue, status: 1, processId: processId }, function (res) {
+                            learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/ChangeStatusById', { keyValue: keyValue, status: 1, processId: processId }, function (res) {
                                 refreshGirdData(res, {});
                             });
                         }
                     });
                 }
             });
-
+            ///上传
+            $('#lr_import').on('click',
+                function () {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '导入',
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/ImportForm',
+                        width: 600,
+                        height: 400,
+                        btn: null,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                });
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/GetPageList',
                 headData: [
                     { label: "资产编号", name: "FACode", width: 100, align: "left" },
@@ -171,7 +201,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "财务入账日期", name: "FinanceEntryDate", width: 100, align: "left" },
+                    {
+                        label: "财务入账日期", name: "FinanceEntryDate", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue ? cellvalue.slice(0, 11) : "";
+                        }
+                    },
                     {
                         label: "价值类型", name: "ValueType", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -291,7 +325,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "净值", name: "NetValue", width: 100, align: "left" },
+                    {
+                        label: "净值", name: "NetValue", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue <= 0 ? "<span style='color:red;'>0</span>" : cellvalue;
+                        }
+                    },
                     { label: "采购组织形式", name: "PurchaseOrganizationForm", width: 100, align: "left" },
                     { label: "品牌", name: "Brand", width: 100, align: "left" },
                     { label: "规格型号", name: "SpecificationModel", width: 100, align: "left" },
@@ -337,10 +375,24 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === 1) {
+                                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-danger\">审核未通过</span>';
+                            } else {
+                                return '<span class=\"label label-default\" >草稿</span>';
+                            }
+                        }
+                    }
                 ],
                 mainId: 'FAId',
                 isPage: true,
-                sidx:'CreateTime desc'
+                sidx: 'CreateTime desc'
             });
             page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/IndexOfTeacher.cshtml

@@ -0,0 +1,90 @@
+@{
+    ViewBag.Title = "固定资产"; 
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-form-item{
+        padding-left:85px;
+    }
+    .lr-form-item-title{
+        width:90px;
+    }
+</style>
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产编号</div>
+                                    <input id="FACode" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产名称</div>
+                                    <input id="FAName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产国标大类</div>
+                                    <div id="ATGId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产分类</div>
+                                    <div id="ATId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">取得方式</div>
+                                    <div id="GetWay"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用状况</div>
+                                    <div id="UseCondition"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用部门</div>
+                                    <div id="UseDepartment"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">管理部门</div>
+                                    <div id="ManageDepartment"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用人</div>
+                                    <div id="UsePeople"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">卡片状态</div>
+                                    <div id="CardStatus"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">采购组织形式</div>
+                                    <input id="PurchaseOrganizationForm" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">存放地点</div>
+                                    <div id="StorageId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">折旧/摊销状态</div>
+                                    <div id="DepreciationStatus"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <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_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssets/IndexOfTeacher.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/IndexOfTeacher.js

@@ -0,0 +1,300 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-05-05 14:37
+ * 描  述：固定资产
+ */
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 350, 500);
+            $('#ATGId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_AssetsType',
+                param: { strWhere: "ATPTId='0' " },
+                value: "atid",
+                text: "aname",
+                select: function (item) {
+                    if (!!item) {
+                        $('#ATId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_AssetsType',
+                            param: { strWhere: "ATPTId='" + item.atid + "' " },
+                            value: "atid",
+                            text: "aname"
+                        });
+                    }
+                }
+            });
+            $('#ATId').lrselect({ allowSearch: true });
+            $('#GetWay').lrDataItemSelect({ code: 'GetWay' });
+            $('#UseCondition').lrDataItemSelect({ code: 'AssState' });
+            $('#UseDepartment').lrDepartmentSelect();
+            $('#ManageDepartment').lrDepartmentSelect();
+            $('#UsePeople').lrUserSelect(0);
+            $('#CardStatus').lrDataItemSelect({ code: 'CardStatus' });
+            $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#DepreciationStatus').lrDataItemSelect({ code: 'DepreciationStatus' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('FAId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formAss_FixAssets',
+                        title: '查看固定资产',
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/GetPageList',
+                headData: [
+                    { label: "资产编号", name: "FACode", width: 100, align: "left" },
+                    { label: "资产名称", name: "FAName", width: 100, align: "left" },
+                    {
+                        label: "资产国标大类", name: "ATGId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                                key: value,
+                                keyId: 'atid',
+                                callback: function (_data) {
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "资产分类", name: "ATId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                                key: value,
+                                keyId: 'atid',
+                                callback: function (_data) {
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "财务入账日期", name: "FinanceEntryDate", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue ? cellvalue.slice(0, 11) : "";
+                        }
+                    },
+                    {
+                        label: "价值类型", name: "ValueType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ValueType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "价值", name: "Value", width: 100, align: "left" },
+                    {
+                        label: "取得方式", name: "GetWay", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'GetWay',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "取得日期", name: "GetDate", width: 100, align: "left" },
+                    {
+                        label: "使用状况", name: "UseCondition", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'AssState',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "使用部门", name: "UseDepartment", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "管理部门", name: "ManageDepartment", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "使用人", name: "UsePeople", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "数量", name: "Amount", width: 100, align: "left" },
+                    { label: "制单人", name: "MakePeople", width: 100, align: "left" },
+                    { label: "制单时间", name: "MakeDate", width: 100, align: "left" },
+                    {
+                        label: "所属单位", name: "Unit", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "卡片状态", name: "CardStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'CardStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "折旧年限", name: "DepreciationLife", width: 100, align: "left" },
+                    { label: "累计折旧", name: "AccumulatedDepreciation", width: 100, align: "left" },
+                    { label: "已提折旧月数", name: "HaveDepreciationMonths", width: 100, align: "left" },
+                    { label: "月折旧额", name: "MonthlyDepreciation", width: 100, align: "left" },
+                    {
+                        label: "折旧方法", name: "DepreciationMothod", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DepreciationMothod',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "净值", name: "NetValue", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue <= 0 ? "<span style='color:red;'>0</span>" : cellvalue;
+                        }
+                    },
+                    { label: "采购组织形式", name: "PurchaseOrganizationForm", width: 100, align: "left" },
+                    { label: "品牌", name: "Brand", width: 100, align: "left" },
+                    { label: "规格型号", name: "SpecificationModel", width: 100, align: "left" },
+                    {
+                        label: "存放地点", name: "StorageId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    callback(_data['sname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "销售商", name: "SupplierId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    callback(_data['sname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "使用权面积/建筑面积", name: "UseArea", width: 100, align: "left" },
+                    { label: "财政拨款", name: "FinancialAppropriation", width: 100, align: "left" },
+                    { label: "非财政拨款", name: "NonFinancialAppropriation", width: 100, align: "left" },
+                    { label: "会计凭证号", name: "AccountDocumentNumber", width: 100, align: "left" },
+                    {
+                        label: "折旧/摊销状态", name: "DepreciationStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DepreciationStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === 1) {
+                                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-danger\">审核未通过</span>';
+                            } else {
+                                return '<span class=\"label label-default\" >草稿</span>';
+                            }
+                        }
+                    }
+                ],
+                mainId: 'FAId',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.IsTeacher = "1";//控制老师查看的参数
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    
+    page.init();
+}

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

@@ -3,45 +3,50 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">申请人</div>
         <input id="CreateUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">联系方式</div>
-        <input id="ContactWay" type="text" class="form-control"  />
+        <input id="ContactWay" type="text" class="form-control" readonly />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
-        <div id="UsePeople" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="UsePeople" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">联系方式<font face="宋体">*</font></div>
-        <input id="ContactWayNew" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ContactWayNew" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">是否归还<font face="宋体">*</font></div>
+        <div id="IsMark" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">卡片编号<font face="宋体">*</font></div>
-        <input id="CardNumber" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="FACode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+        <input id="FAId" hidden />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
-        <input id="FAName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="FAName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">现存放地点<font face="宋体">*</font></div>
-        <div id="StorageId" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="StorageId" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">存放地点新<font face="宋体">*</font></div>
-        <div id="StorageIdNew" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="StorageIdNew" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">申请事由<font face="宋体">*</font></div>
-        <textarea id="ApplyReasons" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+        <textarea id="ApplyReasons" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">附件说明</div>
-        <div id="Files"  ></div>
+        <div id="Files"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/Form.js

@@ -45,26 +45,71 @@ var bootstrap = function ($, learun) {
             $('#CreateUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#CreateUser').val(learun.clientdata.get(['userinfo']).realName);
             $('#ContactWay').val(learun.clientdata.get(['userinfo']).mobile);
-            $('#UsePeople').lrGirdSelect({
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=FormulaMain',
-                selectWord: 'name',
-                value: 'id',
-                text: 'name',
+            $('#FACode').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_FixAssets',
+                param: { strWhere: " 1=1 and  usepeople ='" + learun.clientdata.get(['userinfo']).userId + "' " },
+                selectWord: 'faname',
+                value: 'facode',
+                text: 'faname',
                 headData:
                     [
-                        { label: "公式", name: "result", width: 300, align: "left" },
-                        { label: "公式名称", name: "name", width: 300, align: "left" }
+                        { label: "主键", name: "faid", width: 300, align: "left", ishide: true },
+                        { label: "资产编号", name: "facode", width: 150, align: "left" },
+                        { label: "资产名称", name: "faname", width: 150, align: "left" },
+                        {
+                            label: "存放地点", name: "storageid", width: 150, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                    key: value,
+                                    keyId: 'sid',
+                                    callback: function (_data) {
+                                        callback(_data['sname']);
+                                    }
+                                });
+                            }
+                        },
+                        {
+                            label: "使用人", name: "usepeople", width: 100, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                    key: value,
+                                    keyId: 'f_userid',
+                                    callback: function (_data) {
+                                        callback(_data['f_realname']);
+                                    }
+                                });
+                            }
+                        },
+
+
                     ],
                 select: function (item) {
                     //赋值
-                    $("#StuName").val(item.stuname);
-                    $("#StuId").val(item.stuno);
-                    $("#ClassNo").val(item.classno);
+                    $("#FACode").val(item.facode);
+                    $("#FAName").val(item.faname);
+                    $("#FAId").val(item.faid);
+                    //存放地点
+                    $("#StorageId").lrselectSet(item.storageid);
+                    $("#StorageIdNew").lrselectSet(item.storageid);
                 }
             });
-            $('#UsePeople').lrDataItemSelect({ code: '' });
-            //$('#StorageId').lrDataItemSelect({ code: '' });
-            //$('#StorageIdNew').lrDataItemSelect({ code: '' });
+            $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#UsePeople').lrDataSourceSelect({
+                code: 'teacheruserdata', value: 'f_userid', text: 'f_realname',
+                select: function (item) {
+                    if (item) {
+                        $("#ContactWayNew").val(item.f_mobile);
+                    }
+                }
+            });
+            $('#IsMark').lrselect({
+                data: [{ text: "是", value: "1" }, { text: "否", value: "0" }],
+                text: "text",
+                value: "value"
+            })
             $('#Files').lrUploader();
         },
         initData: function () {

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

@@ -0,0 +1,59 @@
+@{
+    ViewBag.Title = "Ass_FixAssetsApply";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">申请人</div>
+        <input id="CreateUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">联系方式</div>
+        <input id="ContactWay" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
+        <div id="UsePeople" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">联系方式<font face="宋体">*</font></div>
+        <input id="ContactWayNew" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">是否归还<font face="宋体">*</font></div>
+        <div id="IsMark" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">卡片编号<font face="宋体">*</font></div>
+        <input id="FACode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
+        <input id="FAName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">现存放地点<font face="宋体">*</font></div>
+        <div id="StorageId" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">存放地点新<font face="宋体">*</font></div>
+        <div id="StorageIdNew" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">申请事由<font face="宋体">*</font></div>
+        <textarea id="ApplyReasons" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" readonly></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">附件说明</div>
+        <div id="Files"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">部门负责人意见<font face="宋体">*</font></div>
+        <textarea id="Department" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">资产负责人意见<font face="宋体">*</font></div>
+        <textarea id="AssetsManagement" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js

@@ -0,0 +1,158 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-05-05 14:52
+ * 描  述：Ass_FixAssetsApply
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            //$('#CreateUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            //$('#CreateUser').val(learun.clientdata.get(['userinfo']).realName);
+            //$('#ContactWay').val(learun.clientdata.get(['userinfo']).mobile);
+            //$('#FACode').lrGirdSelect({
+            //    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_FixAssets',
+            //    selectWord: 'faname',
+            //    value: 'facode',
+            //    text: 'faname',
+            //    headData:
+            //        [
+            //            { label: "主键", name: "faid", width: 300, align: "left", ishide: true },
+            //            { label: "资产编号", name: "facode", width: 150, align: "left" },
+            //            { label: "资产名称", name: "faname", width: 150, align: "left" },
+            //            {
+            //                label: "存放地点", name: "storageid", width: 150, align: "left",
+            //                formatterAsync: function (callback, value, row, op, $cell) {
+            //                    learun.clientdata.getAsync('custmerData', {
+            //                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+            //                        key: value,
+            //                        keyId: 'sid',
+            //                        callback: function (_data) {
+            //                            callback(_data['sname']);
+            //                        }
+            //                    });
+            //                }
+            //            },
+
+            //        ],
+            //    select: function (item) {
+            //        //赋值
+            //        $("#FACode").val(item.facode);
+            //        $("#FAName").val(item.faname);
+            //        $("#FAId").val(item.faid);
+            //        //存放地点
+            //        $("#StorageId").lrselectSet(item.storageid);
+            //        $("#StorageIdNew").lrselectSet(item.storageid);
+            //    }
+            //});
+            $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#UsePeople').lrDataSourceSelect({
+                code: 'teacheruserdata', value: 'f_userid', text: 'f_realname',
+                select: function (item) {
+                    if (item) {
+                        $("#ContactWayNew").val(item.f_mobile);
+                    }
+                }
+            });
+            $('#IsMark').lrselect({
+                data: [{ text: "是", value: "1" }, { text: "否", value: "0" }],
+                text: "text",
+                value: "value"
+            })
+            $('#Files').lrUploader({ isUpload: false });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Ass_FixAssetsApply' && data[id]) {
+                            keyValue = data[id].ID;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.ProcessId = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}

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

@@ -13,11 +13,11 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-6 lr-form-item">
+                                @*<div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">申请人</div>
                                     <div id="CreateUser"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
+                                </div>*@
+                                <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">接收人</div>
                                     <div id="UsePeople"></div>
                                 </div>
@@ -31,7 +31,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">卡片编号</div>
-                                    <input id="CardNumber" type="text" class="form-control" />
+                                    <input id="FACode" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">资产名称</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/Index.js

@@ -45,11 +45,11 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
-            $('#CreateUser').lrUserSelect(0);
-            $('#UsePeople').lrDataItemSelect({ code: '' });
-            $('#StorageIdNew').lrDataItemSelect({ code: '' });
-            $('#StorageId').lrDataItemSelect({ code: '' });
+            }, 250, 400);
+            $('#CreateUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#UsePeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/Form',
-                    width: 600,
+                    width: 800,
                     height: 400,
                     callBack: function (id) {
                         var res = false;
@@ -68,8 +68,9 @@ var bootstrap = function ($, learun) {
                         res = top[id].validForm();
                         // 保存数据
                         if (res) {
-                            processId = learun.newGuid();
-                            res = top[id].save(processId, refreshGirdData);
+                            res = top[id].save('', function () {
+                                page.search();
+                            });
                         }
                         return res;
                     }
@@ -79,11 +80,21 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 0) {
+                        learun.alert.warning("当前项目不可编辑！");
+                        return;
+                    }
+                    var user = $('#gridtable').jfGridValue('CreateUser');
+                    if (user != learun.clientdata.get(['userinfo']).userId) {
+                        learun.alert.warning("当前项目不可编辑！");
+                        return;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/Form?keyValue=' + keyValue,
-                        width: 600,
+                        width: 800,
                         height: 400,
                         callBack: function (id) {
                             var res = false;
@@ -104,10 +115,20 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status > 0) {
+                        learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！");
+                        return;
+                    }
+                    var user = $('#gridtable').jfGridValue('CreateUser');
+                    if (user != learun.clientdata.get(['userinfo']).userId) {
+                        learun.alert.warning("当前项目不可删除！");
+                        return;
+                    }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
+                                page.search();
                             });
                         }
                     });
@@ -115,30 +136,47 @@ var bootstrap = function ($, learun) {
             });
             //提交
             $('#lr_submit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
+                var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
-                    if (FlowNo != 0) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 0) {
                         learun.alert.warning("当前项目已提交,请耐心等待审批!");
                         return;
                     }
+                    var user = $('#gridtable').jfGridValue('CreateUser');
+                    if (user != learun.clientdata.get(['userinfo']).userId) {
+                        learun.alert.warning("当前项目不可删除！");
+                        return;
+                    }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
                         if (res) {
                             processId = learun.newGuid();
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/ModifyStatus/ModifyStatus', { keyValue: keyValue, pastatus: 1, processId: processId }, function (res) {
+                            learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/ModifyStatus', { keyValue: keyValue, pastatus: 1, processId: processId }, function (res) {
                                 refreshGirdData(res, {});
                             });
                         }
                     });
                 }
             });
-            //  查看
+            // 查看申请
             $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formAss_FixAssets',
+                        title: '查看',
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/FormView?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        btn: null
+                    });
+                }
             });
+
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').lrAuthorizeJfGridLei({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/GetPageList',
                 headData: [
                     {
@@ -156,26 +194,28 @@ var bootstrap = function ($, learun) {
                     {
                         label: "接收人", name: "UsePeople", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
                                 key: value,
-                                code: '',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
                     },
                     { label: "联系方式", name: "ContactWayNew", width: 100, align: "left" },
-                    { label: "卡片编号", name: "CardNumber", width: 200, align: "left" },
+                    { label: "卡片编号", name: "FACode", width: 200, align: "left" },
                     { label: "资产名称", name: "FAName", width: 200, align: "left" },
                     {
-                        label: "现存放地点", name: "StorageId", width: 200, align: "left",
+                        label: "存放地点", name: "StorageId", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
-                                code: '',
+                                keyId: 'sid',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['sname']);
                                 }
                             });
                         }
@@ -183,11 +223,12 @@ var bootstrap = function ($, learun) {
                     {
                         label: "存放地点新", name: "StorageIdNew", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
-                                code: '',
+                                keyId: 'sid',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['sname']);
                                 }
                             });
                         }
@@ -205,16 +246,17 @@ var bootstrap = function ($, learun) {
                                 cache: false,
                                 success: function (res) {
                                     var bb = '';
+                                    //$.each(res.data, function (i, item) {
+                                    //    bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
+                                    //})
                                     $.each(res.data, function (i, item) {
-                                        bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
+                                        bb += '<span onclick="downLoad(\'' +
+                                            item.F_Id +
+                                            '\')" style="color:blue">' +
+                                            //item.F_FileName.substring(0, item.F_FileName.indexOf(".")) +
+                                            item.F_FileName +
+                                            '</span>,&nbsp;&nbsp;&nbsp;';
                                     })
-                                    //$.each(res.data, function(i, item) {
-                                    //    bb += '<span onclick="downLoad(\'' +
-                                    //        item.F_Id +
-                                    //        '\')" style="color:blue">' +
-                                    //        item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
-                                    //        '</span>,&nbsp;&nbsp;&nbsp;';
-                                    //})
                                     callback(bb);
                                 }
                             });
@@ -224,7 +266,7 @@ var bootstrap = function ($, learun) {
                         label: "审批状态", name: "Status", width: 100, align: "center",
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 0) {
-                                return '<span class=\"label label-warning\">草稿</span>';
+                                return '<span class=\"label label-primary\">草稿</span>';
                             } if (cellvalue == 1) {
                                 return '<span class=\"label label-warning\">审批中</span>';
                             } else if (cellvalue == 2) {
@@ -234,13 +276,16 @@ var bootstrap = function ($, learun) {
                     }
                 ],
                 mainId: 'ID',
-                isPage: true
+                isPage: true,
+                sidx: 'CreateUser,Status',
+                sord: 'desc',
             });
         },
         search: function (param) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.CreateUser = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
@@ -249,7 +294,7 @@ var bootstrap = function ($, learun) {
             if (res.code == 200) {
                 // 发起流程
                 var postData = {
-                    schemeCode: '',// 填写流程对应模板编号
+                    schemeCode: 'Ass_FixAssetsApply',// 填写流程对应模板编号
                     processId: processId,
                     level: '1',
                 };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/IndexView.cshtml

@@ -0,0 +1,57 @@
+@{
+    ViewBag.Title = "Ass_FixAssetsApply";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">申请人</div>
+                                    <div id="CreateUser"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">接收人</div>
+                                    <div id="UsePeople"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">存放地点新</div>
+                                    <div id="StorageIdNew"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">现存放地点</div>
+                                    <div id="StorageId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">卡片编号</div>
+                                    <input id="FACode" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">资产名称</div>
+                                    <input id="FAName" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <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_view"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/IndexView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/IndexView.js

@@ -0,0 +1,214 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-05-05 14:52
+ * 描  述：Ass_FixAssetsApply
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 250, 400);
+            $('#CreateUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#UsePeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看申请
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formAss_FixAssets',
+                        title: '查看',
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/FormView?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
+
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/GetPageList',
+                headData: [
+                    {
+                        label: "申请人", name: "CreateUser", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "联系方式", name: "ContactWay", width: 100, align: "left" },
+                    {
+                        label: "接收人", name: "UsePeople", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "联系方式", name: "ContactWayNew", width: 100, align: "left" },
+                    { label: "卡片编号", name: "FACode", width: 200, align: "left" },
+                    { label: "资产名称", name: "FAName", width: 200, align: "left" },
+                    {
+                        label: "存放地点", name: "StorageId", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    callback(_data['sname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "存放地点新", name: "StorageIdNew", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    callback(_data['sname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "申请事由", name: "ApplyReasons", width: 240, align: "left" },
+                    {
+                        label: "附件说明", name: "Files", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    var bb = '';
+                                    //$.each(res.data, function (i, item) {
+                                    //    bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
+                                    //})
+                                    $.each(res.data, function (i, item) {
+                                        bb += '<span onclick="downLoad(\'' +
+                                            item.F_Id +
+                                            '\')" style="color:blue">' +
+                                            //item.F_FileName.substring(0, item.F_FileName.indexOf(".")) +
+                                            item.F_FileName +
+                                            '</span>,&nbsp;&nbsp;&nbsp;';
+                                    })
+                                    callback(bb);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "审批状态", name: "Status", width: 100, align: "center",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-primary\">草稿</span>';
+                            } if (cellvalue == 1) {
+                                return '<span class=\"label label-warning\">审批中</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-success\">审批通过</span>';
+                            }
+                        }
+                    }
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'CreateUser,Status',
+                sord: 'desc',
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            param.SqlParameter = " and Status != 0 ";
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (!!res) {
+            if (res.code == 200) {
+                // 发起流程
+                var postData = {
+                    schemeCode: 'Ass_FixAssetsApply',// 填写流程对应模板编号
+                    processId: processId,
+                    level: '1',
+                };
+                learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                    learun.loading(false);
+                });
+            }
+            page.search();
+        }
+    };
+    page.init();
+}
+function downLoad(fileId, fileTwo) {
+    if (fileTwo) {
+
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoOfElectiveOnlineController.cs

@@ -0,0 +1,136 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-05-29 14:28
+    /// 描 述：线上课程
+    /// </summary>
+    public class LessonInfoOfElectiveOnlineController : MvcControllerBase
+    {
+        private LessonInfoOfElectiveOnlineIBLL lessonInfoOfElectiveOnlineIBLL = new LessonInfoOfElectiveOnlineBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = lessonInfoOfElectiveOnlineIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LessonInfoOfElectiveOnlineData = lessonInfoOfElectiveOnlineIBLL.GetLessonInfoOfElectiveOnlineEntity(keyValue);
+            var jsonData = new
+            {
+                LessonInfoOfElectiveOnline = LessonInfoOfElectiveOnlineData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            lessonInfoOfElectiveOnlineIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            LessonInfoOfElectiveOnlineEntity entity = strEntity.ToObject<LessonInfoOfElectiveOnlineEntity>();
+            lessonInfoOfElectiveOnlineIBLL.SaveEntity(keyValue, entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 启用/停用实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoLock(string keyValue, string status)
+        {
+            lessonInfoOfElectiveOnlineIBLL.DoLock(keyValue, status);
+            return Success("操作成功！");
+        }
+
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolLevelScholarshipController.cs

@@ -43,6 +43,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 表单页【查看】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+        /// <summary>
         /// 表单页
         /// <summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuFellowshipController.cs

@@ -49,6 +49,26 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             ViewBag.ClassNo = ClassNos.TrimEnd(',');
             return View();
         }
+        /// <summary>
+         /// 表单页【查看】
+         /// </summary>
+         /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            var logUser = LoginUserInfo.Get();
+            var ClassNos = "";
+            var Classinfo = classInfoIBLL.GetAllClass().Where(x => x.ClassTutorNo == logUser.account).ToList();
+            if (Classinfo.Any())
+            {
+                foreach (var item in Classinfo)
+                {
+                    ClassNos += item.ClassNo + ",";
+                }
+            }
+            ViewBag.ClassNo = ClassNos.TrimEnd(',');
+            return View();
+        }
         /// <summary>
         /// 主页面【二级学院】
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.cshtml

@@ -35,5 +35,9 @@
         <div class="lr-form-item-title">心理负责人</div>
         <div id="DeptpSychology"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="CdDept">
+        <div class="lr-form-item-title">资助审核人</div>
+        <div id="DeptSubsidizer"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/CdDept/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.js

@@ -18,6 +18,7 @@ var bootstrap = function ($, learun) {
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#DeptDirector').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
             $('#DeptpSychology').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+            $('#DeptSubsidizer').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Index.js

@@ -114,6 +114,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "资助审核人", name: "DeptSubsidizer", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_encode',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'DeptId',
                 isMultiselect: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LanMail/Index.js

@@ -296,7 +296,7 @@ var bootstrap = function ($, learun) {
                 var $parent = $this.parent();
                 $parent.find('.active').removeClass('active');
                 $this.addClass('active');
-                var data_value = $this.context.dataset.value;
+                var data_value = $this[0].dataset.value;
                 switch (data_value) {
                     case "1"://写邮件
                         $("#lr_edit").hide();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfoOfElectiveOnline/Form.cshtml

@@ -0,0 +1,32 @@
+@{
+    ViewBag.Title = "线上课程";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="LessonInfoOfElectiveOnline" >
+        <div class="lr-form-item-title">课程编号<font face="宋体">*</font></div>
+        <input id="LessonNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="LessonInfoOfElectiveOnline" >
+        <div class="lr-form-item-title">课程名称<font face="宋体">*</font></div>
+        <input id="LessonName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="LessonInfoOfElectiveOnline" >
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="LessonInfoOfElectiveOnline" >
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="LessonInfoOfElectiveOnline">
+        <div class="lr-form-item-title">建课教师<font face="宋体">*</font></div>
+        <div id="EmpNo" isvalid="yes" checkexpession="NotNull"></div>
+        <input id="EmpName" type="text" class="form-control hide"/>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="LessonInfoOfElectiveOnline" >
+        <div class="lr-form-item-title">建课学校<font face="宋体">*</font></div>
+        <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/LessonInfoOfElectiveOnline/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfoOfElectiveOnline/Form.js

@@ -0,0 +1,73 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-05-29 14:28
+ * 描  述：线上课程
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            $('#EmpNo').lrDataSourceSelect({
+                code: 'EmpInfo', value: 'empno', text: 'empname', select: function (item) {
+                    if (!!item) {
+                        $('#EmpName').val(item.empname);
+                    }
+                }
+            });
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company',value: 'f_companyid',text: 'f_fullname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/LessonInfoOfElectiveOnline/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!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 + '/EducationalAdministration/LessonInfoOfElectiveOnline/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfoOfElectiveOnline/Index.cshtml

@@ -0,0 +1,58 @@
+@{
+    ViewBag.Title = "线上课程";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">课程编号</div>
+                                    <input id="LessonNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">课程名称</div>
+                                    <input id="LessonName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">建课教师</div>
+                                    <div id="EmpNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">是否启用</div>
+                                    <div id="CheckMark"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <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_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_lock" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;启用</a>
+                        <a id="lr_unlock" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;停用</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/LessonInfoOfElectiveOnline/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfoOfElectiveOnline/Index.js

@@ -0,0 +1,186 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-05-29 14:28
+ * 描  述：线上课程
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 300, 400);
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+            $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/LessonInfoOfElectiveOnline/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckMark = $('#gridtable').jfGridValue('CheckMark');
+                    if (CheckMark === "1") {
+                        learun.alert.warning("当前课程已启用不能编辑！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/LessonInfoOfElectiveOnline/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckMark = $('#gridtable').jfGridValue('CheckMark');
+                    if (CheckMark === "1") {
+                        learun.alert.warning("当前课程已启用不能删除！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/LessonInfoOfElectiveOnline/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //启用
+            $('#lr_lock').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckMark = $('#gridtable').jfGridValue('CheckMark');
+                    if (CheckMark == "1") {
+                        learun.alert.warning("当前课程已启用！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认启用该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/LessonInfoOfElectiveOnline/DoLock', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //停用
+            $('#lr_unlock').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckMark = $('#gridtable').jfGridValue('CheckMark');
+                    if (CheckMark != "1") {
+                        learun.alert.warning("当前课程未启用无法停用！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认停用该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/LessonInfoOfElectiveOnline/DoLock', { keyValue: keyValue, status: "0" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/LessonInfoOfElectiveOnline/GetPageList',
+                headData: [
+                    { label: "课程编号", name: "LessonNo", width: 150, align: "left" },
+                    { label: "课程名称", name: "LessonName", width: 150, align: "left" },
+                    { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
+                    { label: "学期", name: "Semester", width: 100, align: "left" },
+                    {
+                        label: "建课教师", name: "EmpNo", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                key: value,
+                                keyId: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "建课学校", name: "F_SchoolId", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "是否启用", name: "CheckMark", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == 1 ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'MakeDate desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.cshtml

@@ -88,7 +88,7 @@
         <div class="lr-form-item-title">备注</div>
         <textarea id="Remark" class="form-control" style="height: 50px;" isvalid="yes" checkexpession="LenStrOrNull" length="100" placeholder="字符长度最多为100位"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item" id="FilesDiv">
+    <div class="col-xs-12 lr-form-item" id="FilesDiv" data-table="SchoolLevelScholarship">
         <div class="lr-form-item-title">附件</div>
         <div id="Url"></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/FormView.cshtml

@@ -0,0 +1,95 @@
+@{
+    ViewBag.Title = "校级奖学金";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" readonly isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">所属院系</div>
+        <div id="DeptNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">所属班级</div>
+        <div id="ClassNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
+        <div id="IdCardType" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">身份证件号</div>
+        <input id="IdCard" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">学年</div>
+        <input id="AcademicYearNo" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">学期</div>
+        <input id="Semester" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">班级总人数<font face="宋体">*</font></div>
+        <input id="CalssNum" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">成绩排名名次<font face="宋体">*</font></div>
+        <input id="ClassRank" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">开户银行</div>
+        <div id="DepositBank" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">开户行账号</div>
+        <input id="BankCard" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">开户行号</div>
+        <input id="BankCode" type="text" class="form-control" value="20230307230"  readonly/>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">资助等级<font face="宋体">*</font></div>
+        <div id="FundingLevel" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">资助标准<font face="宋体">*</font></div>
+        <input id="FundingCriteria" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">应发金额<font face="宋体">*</font></div>
+        <input id="ShoudAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">实发金额<font face="宋体">*</font></div>
+        <input id="ActualAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">申请日期</div>
+        <input id="ApplyDate" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">发放日期<font face="宋体">*</font></div>
+        <input id="ProvideDate" type="text" class="form-control lr-input-wdatepicker" readonly isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">申请理由<font face="宋体">*</font></div>
+        <textarea id="ApplyAccount" class="form-control" readonly style="height:50px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" readonly style="height: 50px;" isvalid="yes" checkexpession="LenStrOrNull" length="100" placeholder="字符长度最多为100位"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" id="FilesDiv" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">附件</div>
+        <div id="Url"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/FormView.js

@@ -0,0 +1,97 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-16 11:49
+ * 描  述：校级奖学金
+ */
+var acceptClick;
+var bindData;
+var keyValue = request('keyValue');
+var Step = request('Step');//第几步
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.hide();
+            page.bind();
+            page.initData();
+        },
+        hide: function () {
+            if (Step == "2") {//第二步：二级学院审核，时附件显示且必填；
+                $('#FilesDiv').show();
+                $('#Url').attr('isvalid', 'yes');
+                $('#Url').attr('checkexpession', 'NotNull');
+                $('#Url').prev().html('附件<font face="宋体">*</font>');
+            } else {
+                $('#Url').removeAttr('isvalid');
+                $('#Url').removeAttr('checkexpession');
+                $('#Url').prev().html('附件');
+                $('#FilesDiv').hide();
+            }
+        },
+        bind: function () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
+            $('#IdCardType').lrselectSet("01");
+            $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' });
+            $('#FundingLevel').lrDataItemSelect({
+                code: 'SchoolFundingLevel',
+                select: function (item) {
+                    if (!!item) {
+                        $('#FundingCriteria').val(item.id);
+                        $('#ShoudAmount').val(item.id);
+                        $('#ActualAmount').val(item.id);
+                    }
+                }
+            });
+            $('#Url').lrUploader({ isUpload: false });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!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 + '/EducationalAdministration/SchoolLevelScholarship/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    bindData = function (data) {
+        if (!!data) {
+            $('#StuName').val(data.StuName);
+            $('#StuNo').val(data.StuNo);
+            $('#DeptNo').lrselectSet(data.DeptNo);
+            $('#ClassNo').lrselectSet(data.ClassNo);
+            $('#IdCard').val(data.IdCard);
+            $('#AcademicYearNo').val(data.AcademicYearNo);
+            $('#Semester').val(data.Semester);
+            $('#CalssNum').val(data.StuNum);
+            $('#ClassRank').val(data.Num);
+            $('#DepositBank').lrselectSet(data.DepositBank);
+            $('#BankCard').val(data.BankCard);
+        }
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml

@@ -63,6 +63,7 @@
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交二级学院</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -62,7 +62,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -72,8 +72,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#FundingLevel').lrDataItemSelect({ code: 'SchoolFundingLevel' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -149,6 +169,20 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/FormView?keyValue=' + keyValue,
+                        width: 1100,
+                        height: 700,
+                        btn: null
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -168,7 +202,7 @@ var bootstrap = function ($, learun) {
                                  }
                              });
                         }},
-                    { label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                    { label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('custmerData', {
                                  url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -183,7 +217,7 @@ var bootstrap = function ($, learun) {
                         label: "身份证件类型", name: "IdCardType", width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -299,6 +333,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'CreateTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
@@ -306,6 +341,9 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.StartTimeRelease = startTimeRelease;
             param.EndTimeRelease = endTimeRelease;
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
+                param.CreateUserNo = learun.clientdata.get(['userinfo']).account;//辅导员
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfStudent.cshtml

@@ -58,6 +58,7 @@
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfStudent.js

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -62,7 +62,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -72,48 +72,86 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#FundingLevel').lrDataItemSelect({ code: 'SchoolFundingLevel' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/FormView?keyValue=' + keyValue,
+                        width: 1100,
+                        height: 700,
+                        btn: null
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left"},
-                    { label: "姓名", name: "StuName", width: 100, align: "left"},
-                    { label: "所属院系", name: "DeptNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('custmerData', {
-                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                 key: value,
-                                 keyId: 'deptno',
-                                 callback: function (_data) {
-                                     callback(_data['deptname']);
-                                 }
-                             });
-                        }},
-                    { label: "所属班级", name: "ClassNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('custmerData', {
-                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
-                                 key: value,
-                                 keyId: 'classno',
-                                 callback: function (_data) {
-                                     callback(_data['classname']);
-                                 }
-                             });
-                        }},
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "所属院系", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "所属班级", name: "ClassNo", width: 120, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "身份证件类型", name: "IdCardType", width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -121,24 +159,26 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "身份证件号", name: "IdCard", width: 100, align: "left"},
+                    { label: "身份证件号", name: "IdCard", width: 100, align: "left" },
                     { label: "学年", name: "AcademicYearNo", width: 50, align: "left" },
                     { label: "学期", name: "Semester", width: 50, align: "left" },
-                    { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"},
-                    { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"},
-                    { label: "资助等级", name: "FundingLevel", width: 70, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'SchoolFundingLevel',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
-                    { label: "资助标准", name: "FundingCriteria", width: 70, align: "left"},
-                    { label: "应发金额", name: "ShoudAmount", width: 70, align: "left"},
-                    { label: "实发金额", name: "ActualAmount", width: 70, align: "left"},
+                    { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left" },
+                    { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left" },
+                    {
+                        label: "资助等级", name: "FundingLevel", width: 70, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'SchoolFundingLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "资助标准", name: "FundingCriteria", width: 70, align: "left" },
+                    { label: "应发金额", name: "ShoudAmount", width: 70, align: "left" },
+                    { label: "实发金额", name: "ActualAmount", width: 70, align: "left" },
                     {
                         label: "申请日期", name: "ApplyDate", width: 100, align: "left",
                         formatter: function (cellvalue) {
@@ -151,7 +191,7 @@ var bootstrap = function ($, learun) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
                     },
-                    { label: "申请理由", name: "ApplyAccount", width: 100, align: "left"},
+                    { label: "申请理由", name: "ApplyAccount", width: 100, align: "left" },
                     {
                         label: "开户银行", name: "DepositBank", width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
@@ -164,8 +204,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "开户行账号", name: "BankCard", width: 100, align: "left"},
-                    { label: "开户行号", name: "BankCode", width: 100, align: "left"},
+                    { label: "开户行账号", name: "BankCard", width: 100, align: "left" },
+                    { label: "开户行号", name: "BankCode", width: 100, align: "left" },
                     { label: "备注说明", name: "Remark", width: 100, align: "left" },
                     {
                         label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) {
@@ -225,10 +265,11 @@ var bootstrap = function ($, learun) {
                     },
                     { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" },
                 ],
-                mainId:'Id',
+                mainId: 'Id',
                 isPage: true,
                 sidx: 'CreateTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
@@ -236,7 +277,10 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.StartTimeRelease = startTimeRelease;
             param.EndTimeRelease = endTimeRelease;
-            param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
+                param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+                param.Status = 3;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.cshtml

@@ -64,6 +64,10 @@
                         <a id="lr_back" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回辅导员</a>
                         <a id="lr_backTwo" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回二级学院</a>
                     </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
+                        <a id="lr_submitCancel" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;取消归档</a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.js

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -62,7 +62,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -72,8 +72,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#FundingLevel').lrDataItemSelect({ code: 'SchoolFundingLevel' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -133,6 +153,38 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 取消归档
+            $('#lr_submitCancel').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "3") {
+                        learun.alert.warning("当前项不属于归档状态，无法取消归档！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认取消归档该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoBack', { keyValue: keyValue, status: '2', step: '3' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/FormView?Step=2&keyValue=' + keyValue,
+                        width: 1100,
+                        height: 700,
+                        btn: null
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -152,7 +204,7 @@ var bootstrap = function ($, learun) {
                                  }
                              });
                         }},
-                    { label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                    { label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('custmerData', {
                                  url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -167,7 +219,7 @@ var bootstrap = function ($, learun) {
                         label: "身份证件类型", name: "IdCardType", width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -283,6 +335,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'FirstCheckTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.cshtml

@@ -60,7 +60,8 @@
                         <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_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;上传附件</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交学工部</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.js

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -62,7 +62,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -72,8 +72,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#FundingLevel').lrDataItemSelect({ code: 'SchoolFundingLevel' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -90,7 +110,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerForm({
                         id: 'formOfTwo',
-                        title: '审核',
+                        title: '上传附件',
                         url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form?Step=2&keyValue=' + keyValue,
                         width: 1100,
                         height: 700,
@@ -136,6 +156,20 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/FormView?Step=2&keyValue=' + keyValue,
+                        width: 1100,
+                        height: 700,
+                        btn: null
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -155,7 +189,7 @@ var bootstrap = function ($, learun) {
                                  }
                              });
                         }},
-                    { label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                    { label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('custmerData', {
                                  url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -170,7 +204,7 @@ var bootstrap = function ($, learun) {
                         label: "身份证件类型", name: "IdCardType", width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -286,6 +320,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Form.cshtml

@@ -44,7 +44,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
         <div class="lr-form-item-title">开户行号<font face="宋体">*</font></div>
-        <input id="OpenBankNo" type="text" class="form-control" readonly value="20230307230" />
+        <input id="OpenBankNo" type="text" class="form-control" value="20230307230" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
         <div class="lr-form-item-title">资助等级<font face="宋体">*</font></div>
@@ -78,7 +78,7 @@
         <div class="lr-form-item-title">备注说明</div>
         <textarea id="Remark" class="form-control" style="height: 50px;" isvalid="yes" checkexpession="LenStrOrNull" length="100" placeholder="字符长度最多为100位"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item" id="FilesDiv">
+    <div class="col-xs-12 lr-form-item" id="FilesDiv" data-table="StuFellowship">
         <div class="lr-form-item-title">附件</div>
         <div id="Files"></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Form.js

@@ -13,7 +13,7 @@ if (Types != null && Types != undefined && Types != "") {
 }
 var strWhere = "";//点击学号弹出框条件
 if (classs != "" && classs != undefined && classs != null) {
-    strWhere = " and classno in (" + classs + ") ";
+    strWhere = " and classno in ('" + classs.replaceAll(",", "','") + "') ";
 }
 var bootstrap = function ($, learun) {
     "use strict";

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/FormView.cshtml

@@ -0,0 +1,87 @@
+@{
+    ViewBag.Title = "定制功能助学金";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script type="text/javascript">
+    var classs = "@ViewBag.ClassNo";
+</script>
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship" style="display:none;">
+        <div class="lr-form-item-title">助学金类型</div>
+        <input id="Types" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <div id="StuNo" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="StuName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">院系</div>
+        <div id="DeptNo" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">班级</div>
+        <div id="ClassNo" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
+        <div id="IdCardType" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">身份证件号</div>
+        <input id="IdentityCardNo" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">开户银行</div>
+        <div id="OpenBank" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">开户卡账号</div>
+        <input id="OpenAccount" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">开户行号<font face="宋体">*</font></div>
+        <input id="OpenBankNo" type="text" class="form-control" value="20230307230"  readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">资助等级<font face="宋体">*</font></div>
+        <div id="SubsidizeType" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">资助标准<font face="宋体">*</font></div>
+        <input id="FunderNationStandard" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">应发金额<font face="宋体">*</font></div>
+        <input id="AmountPayable" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">实发金额<font face="宋体">*</font></div>
+        <input id="FinalPayingAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">申请日期<font face="宋体">*</font></div>
+        <input id="ApplyDate" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">发放日期<font face="宋体">*</font></div>
+        <input id="ReleaseDate" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">申请理由<font face="宋体">*</font></div>
+        <textarea id="ApplyReason" class="form-control" style="height: 100px;" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">备注说明</div>
+        <textarea id="Remark" class="form-control" style="height: 50px;" readonly="readonly"  isvalid="yes" checkexpession="LenStrOrNull" length="100" placeholder="字符长度最多为100位"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" id="FilesDiv" data-table="StuFellowship">
+        <div class="lr-form-item-title">附件</div>
+        <div id="Files" readonly="readonly" ></div>
+    </div>
+
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuFellowship/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/FormView.js

@@ -0,0 +1,119 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-13 10:37
+ * 描  述：定制功能助学金
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var Step = request('Step');//第几步
+var Types = request('Types');//助学金类型：1国家助学金，2校级助学金
+if (Types != null && Types != undefined && Types != "") {
+    $('#Types').val(Types);
+}
+var strWhere = "";//点击学号弹出框条件
+if (classs != "" && classs != undefined && classs != null) {
+    strWhere = " and classno in ('" + classs.replaceAll(",", "','") + "') ";
+}
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.hide();
+            page.bind();
+            page.initData();
+        },
+        hide: function () {
+            if (Step == "2") {//第二步：二级学院审核，时附件显示且必填；
+                $('#FilesDiv').show();
+                $('#Files').attr('isvalid', 'yes');
+                $('#Files').attr('checkexpession', 'NotNull');
+                $('#Files').prev().html('附件<font face="宋体">*</font>');
+            } else {
+                $('#Files').removeAttr('isvalid');
+                $('#Files').removeAttr('checkexpession');
+                $('#Files').prev().html('附件');
+                $('#FilesDiv').hide();
+            }
+        },
+        bind: function () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
+            $('#IdCardType').lrselectSet("01");
+            $('#OpenBank').lrDataItemSelect({ code: 'DepositBank' });
+            //判断登录用户所带班级：学生弹框显示所带班级学生
+            $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuno' });
+
+            //判断助学金类型：1国家助学金，2校级助学金
+            if (Types == "1") {
+                $('#SubsidizeType').lrDataItemSelect({
+                    code: 'StateStipend',
+                    select: function (item) {
+                        //系统自动带出标准、应发金额和实发金额
+                        if (item != null && item != undefined) {
+                            $("#FunderNationStandard").val(item.id);
+                            $("#FinalPayingAmount").val(item.id);
+                            $("#AmountPayable").val(item.id);
+                        }
+                    }
+                });
+            } else if (Types == "2") {
+                $('#SubsidizeType').lrDataItemSelect({
+                    code: 'SchoolStipend',
+                    select: function (item) {
+                        //系统自动带出标准、应发金额和实发金额
+                        if (item != null && item != undefined) {
+                            $("#FunderNationStandard").val(item.id);
+                            $("#FinalPayingAmount").val(item.id);
+                            $("#AmountPayable").val(item.id);
+                        }
+                    }
+                });
+            }
+
+            $('#Files').lrUploader({ isUpload: false });
+
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                        //判断身份证件类型为空时，默认选择“居民身份证”
+                        if (data[id].IdCardType == null || data[id].IdCardType == "" || data[id].IdCardType == undefined) {
+                            $('#IdCardType').lrselectSet("01");
+                        }
+                    }
+
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        var postDatas = {
+            strEntity: JSON.stringify(postData)
+        };
+
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/SaveForm?keyValue=' + keyValue, postDatas, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.cshtml

@@ -67,10 +67,11 @@
                     <div class=" btn-group btn-group-sm">
                         <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">
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                     </div>
                     <div class=" btn-group btn-group-sm"  learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交二级学院</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.js

@@ -37,7 +37,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -63,7 +63,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -74,8 +74,28 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 350, 400);
             //下拉框绑定
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
 
             //判断助学金类型：1国家助学金，2校级助学金
             if (types == "1") {
@@ -158,6 +178,20 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/FormView?Types=' + types + '&keyValue=' + keyValue,
+                        width: 1000,
+                        height: 600,
+                        btn:null
+                    });
+                }
+            });
         },
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -179,7 +213,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -195,7 +229,7 @@ var bootstrap = function ($, learun) {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -309,6 +343,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'CreateTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
@@ -317,6 +352,9 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.StartTimeRelease = startTimeRelease;
             param.EndTimeRelease = endTimeRelease;
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
+                param.CreateUserNo = learun.clientdata.get(['userinfo']).account;//辅导员
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfStudent.cshtml

@@ -68,6 +68,7 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfStudent.js

@@ -37,7 +37,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -63,7 +63,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -74,9 +74,29 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 350, 400);
             //下拉框绑定
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
+
             //判断助学金类型：1国家助学金，2校级助学金
             if (types == "1") {
                 $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' });
@@ -88,6 +108,20 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/FormView?Types=' + types + '&keyValue=' + keyValue,
+                        width: 1000,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
         },
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -109,7 +143,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -125,7 +159,7 @@ var bootstrap = function ($, learun) {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -234,6 +268,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
@@ -242,7 +277,10 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.StartTimeRelease = startTimeRelease;
             param.EndTimeRelease = endTimeRelease;
-            param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
+                param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+                param.Status = 3;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfThree.cshtml

@@ -72,6 +72,10 @@
                         <a id="lr_back" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回辅导员</a>
                         <a id="lr_backTwo" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回二级学院</a>
                     </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
+                        <a id="lr_submitCancel" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;取消归档</a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfThree.js

@@ -37,7 +37,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -63,7 +63,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -74,8 +74,28 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 350, 400);
             //下拉框绑定
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
 
             //判断助学金类型：1国家助学金，2校级助学金
             if (types == "1") {
@@ -142,6 +162,38 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 取消归档
+            $('#lr_submitCancel').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "3") {
+                        learun.alert.warning("当前项不属于归档状态，无法取消归档！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认取消归档该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/DoBack', { keyValue: keyValue, status: '2', step: '3' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/FormView?Types=' + types + '&Step=2&keyValue=' + keyValue,
+                        width: 1000,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
         },
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -163,7 +215,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -179,7 +231,7 @@ var bootstrap = function ($, learun) {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -288,6 +340,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'FirstCheckTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.cshtml

@@ -67,8 +67,9 @@
                     <div class=" btn-group btn-group-sm">
                         <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_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核</a>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;上传附件</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                     </div>
                     <div class=" btn-group btn-group-sm"  learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交学工部</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js

@@ -37,7 +37,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -63,7 +63,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -74,8 +74,28 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 350, 400);
             //下拉框绑定
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
 
             //判断助学金类型：1国家助学金，2校级助学金
             if (types == "1") {
@@ -99,7 +119,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerForm({
                         id: 'formOfTwo',
-                        title: '审核',
+                        title: '上传附件',
                         url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form?Types=' + types + '&Step=2&keyValue=' + keyValue,
                         width: 1000,
                         height: 600,
@@ -145,6 +165,20 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/FormView?Types=' + types + '&Step=2&keyValue=' + keyValue,
+                        width: 1000,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
         },
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -166,7 +200,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -182,7 +216,7 @@ var bootstrap = function ($, learun) {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -291,6 +325,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js

@@ -1922,7 +1922,11 @@ var bootstrap = function ($, learun) {
                 }
 
                 if (!!iframeObj.$) {
-                    callback(iframeObj, formData);
+                    //callback(iframeObj, formData);
+                    //优化审批页面‘表单信息’选项卡中的数据无法回显问题；
+                    setTimeout(function () {
+                        callback(iframeObj, formData);
+                    }, 10);
                 }
             };
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs

@@ -7,6 +7,7 @@ using Learun.Application.Base.SystemModule;
 using System;
 using System.Drawing;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.AssetManagementSystem;
 
 namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
 {
@@ -22,7 +23,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
         private ExcelImportIBLL excelImportIBLL = new ExcelImportBLL();
         private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
         private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
-        
+        private Ass_FixAssetsIBLL ass_FixAssetsIBLL = new Ass_FixAssetsBLL();
+
         #region  视图功能
         /// <summary>
         /// 导入模板管理页面
@@ -209,10 +211,10 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public ActionResult ExecuteImportExcel(string templateId, string fileId, int chunks,string ext)
+        public ActionResult ExecuteImportExcel(string templateId, string fileId, int chunks, string ext)
         {
             UserInfo userInfo = LoginUserInfo.Get();
-            string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "."+ ext, chunks, userInfo);
+            string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "." + ext, chunks, userInfo);
             if (!string.IsNullOrEmpty(path))
             {
                 DataTable dt = ExcelHelper.ExcelImport(path);
@@ -239,14 +241,14 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public ActionResult ExecuteImportSaralExcel(string fileId, int chunks,string ext)
+        public ActionResult ExecuteImportSaralExcel(string fileId, int chunks, string ext)
         {
             UserInfo userInfo = LoginUserInfo.Get();
-            string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "."+ ext, chunks, userInfo);
+            string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "." + ext, chunks, userInfo);
             if (!string.IsNullOrEmpty(path))
             {
                 DataTable dt = ExcelHelper.ExcelImport(path);
-                string res = excelImportIBLL.ImportSalaryInfo(dt,fileId);
+                string res = excelImportIBLL.ImportSalaryInfo(dt, fileId);
                 var data = new
                 {
                     Success = res.Split('|')[0],
@@ -269,14 +271,14 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public ActionResult EmpInfoImport(string fileId, int chunks,string ext)
+        public ActionResult EmpInfoImport(string fileId, int chunks, string ext)
         {
             UserInfo userInfo = LoginUserInfo.Get();
-            string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "."+ ext, chunks, userInfo);
+            string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "." + ext, chunks, userInfo);
             if (!string.IsNullOrEmpty(path))
             {
                 DataTable dt = ExcelHelper.ExcelImport(path);
-                string res = excelImportIBLL.EmpInfoImport(dt,fileId);
+                string res = excelImportIBLL.EmpInfoImport(dt, fileId);
                 var data = new
                 {
                     Success = res.Split('|')[0],
@@ -300,14 +302,14 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public ActionResult StuInfoBasicImport(string fileId, int chunks, string ext,string classno)
+        public ActionResult StuInfoBasicImport(string fileId, int chunks, string ext, string classno)
         {
             UserInfo userInfo = LoginUserInfo.Get();
             string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "." + ext, chunks, userInfo);
             if (!string.IsNullOrEmpty(path))
             {
                 DataTable dt = ExcelHelper.ExcelImport(path);
-                var res = stuInfoBasicIBLL.StuInfoBasicUpdateImport(dt, fileId,classno);
+                var res = stuInfoBasicIBLL.StuInfoBasicUpdateImport(dt, fileId, classno);
                 var data = new
                 {
                     Success = res.snum,
@@ -320,6 +322,38 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                 return Fail("导入数据失败!");
             }
         }
+
+        /// <summary>
+        /// 工资条导入
+        /// </summary>
+        /// <param name="templateId">模板Id</param>
+        /// <param name="fileId">文件主键</param>
+        /// <param name="chunks">分片数</param>
+        /// <param name="ext">文件扩展名</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public ActionResult Ass_FixAssetsImport(string fileId, int chunks, string ext)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "." + ext, chunks, userInfo);
+            if (!string.IsNullOrEmpty(path))
+            {
+                DataTable dt = ExcelHelper.ExcelImport(path);
+                string res = ass_FixAssetsIBLL.AssFixAssetsImport(dt, fileId);
+                var data = new
+                {
+                    Success = res.Split('|')[0],
+                    Fail = res.Split('|')[1]
+                };
+                return JsonResult(data);
+            }
+            else
+            {
+                return Fail("导入数据失败!");
+            }
+        }
+
         /// <summary>
         /// 下载文件(导入文件未被导入的数据)
         /// </summary>
@@ -327,7 +361,7 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public void DownImportErrorFile(string fileId,string fileName)
+        public void DownImportErrorFile(string fileId, string fileName)
         {
             //设置导出格式
             ExcelConfig excelconfig = new ExcelConfig();
@@ -358,7 +392,7 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                     });
                 }
 
-              
+
             }
             ExcelHelper.ExcelDownload(dt, excelconfig);
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Controllers/FamilyEconomyController.cs

@@ -51,6 +51,26 @@ namespace Learun.Application.Web.Areas.StudentWork.Controllers
             return View();
         }
         /// <summary>
+        /// 表单页【查看】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            var logUser = LoginUserInfo.Get();
+            var ClassNos = "";
+            var Classinfo = classInfoIBLL.GetAllClass().Where(x => x.ClassTutorNo == logUser.account).ToList();
+            if (Classinfo.Any())
+            {
+                foreach (var item in Classinfo)
+                {
+                    ClassNos += item.ClassNo + ",";
+                }
+            }
+            ViewBag.ClassNo = ClassNos.TrimEnd(',');
+            return View();
+        }
+        /// <summary>
         /// 主页面【二级学院】
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.cshtml

@@ -24,8 +24,8 @@
         <input id="StuName" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">院校</div>
-        <div id="F_SchoolId" type="text" class="form-control" readonly="readonly"></div>
+        <div class="lr-form-item-title">院系</div>
+        <div id="DeptNo" type="text" class="form-control" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">班级</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.js

@@ -9,7 +9,7 @@ var keyValue = request('keyValue');
 var Step = request('Step');//第几步
 var strWhere = "";//点击学号弹出框条件
 if (classs != "" && classs != undefined && classs != null) {
-    strWhere = " and classno in (" + classs + ") ";
+    strWhere = " and classno in ('" + classs.replaceAll(",", "','") + "') ";
 }
 var bootstrap = function ($, learun) {
     "use strict";
@@ -34,7 +34,7 @@ var bootstrap = function ($, learun) {
             }
         },
         bind: function () {
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
             $('#IdCardType').lrselectSet('01');
@@ -98,9 +98,9 @@ var bootstrap = function ($, learun) {
                     { label: "年级", name: "grade", width: 100, align: "left" }
                 ],
                 select: function (item) {
-                    //自动带出内容：姓名 院校 班级 身份证件号 身份证件类型
+                    //自动带出内容：姓名 院系 班级 身份证件号 身份证件类型
                     $("#StuName").val(item.stuname);
-                    $("#F_SchoolId").lrselectSet(item.f_schoolid);
+                    $("#DeptNo").lrselectSet(item.deptno);
                     $("#ClassNo").lrselectSet(item.classno);
                     $("#IdentityCardNo").val(item.identitycardno);
                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/FormView.cshtml

@@ -0,0 +1,195 @@
+@{
+    ViewBag.Title = "家庭经济信息（辅导员）";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<style>
+    .lr-form-item-title {
+        width: 155px;
+    }
+
+    .lr-form-item {
+        padding-left: 155px;
+    }
+</style>
+<script type="text/javascript">
+    var classs = "@ViewBag.ClassNo";
+</script>
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <div id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="StuName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">院系</div>
+        <div id="DeptNo" type="text" class="form-control" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">班级</div>
+        <div id="ClassNo" type="text" class="form-control" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">身份证件号</div>
+        <input id="IdentityCardNo" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
+        <div id="IdCardType" type="text" class="form-control" readonly="readonly"  isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">申请时间<font face="宋体">*</font></div>
+        <input id="ApplyTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否低保<font face="宋体">*</font></div>
+        <div id="IsLowIncome" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否孤儿<font face="宋体">*</font></div>
+        <div id="IsOrphan" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否单亲家庭子女<font face="宋体">*</font></div>
+        <div id="IsSingleFamilyChildren" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否残疾人子女<font face="宋体">*</font></div>
+        <div id="IsDisabledChildren" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">本人是否残疾<font face="宋体">*</font></div>
+        <div id="IsDisabled" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">残疾类别</div>
+        <div id="DisabledCategory" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否父母丧失劳动能力<font face="宋体">*</font></div>
+        <div id="IsParentsLoseWork" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否家中有大病患者<font face="宋体">*</font></div>
+        <div id="IsSeriouslyIllPatientInHome" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否脱贫家庭学生<font face="宋体">*</font></div>
+        <div id="IsOvercomePovertyFamilyStudent" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否脱贫不稳定家庭学生<font face="宋体">*</font></div>
+        <div id="IsUnstablePovertyFamilyStudent" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否边缘易致贫家庭学生<font face="宋体">*</font></div>
+        <div id="IsEdgePovertyFamilyStudent" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否边突发严重困难学生<font face="宋体">*</font></div>
+        <div id="IsEdgeAcuteDifficultyStudent" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否低收入家庭<font face="宋体">*</font></div>
+        <div id="IsLowIncomeFamily" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">烈士子女<font face="宋体">*</font></div>
+        <div id="IsMartyrChildren" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">家庭人均年收入<font face="宋体">*</font></div>
+        <input id="FamilyAverageIncome" type="text" class="form-control" readonly="readonly"  isvalid="yes" checkexpession="PositiveFloatintZero" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭主要收入来源类型<font face="宋体">*</font></div>
+        <div id="FamilyIncomeSourceCategory" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭是否遭受自然灾害<font face="宋体">*</font></div>
+        <div id="FamilyIsSufferNaturalDisaster" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">自然灾害具体情况描述</div>
+        <textarea id="SufferNaturalDisasterDescription" style="height:50px;" readonly="readonly"  type="text" class="form-control"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭是否遭受突发意外事件<font face="宋体">*</font></div>
+        <div id="FamilyIsSufferUnexpectEvent" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">突发意外事件具体描述</div>
+        <textarea id="SufferUnexpectEventDescription" style="height:50px;" type="text" class="form-control" readonly="readonly" ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭欠债金额<font face="宋体">*</font></div>
+        <input id="FamilyOwesAmount" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero"  readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭欠债原因</div>
+        <textarea id="FamilyOwesReason" style="height:50px;" type="text" class="form-control" readonly="readonly" ></textarea>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">家庭人口数<font face="宋体">*</font></div>
+        <input id="FamilyNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2"  readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">劳动力人口数<font face="宋体">*</font></div>
+        <input id="LaborNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2"  readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">家庭成员失业人数<font face="宋体">*</font></div>
+        <input id="FamilyUnemployNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2"  readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">赡养人口数<font face="宋体">*</font></div>
+        <input id="SupportNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2"  readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">其他信息</div>
+        <textarea id="OtherInformation" style="height:50px;" type="text" class="form-control" readonly="readonly" ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">是否特困供养<font face="宋体">*</font></div>
+        <div id="IsSpecialPovertySupport" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">其他<font face="宋体">*</font></div>
+        <input id="Others" type="text" class="form-control" readonly="readonly"  isvalid="yes" checkexpession="LenStr" length="40" placeholder="填写农村特困供养、农村低保户、建档立卡相关信息，内容不能超过40个字符" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭是否遭受疫情<font face="宋体">*</font></div>
+        <div id="FamilyIsSufferEpidemic" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭遭受疫情具体情况描述</div>
+        <textarea id="SufferEpidemicDescription" style="height:50px;" type="text" class="form-control" readonly="readonly" ></textarea>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">认定困难级别名称</div>
+        <div id="IdentifyDifficultyLevel" readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">认定时间</div>
+        <input id="IdentifyTime" type="text" class="form-control lr-input-wdatepicker"  readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">认定原因</div>
+        <input id="IdentifyReason" type="text" class="form-control" readonly="readonly"  isvalid="yes" checkexpession="LenStrOrNull" length="30" placeholder="内容不能超过30个字符，例如“家庭人口众多，劳动力少”" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">班级认定意见</div>
+        <textarea id="ClassIdentifyOpinion" style="height:50px;" type="text" class="form-control" readonly="readonly" ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">年级认定意见</div>
+        <textarea id="GradeIdentifyOpinion" style="height:50px;" type="text" class="form-control" readonly="readonly" ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" id="FilesDiv">
+        <div class="lr-form-item-title">附件</div>
+        <div id="Files"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/StudentWork/Views/FamilyEconomy/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/FormView.js

@@ -0,0 +1,142 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-16 17:18
+ * 描  述：家庭经济信息（辅导员）
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var Step = request('Step');//第几步
+var strWhere = "";//点击学号弹出框条件
+if (classs != "" && classs != undefined && classs != null) {
+    strWhere = " and classno in ('" + classs.replaceAll(",", "','") + "') ";
+}
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            page.hide();
+            page.bind();
+            page.initData();
+        },
+        hide: function () {
+            if (Step == "2") {//第二步：二级学院审核，时附件显示且必填；
+                $('#FilesDiv').show();
+                $('#Files').attr('isvalid', 'yes');
+                $('#Files').attr('checkexpession', 'NotNull');
+                $('#Files').prev().html('附件<font face="宋体">*</font>');
+            } else {
+                $('#Files').removeAttr('isvalid');
+                $('#Files').removeAttr('checkexpession');
+                $('#Files').prev().html('附件');
+                $('#FilesDiv').hide();
+            }
+        },
+        bind: function () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
+            $('#IdCardType').lrselectSet('01');
+            //判断登录用户所带班级：学生弹框显示所带班级学生
+            $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuno' });
+            $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabledChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabled').lrDataItemSelect({
+                code: 'YesOrNoBit', select: function(item) {
+                    //“残疾类别”非必填项。若“本人是否残疾”项填“是”，则该项为必填。
+                    if (item != null && item.id == "true") {
+                        $('#DisabledCategory').attr('isvalid', 'yes');
+                        $('#DisabledCategory').attr('checkexpession', 'NotNull');
+                        $('#DisabledCategory').prev().html('残疾类别<font face="宋体">*</font>');
+                    } else {
+                        $('#DisabledCategory').removeAttr('isvalid');
+                        $('#DisabledCategory').removeAttr('checkexpession');
+                        $('#DisabledCategory').prev().html('残疾类别');
+                    }
+                }
+            });
+            $('#DisabledCategory').lrDataItemSelect({ code: 'DisabledCategory' });
+            $('#IsParentsLoseWork').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSeriouslyIllPatientInHome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOvercomePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsUnstablePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgeAcuteDifficultyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsLowIncomeFamily').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsMartyrChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIncomeSourceCategory').lrDataItemSelect({ code: 'FamilyIncomeSourceCategory' });
+            $('#FamilyIsSufferNaturalDisaster').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferUnexpectEvent').lrDataItemSelect({
+                code: 'YesOrNoBit', select: function (item) {
+                    //“突发意外事件具体描述”非必填项。若“家庭是否遭受突然意外事件”项填“是”，则该项为必填项。
+                    if (item != null && item.id == "true") {
+                        $('#SufferUnexpectEventDescription').attr('isvalid', 'yes');
+                        $('#SufferUnexpectEventDescription').attr('checkexpession', 'NotNull');
+                        $('#SufferUnexpectEventDescription').prev().html('突发意外事件具体描述<font face="宋体">*</font>');
+                    } else {
+                        $('#SufferUnexpectEventDescription').removeAttr('isvalid');
+                        $('#SufferUnexpectEventDescription').removeAttr('checkexpession');
+                        $('#SufferUnexpectEventDescription').prev().html('突发意外事件具体描述');
+                    }
+                }
+            });
+            $('#IsSpecialPovertySupport').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferEpidemic').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IdentifyDifficultyLevel').lrDataItemSelect({ code: 'DifficultyLevel' });
+            //“家庭遭受疫情具体情况描述”该项如果填写，则“认定时间”、“认定原因”、“认定困难级别名称”也必须同时填写且同时通过校验
+            $('#SufferEpidemicDescription').on('blur', function () {
+                if ($(this).val().trim() != null && $(this).val().trim() != undefined && $(this).val().trim() != "") {
+                    $('#IdentifyDifficultyLevel').attr('isvalid', 'yes');
+                    $('#IdentifyDifficultyLevel').attr('checkexpession', 'NotNull');
+                    $('#IdentifyDifficultyLevel').prev().html('认定困难级别名称<font face="宋体">*</font>');
+                    $('#IdentifyTime').attr('isvalid', 'yes');
+                    $('#IdentifyTime').attr('checkexpession', 'NotNull');
+                    $('#IdentifyTime').prev().html('认定时间<font face="宋体">*</font>');
+                    $('#IdentifyReason').attr('checkexpession', 'LenStr');
+                    $('#IdentifyReason').prev().html('认定原因<font face="宋体">*</font>');
+                } else {
+                    $('#IdentifyDifficultyLevel').removeAttr('isvalid');
+                    $('#IdentifyDifficultyLevel').removeAttr('checkexpession');
+                    $('#IdentifyDifficultyLevel').prev().html('认定困难级别名称');
+                    $('#IdentifyTime').removeAttr('isvalid');
+                    $('#IdentifyTime').removeAttr('checkexpession');
+                    $('#IdentifyTime').prev().html('认定时间');
+                    $('#IdentifyReason').attr('checkexpession', 'LenStrOrNull');
+                    $('#IdentifyReason').prev().html('认定原因');
+                }
+            });
+            $('#Files').lrUploader({ isUpload: false });
+
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        //判断：“是否单亲家庭子女”不能同时与“是否孤儿”同时填“是”
+        if ($('#IsOrphan').lrselectGet().toLowerCase() == "true") {
+            if ($('#IsSingleFamilyChildren').lrselectGet().toLowerCase() == "true") {
+                learun.alert.warning("“是否单亲家庭子女”不能同时与“是否孤儿”同时填“是”");
+                return false;
+            }
+        }
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Index.cshtml

@@ -26,8 +26,8 @@
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">院校</div>
-                                    <div id="F_SchoolId"></div>
+                                    <div class="lr-form-item-title">院系</div>
+                                    <div id="DeptNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
@@ -110,6 +110,7 @@
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交二级学院</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Index.js

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -46,8 +46,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 450, 600);
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -141,6 +161,21 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/StudentWork/FamilyEconomy/FormView?keyValue=' + keyValue,
+                        width: 1100,
+                        height: 800,
+                        btn:null
+                    });
+                }
+            });
         },
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -149,20 +184,20 @@ var bootstrap = function ($, learun) {
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
+                        label: '院系', name: 'DeptNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
                                 key: value,
-                                keyId: 'f_companyid',
+                                keyId: 'deptno',
                                 callback: function (_data) {
-                                    callback(_data['f_fullname']);
+                                    callback(_data['deptname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: '班级', name: 'ClassNo', width: 100, align: "left",
+                        label: '班级', name: 'ClassNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -177,7 +212,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -410,11 +445,15 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'CreateTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
+                param.CreateUserNo = learun.clientdata.get(['userinfo']).account;//辅导员
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfStudent.cshtml

@@ -26,8 +26,8 @@
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">院校</div>
-                                    <div id="F_SchoolId"></div>
+                                    <div class="lr-form-item-title">院系</div>
+                                    <div id="DeptNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
@@ -105,6 +105,7 @@
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfStudent.js

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -46,8 +46,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 450, 600);
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -69,6 +89,21 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/StudentWork/FamilyEconomy/FormView?keyValue=' + keyValue,
+                        width: 1100,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
         },
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -77,20 +112,20 @@ var bootstrap = function ($, learun) {
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
+                        label: '院系', name: 'DeptNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
                                 key: value,
-                                keyId: 'f_companyid',
+                                keyId: 'deptno',
                                 callback: function (_data) {
-                                    callback(_data['f_fullname']);
+                                    callback(_data['deptname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: '班级', name: 'ClassNo', width: 100, align: "left",
+                        label: '班级', name: 'ClassNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -105,7 +140,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -338,12 +373,16 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
-            param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
+                param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+                param.Status = 3;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfThree.cshtml

@@ -26,8 +26,8 @@
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">院校</div>
-                                    <div id="F_SchoolId"></div>
+                                    <div class="lr-form-item-title">院系</div>
+                                    <div id="DeptNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
@@ -111,6 +111,10 @@
                         <a id="lr_back" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回辅导员</a>
                         <a id="lr_backTwo" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回二级学院</a>
                     </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
+                        <a id="lr_submitCancel" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;取消归档</a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfThree.js

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -46,8 +46,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 450, 600);
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -123,6 +143,39 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 取消归档
+            $('#lr_submitCancel').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "3") {
+                        learun.alert.warning("当前项不属于归档状态，无法取消归档！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认取消归档该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/DoBack', { keyValue: keyValue, status: '2', step: '3' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/StudentWork/FamilyEconomy/FormView?Step=2&keyValue=' + keyValue,
+                        width: 1100,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
         },
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -131,20 +184,20 @@ var bootstrap = function ($, learun) {
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
+                        label: '院系', name: 'DeptNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
                                 key: value,
-                                keyId: 'f_companyid',
+                                keyId: 'deptno',
                                 callback: function (_data) {
-                                    callback(_data['f_fullname']);
+                                    callback(_data['deptname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: '班级', name: 'ClassNo', width: 100, align: "left",
+                        label: '班级', name: 'ClassNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -159,7 +212,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -392,6 +445,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'FirstCheckTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfTwo.cshtml

@@ -26,8 +26,8 @@
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">院校</div>
-                                    <div id="F_SchoolId"></div>
+                                    <div class="lr-form-item-title">院系</div>
+                                    <div id="DeptNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
@@ -107,7 +107,8 @@
                         <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_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;上传附件</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交学工部</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfTwo.js

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -46,8 +46,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 450, 600);
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -81,7 +101,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerForm({
                         id: 'formOfTwo',
-                        title: '审核',
+                        title: '上传附件',
                         url: top.$.rootUrl + '/StudentWork/FamilyEconomy/Form?Step=2&keyValue=' + keyValue,
                         width: 1100,
                         height: 800,
@@ -127,6 +147,21 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/StudentWork/FamilyEconomy/FormView?Step=2&keyValue=' + keyValue,
+                        width: 1100,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
         },
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -135,20 +170,20 @@ var bootstrap = function ($, learun) {
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
+                        label: '院系', name: 'DeptNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
                                 key: value,
-                                keyId: 'f_companyid',
+                                keyId: 'deptno',
                                 callback: function (_data) {
-                                    callback(_data['f_fullname']);
+                                    callback(_data['deptname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: '班级', name: 'ClassNo', width: 100, align: "left",
+                        label: '班级', name: 'ClassNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -163,7 +198,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -396,6 +431,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs

@@ -502,7 +502,7 @@ namespace Learun.Application.Web.Controllers
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
-        [HandlerValidateAntiForgeryToken]
+        //[HandlerValidateAntiForgeryToken]
         public ActionResult CheckLogin(string username, string password, string verifycode, string up)
         {
 

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

@@ -884,6 +884,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\SchoolLevelScholarshipController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_FixAssetsController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_FixAssetsApplyController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\LessonInfoOfElectiveOnlineController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -956,6 +957,12 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_AssetsOutItemApply\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_AssetsType\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_AssetsType\Index.js" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\IndexView.js" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\FormView.js" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\FormView.js" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\ImportForm.css" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\ImportForm.js" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\IndexOfTeacher.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_InventoryItemApply\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_InventoryItemApply\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Inventory\Form.js" />
@@ -999,10 +1006,12 @@
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexClassRoom.js" />
     <Content Include="Areas\EducationalAdministration\Views\PsychologyInfo\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfThree.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfTwo.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexInStuScore.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuFellowship\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfThree.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfTwo.js" />
@@ -1710,6 +1719,7 @@
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Index.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.js" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\FormView.js" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\Form.js" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\IndexOfStudent.js" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\IndexOfThree.js" />
@@ -6761,6 +6771,10 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\Form.cshtml" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />
@@ -8163,6 +8177,15 @@
     <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexClassRoom.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\SeatForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfStudent.cshtml" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\FormView.cshtml" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\FormView.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuFellowship\FormView.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\FormView.cshtml" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\FormView.cshtml" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\ImportForm.cshtml" />
+    <Content Include="Content\excel\AssFixAssetsImport.xls" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\IndexOfTeacher.cshtml" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\IndexView.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config

@@ -39,6 +39,7 @@
     <typeAlias alias="StuCancelLeaveManageMethod" type="Learun.Application.WorkFlow.StuCancelLeaveManageMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="Acc_DormitoryChangeMethod" type="Learun.Application.WorkFlow.Acc_DormitoryChangeMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="Ass_FixAssetsApplyMethod" type="Learun.Application.WorkFlow.Ass_FixAssetsApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="Ass_FixAssetsMethod" type="Learun.Application.WorkFlow.Ass_FixAssetsMethod,Learun.Application.WorkFlow" />
 
 
     <!--任务调度器-->
@@ -89,6 +90,7 @@
       <type type="IWorkFlowMethod" mapTo="StuCancelLeaveManageMethod" name="StuCancelLeaveManageMethod"></type>
       <type type="IWorkFlowMethod" mapTo="Acc_DormitoryChangeMethod" name="Acc_DormitoryChangeMethod"></type>
       <type type="IWorkFlowMethod" mapTo="Ass_FixAssetsApplyMethod" name="Ass_FixAssetsApplyMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="Ass_FixAssetsMethod" name="Ass_FixAssetsMethod"></type>
 
     </container>
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/LessonInfoOfElectiveOnlineMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-05-29 14:28
+    /// 描 述：线上课程
+    /// </summary>
+    public class LessonInfoOfElectiveOnlineMap : EntityTypeConfiguration<LessonInfoOfElectiveOnlineEntity>
+    {
+        public LessonInfoOfElectiveOnlineMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("LESSONINFOOFELECTIVEONLINE");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -615,6 +615,7 @@
     <Compile Include="EducationalAdministration\SchoolLevelScholarshipMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_FixAssetsMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_FixAssetsApplyMap.cs" />
+    <Compile Include="EducationalAdministration\LessonInfoOfElectiveOnlineMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssets/Ass_FixAssetsBLL.cs

@@ -91,6 +91,30 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
             }
         }
 
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="code">资产编号</param>
+        /// <returns></returns>
+        public Ass_FixAssetsEntity GetEntityByCode(string code)
+        {
+            try
+            {
+                return ass_FixAssetsService.GetEntityByCode(code);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据
@@ -142,6 +166,64 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
             }
         }
 
+        /// <summary>
+        /// 修改审批状态
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="status"></param>
+        public void ChangeStatusById(string keyValue, int status, string processId)
+        {
+            try
+            {
+                ass_FixAssetsService.ChangeStatusById(keyValue, status, processId);
+            }
+            catch (Exception ex)
+            {
+                throw ExceptionEx.ThrowBusinessException(ex);
+            }
+        }
+
+        /// <summary>
+        /// 修改审批状态
+        /// </summary>
+        /// <param name="processId"></param>
+        /// <param name="status"></param>
+        public void ChangeStatusByProcessId(string processId, int status)
+        {
+            try
+            {
+                ass_FixAssetsService.ChangeStatusByProcessId(processId, status);
+            }
+            catch (Exception ex)
+            {
+                throw ExceptionEx.ThrowBusinessException(ex);
+            }
+        }
+
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <param name="fileId"></param>
+        /// <returns></returns>
+        public string AssFixAssetsImport(DataTable dt, string fileId)
+        {
+            try
+            {
+                return ass_FixAssetsService.AssFixAssetsImport(dt, fileId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssets/Ass_FixAssetsEntity.cs

@@ -229,6 +229,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         [Column("PROCESSID")]
         public string ProcessId { get; set; }
+        /// <summary>
+        /// 自动更新已提折旧月数时间
+        /// </summary>
+        [Column("AUTOUPDATETIME")]
+        public DateTime? AutoUpdateTime { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssets/Ass_FixAssetsIBLL.cs

@@ -34,6 +34,13 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// <param name="processId">流程实例ID</param>
         /// <returns></returns>
         Ass_FixAssetsEntity GetEntityByProcessId(string processId);
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="code">资产编号</param>
+        /// <returns></returns>
+        Ass_FixAssetsEntity GetEntityByCode(string code);
         #endregion
 
         #region 提交数据
@@ -49,6 +56,26 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, Ass_FixAssetsEntity entity);
+        /// <summary>
+        /// 修改审批状态
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="status"></param>
+        void ChangeStatusById(string keyValue, int status, string processId);
+        /// <summary>
+        /// 修改审批状态
+        /// </summary>
+        /// <param name="processId"></param>
+        /// <param name="status"></param>
+        void ChangeStatusByProcessId(string processId, int status);
+
+        /// <summary>
+        /// 固定资产导入
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <param name="fileId"></param>
+        /// <returns></returns>
+        string AssFixAssetsImport(DataTable dt, string fileId);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssets/Ass_FixAssetsService.cs

@@ -1,9 +1,14 @@
 using Dapper;
+using Learun.Application.Base.SystemModule;
+using Learun.Application.Organization;
+using Learun.Cache.Base;
+using Learun.Cache.Factory;
 using Learun.DataBase.Repository;
 using Learun.Util;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace Learun.Application.TwoDevelopment.AssetManagementSystem
@@ -17,6 +22,9 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
     /// </summary>
     public class Ass_FixAssetsService : RepositoryFactory
     {
+        private DataSourceIBLL dataSourceIBLL = new DataSourceBLL();
+        private DataItemIBLL dataItemIBLL = new DataItemBLL();
+
         #region 获取数据
 
         /// <summary>
@@ -48,42 +56,42 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 }
                 if (!queryParam["ATGId"].IsEmpty())
                 {
-                    dp.Add("ATGId",queryParam["ATGId"].ToString(), DbType.String);
+                    dp.Add("ATGId", queryParam["ATGId"].ToString(), DbType.String);
                     strSql.Append(" AND t.ATGId = @ATGId ");
                 }
                 if (!queryParam["ATId"].IsEmpty())
                 {
-                    dp.Add("ATId",queryParam["ATId"].ToString(), DbType.String);
+                    dp.Add("ATId", queryParam["ATId"].ToString(), DbType.String);
                     strSql.Append(" AND t.ATId = @ATId ");
                 }
                 if (!queryParam["GetWay"].IsEmpty())
                 {
-                    dp.Add("GetWay",queryParam["GetWay"].ToString(), DbType.String);
+                    dp.Add("GetWay", queryParam["GetWay"].ToString(), DbType.String);
                     strSql.Append(" AND t.GetWay = @GetWay ");
                 }
                 if (!queryParam["UseCondition"].IsEmpty())
                 {
-                    dp.Add("UseCondition",queryParam["UseCondition"].ToString(), DbType.String);
+                    dp.Add("UseCondition", queryParam["UseCondition"].ToString(), DbType.String);
                     strSql.Append(" AND t.UseCondition = @UseCondition ");
                 }
                 if (!queryParam["UseDepartment"].IsEmpty())
                 {
-                    dp.Add("UseDepartment",queryParam["UseDepartment"].ToString(), DbType.String);
+                    dp.Add("UseDepartment", queryParam["UseDepartment"].ToString(), DbType.String);
                     strSql.Append(" AND t.UseDepartment = @UseDepartment ");
                 }
                 if (!queryParam["ManageDepartment"].IsEmpty())
                 {
-                    dp.Add("ManageDepartment",queryParam["ManageDepartment"].ToString(), DbType.String);
+                    dp.Add("ManageDepartment", queryParam["ManageDepartment"].ToString(), DbType.String);
                     strSql.Append(" AND t.ManageDepartment = @ManageDepartment ");
                 }
                 if (!queryParam["UsePeople"].IsEmpty())
                 {
-                    dp.Add("UsePeople",queryParam["UsePeople"].ToString(), DbType.String);
+                    dp.Add("UsePeople", queryParam["UsePeople"].ToString(), DbType.String);
                     strSql.Append(" AND t.UsePeople = @UsePeople ");
                 }
                 if (!queryParam["CardStatus"].IsEmpty())
                 {
-                    dp.Add("CardStatus",queryParam["CardStatus"].ToString(), DbType.String);
+                    dp.Add("CardStatus", queryParam["CardStatus"].ToString(), DbType.String);
                     strSql.Append(" AND t.CardStatus = @CardStatus ");
                 }
                 if (!queryParam["PurchaseOrganizationForm"].IsEmpty())
@@ -93,15 +101,32 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 }
                 if (!queryParam["StorageId"].IsEmpty())
                 {
-                    dp.Add("StorageId",queryParam["StorageId"].ToString(), DbType.String);
+                    dp.Add("StorageId", queryParam["StorageId"].ToString(), DbType.String);
                     strSql.Append(" AND t.StorageId = @StorageId ");
                 }
                 if (!queryParam["DepreciationStatus"].IsEmpty())
                 {
-                    dp.Add("DepreciationStatus",queryParam["DepreciationStatus"].ToString(), DbType.String);
+                    dp.Add("DepreciationStatus", queryParam["DepreciationStatus"].ToString(), DbType.String);
                     strSql.Append(" AND t.DepreciationStatus = @DepreciationStatus ");
                 }
-                return this.BaseRepository().FindList<Ass_FixAssetsEntity>(strSql.ToString(),dp, pagination);
+
+                //判断是否是普通教师的列表：若是，则二级判断；若不是，则无；
+                //二级判断登录用户是否是部门负责人：若是，则使用部门=本部门，或者使用人=本人；若不是，则使用人=本人；
+                if (!queryParam["IsTeacher"].IsEmpty() && queryParam["IsTeacher"].ToString() == "1")
+                {
+                    var departmentList = this.BaseRepository().FindList<DepartmentEntity>($"select * from LR_Base_Department where F_DeleteMark=0 and F_EnabledMark=1 and F_Manager='{LoginUserInfo.Get().userId}' ");
+                    if (departmentList.Any())
+                    {
+                        var departmentIds = departmentList.Select(x => x.F_DepartmentId).ToArray();
+                        strSql.Append($" AND (t.UseDepartment in ('{string.Join("','", departmentIds)}') or t.UsePeople='{LoginUserInfo.Get().userId}' )");
+                    }
+                    else
+                    {
+                        strSql.Append($" AND t.UsePeople='{LoginUserInfo.Get().userId}' ");
+                    }
+                }
+
+                return this.BaseRepository().FindList<Ass_FixAssetsEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -149,7 +174,31 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                return this.BaseRepository().FindEntity<Ass_FixAssetsEntity>(t=>t.ProcessId == processId);
+                return this.BaseRepository().FindEntity<Ass_FixAssetsEntity>(t => t.ProcessId == processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="code">资产编号</param>
+        /// <returns></returns>
+        public Ass_FixAssetsEntity GetEntityByCode(string code)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<Ass_FixAssetsEntity>(t => t.FACode == code);
             }
             catch (Exception ex)
             {
@@ -176,7 +225,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                this.BaseRepository().Delete<Ass_FixAssetsEntity>(t=>t.FAId == keyValue);
+                this.BaseRepository().Delete<Ass_FixAssetsEntity>(t => t.FAId == keyValue);
             }
             catch (Exception ex)
             {
@@ -225,7 +274,317 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
             }
         }
 
+        /// <summary>
+        /// 修改审批状态
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="status"></param>
+        public void ChangeStatusById(string keyValue, int status, string processId)
+        {
+            try
+            {
+                this.BaseRepository().ExecuteBySql("update Ass_FixAssets set Status=" + status + ",ProcessId='" + processId + "',SubmitTime='" + DateTime.Now + "',SubmitUserId='" + LoginUserInfo.Get().userId + "' where FAId='" + keyValue + "'", null);
+            }
+            catch (Exception ex)
+            {
+                throw ExceptionEx.ThrowServiceException(ex);
+            }
+        }
+
+        /// <summary>
+        /// 修改审批状态
+        /// </summary>
+        /// <param name="processId"></param>
+        /// <param name="status"></param>
+        public void ChangeStatusByProcessId(string processId, int status)
+        {
+            try
+            {
+                this.BaseRepository().ExecuteBySql("update Ass_FixAssets set Status=" + status + " where  ProcessId='" + processId + "'", null);
+            }
+            catch (Exception ex)
+            {
+                throw ExceptionEx.ThrowServiceException(ex);
+            }
+        }
+
+        #region  缓存定义
+        private ICache cache = CacheFactory.CaChe();
+        private string cacheKey = "Learun_adms_excelError_";       // +公司主键
         #endregion
 
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <param name="fileId"></param>
+        /// <returns></returns>
+        public string AssFixAssetsImport(DataTable dt, string fileId)
+        {
+            try
+            {
+                int snum = 0;
+                int fnum = 0;
+                if (dt.Rows.Count > 0)
+                {
+                    DataTable failDt = new DataTable();
+                    dt.Columns.Add("导入错误", typeof(string));
+                    foreach (DataColumn dc in dt.Columns)
+                    {
+                        failDt.Columns.Add(dc.ColumnName, dc.DataType);
+                    }
+                    var db = this.BaseRepository().BeginTrans();
+
+                    IEnumerable<Ass_FixAssetsEntity> Ass_FixAssetsHistory = db.FindList<Ass_FixAssetsEntity>("select * from Ass_FixAssets");
+                    List<Ass_FixAssetsEntity> Ass_FixAssetsinsert = new List<Ass_FixAssetsEntity>();
+
+                    // 循环遍历导入
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        try
+                        {
+                            #region 必填项空验证
+                            if (dr["资产编号"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("资产编号不能为空"));
+                            }
+                            if (dr["资产名称"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("资产名称不能为空"));
+                            }
+                            if (dr["资产国标大类"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("资产国标大类不能为空"));
+                            }
+                            if (dr["资产分类"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("资产分类不能为空"));
+                            }
+                            if (dr["财务入账日期"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("财务入账日期不能为空"));
+                            }
+                            if (dr["价值类型"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("价值类型不能为空"));
+                            }
+                            if (dr["价值"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("价值不能为空"));
+                            }
+                            if (dr["取得方式"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("取得方式不能为空"));
+                            }
+                            if (dr["取得日期"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("取得日期不能为空"));
+                            }
+                            if (dr["使用状况"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("使用状况不能为空"));
+                            }
+                            if (dr["使用部门"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("使用部门不能为空"));
+                            }
+                            if (dr["管理部门"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("使用人不能为空"));
+                            }
+                            if (dr["使用人"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("使用人不能为空"));
+                            }
+                            if (dr["数量"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("数量不能为空"));
+                            }
+                            if (dr["制单人"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("制单人不能为空"));
+                            }
+                            if (dr["制单时间"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("制单时间不能为空"));
+                            }
+                            if (dr["所属单位"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("卡片状态不能为空"));
+                            }
+                            if (dr["卡片状态"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("卡片状态不能为空"));
+                            }
+                            if (dr["折旧年限"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("折旧年限不能为空"));
+                            }
+                            if (dr["累计折旧"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("累计折旧不能为空"));
+                            }
+                            if (dr["已提折旧月数"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("已提折旧月数不能为空"));
+                            }
+                            if (dr["月折旧额"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("月折旧额不能为空"));
+                            }
+                            if (dr["折旧方法"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("折旧方法不能为空"));
+                            }
+                            if (dr["净值"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("净值不能为空"));
+                            }
+                            if (dr["存放地点"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("存放地点不能为空"));
+                            }
+                            if (dr["使用权面积/建筑面积"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("使用权面积/建筑面积不能为空"));
+                            }
+                            if (dr["财政拨款"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("财政拨款不能为空"));
+                            }
+                            if (dr["非财政拨款"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("非财政拨款不能为空"));
+                            }
+                            if (dr["会计凭证号"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("会计凭证号不能为空"));
+                            }
+                            if (dr["折旧/摊销状态"].ToString().IsEmpty())
+                            {
+                                throw (new Exception("折旧/摊销状态不能为空"));
+                            }
+                            #endregion
+                            //判断资产编号是否重复
+                            if (Ass_FixAssetsHistory.Count(x => x.FACode == dr["资产编号"].ToString() && x.Status != 0) > 0)
+                            {
+                                throw (new Exception("资产编号已存在,并已审核，不可替换"));
+                            }
+                            if (Ass_FixAssetsinsert.Count(s => s.FACode == dr["资产编号"].ToString()) > 0)
+                            {
+                                throw (new Exception("导入数据中资产编号重复"));
+                            }
+
+                            //写入要导入替换的数据
+                            Ass_FixAssetsEntity Ass_FixAssetsEntity = new Ass_FixAssetsEntity
+                            {
+                                FAId = Guid.NewGuid().ToString(),
+                                FACode = dr["资产编号"].ToString(),
+                                ATGId = dataSourceIBLL.GetKeyByValue("Ass_AssetsType", "aname", dr["资产国标大类"].ToString(), "atid"),
+                                ATId = dataSourceIBLL.GetKeyByValue("Ass_AssetsType", "aname", dr["资产分类"].ToString(), "atid"),
+                                FAName = dr["资产名称"].ToString(),
+                                FinanceEntryDate = Convert.ToDateTime(dr["财务入账日期"]),
+                                ValueType = FindDataItemValue(dataItemIBLL.GetDetailList("ValueType"), dr["价值类型"].ToString(), "价值类型", false),
+                                Value = dr["价值"].ToDecimal(),
+                                GetWay = FindDataItemValue(dataItemIBLL.GetDetailList("GetWay"), dr["取得方式"].ToString(), "取得方式", false),
+                                GetDate = Convert.ToDateTime(dr["取得日期"]),
+                                UseCondition = FindDataItemValue(dataItemIBLL.GetDetailList("AssState"), dr["使用状况"].ToString(), "使用状况", false),
+                                UseDepartment = dataSourceIBLL.GetKeyByValue("classdata", "name", dr["使用部门"].ToString(), "id"),
+                                ManageDepartment = dataSourceIBLL.GetKeyByValue("classdata", "name", dr["管理部门"].ToString(), "id"),
+                                UsePeople = dataSourceIBLL.GetKeyByValue("teacheruserdata", "f_realname", dr["使用人"].ToString(), "f_userid"),
+                                Amount = dr["数量"].ToInt(),
+                                MakePeople = dr["制单人"].ToString(),
+                                MakeDate = Convert.ToDateTime(dr["制单时间"]),
+                                Unit = dataSourceIBLL.GetKeyByValue("company", "f_fullname", dr["所属单位"].ToString(), "f_companyid"),
+                                CardStatus = FindDataItemValue(dataItemIBLL.GetDetailList("CardStatus"), dr["卡片状态"].ToString(), "卡片状态", false),
+                                DepreciationLife = dr["折旧年限"].ToInt(),
+                                AccumulatedDepreciation = dr["累计折旧"].ToDecimal(),
+                                HaveDepreciationMonths = dr["已提折旧月数"].ToInt(),
+                                MonthlyDepreciation = dr["月折旧额"].ToDecimal(),
+                                DepreciationMothod = FindDataItemValue(dataItemIBLL.GetDetailList("DepreciationMothod"), dr["折旧方法"].ToString(), "折旧方法", false),
+                                NetValue = dr["净值"].ToDecimal(),
+                                PurchaseOrganizationForm = dr["采购组织形式"].ToString(),
+                                Brand = dr["品牌"].ToString(),
+                                SpecificationModel = dr["规格型号"].ToString(),
+                                StorageId = dataSourceIBLL.GetKeyByValue("Ass_StorageData", "sname", dr["存放地点"].ToString(), "sid"),
+                                SupplierId = dataSourceIBLL.GetKeyByValue("Ass_SupplierData", "sname", dr["销售商"].ToString(), "sid"),
+                                UseArea = dr["使用权面积/建筑面积"].ToDecimal(),
+                                FinancialAppropriation = dr["财政拨款"].ToDecimal(),
+                                NonFinancialAppropriation = dr["非财政拨款"].ToDecimal(),
+                                AccountDocumentNumber = dr["会计凭证号"].ToString(),
+                                DepreciationStatus = FindDataItemValue(dataItemIBLL.GetDetailList("DepreciationStatus"), dr["折旧/摊销状态"].ToString(), "折旧/摊销状态", false),
+
+                                //默认数据
+                                CreateTime = DateTime.Now,
+                                CreateUserId = LoginUserInfo.Get().userId,
+                                ModifyTime = DateTime.Now,
+                                ModifyUserId = LoginUserInfo.Get().userId,
+                                Status = 0,
+                                ProcessId = Guid.NewGuid().ToString(),
+                            };
+
+                            Ass_FixAssetsinsert.Add(Ass_FixAssetsEntity);
+                            var FACode = dr["资产编号"].ToString();
+                            db.Delete<Ass_FixAssetsEntity>(x => x.FACode == FACode && x.Status == 0);
+                            snum++;
+                        }
+                        catch (Exception ex)
+                        {
+                            fnum++;
+                            dr["导入错误"] = ex.Message;
+                            failDt.Rows.Add(dr.ItemArray);
+                        }
+                    }
+                    //执行导入
+                    db.Insert(Ass_FixAssetsinsert);
+                    db.Commit();
+                    if (failDt.Rows.Count > 0)
+                    {
+                        string errordt = failDt.ToJson();
+                        cache.Write<string>(cacheKey + fileId, errordt, CacheId.excel);
+                    }
+                }
+                return snum + "|" + fnum;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 数据字典查找Value
+        /// </summary>
+        /// <param name="dataItemList">数据字典数据</param>
+        /// <param name="itemName">项目名</param>
+        /// <param name="colName">列名</param>
+        /// <returns></returns>
+        private string FindDataItemValue(List<DataItemDetailEntity> dataItemList, string itemName, string colName, bool IsMandatory)
+        {
+            DataItemDetailEntity dataItem = dataItemList.Find(t => t.F_ItemName == itemName);
+            if (dataItem != null)
+            {
+                return dataItem.F_ItemValue;
+            }
+            else
+            {
+                if (IsMandatory)
+                {
+                    throw (new Exception("【" + colName + "】数据字典找不到对应值"));
+                }
+                else
+                {
+                    return "";
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyEntity.cs

@@ -22,6 +22,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// <summary>
         /// 资产编号
         /// </summary>
+        [Column("FAID")]
+        public string FAId { get; set; }
+        /// <summary>
+        /// 资产编号
+        /// </summary>
         [Column("FACODE")]
         public string FACode { get; set; }
         /// <summary>
@@ -109,6 +114,12 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         [Column("PROCESSID")]
         public string ProcessId { get; set; }
+        [Column("DEPARTMENT")]
+        public string Department { get; set; }
+        [Column("ASSETSMANAGEMENT")]
+        public string AssetsManagement { get; set; }
+        [Column("ISMARK")]
+        public int? IsMark { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyService.cs

@@ -63,17 +63,21 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     dp.Add("StorageId", queryParam["StorageId"].ToString(), DbType.String);
                     strSql.Append(" AND t.StorageId = @StorageId ");
                 }
-                if (!queryParam["CardNumber"].IsEmpty())
+                if (!queryParam["FACode"].IsEmpty())
                 {
-                    dp.Add("CardNumber", "%" + queryParam["CardNumber"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.CardNumber Like @CardNumber ");
+                    dp.Add("FACode", "%" + queryParam["FACode"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.FACode Like @FACode ");
                 }
                 if (!queryParam["FAName"].IsEmpty())
                 {
                     dp.Add("FAName", "%" + queryParam["FAName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.FAName Like @FAName ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<Ass_FixAssetsApplyEntity>(strSql.ToString(), dp, pagination);
+                if (!queryParam["SqlParameter"].IsEmpty())
+                {
+                    strSql.Append(queryParam["SqlParameter"].ToString());
+                }
+                return this.BaseRepository().FindList<Ass_FixAssetsApplyEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -97,7 +101,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<Ass_FixAssetsApplyEntity>(keyValue);
+                return this.BaseRepository().FindEntity<Ass_FixAssetsApplyEntity>(keyValue);
             }
             catch (Exception ex)
             {
@@ -121,7 +125,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<Ass_FixAssetsApplyEntity>(t => t.ProcessId == processId);
+                return this.BaseRepository().FindEntity<Ass_FixAssetsApplyEntity>(t => t.ProcessId == processId);
             }
             catch (Exception ex)
             {
@@ -148,7 +152,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<Ass_FixAssetsApplyEntity>(t => t.ID == keyValue);
+                this.BaseRepository().Delete<Ass_FixAssetsApplyEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -176,12 +180,12 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
-                    this.BaseRepository("CollegeMIS").Update(entity);
+                    this.BaseRepository().Update(entity);
                 }
                 else
                 {
                     entity.Create();
-                    this.BaseRepository("CollegeMIS").Insert(entity);
+                    this.BaseRepository().Insert(entity);
                 }
             }
             catch (Exception ex)
@@ -234,6 +238,13 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 var entity = this.BaseRepository().FindEntity<Ass_FixAssetsApplyEntity>(a => a.ProcessId == processId);
                 entity.Status = pastatus;
                 this.BaseRepository().Update(entity);
+                if (pastatus == 2)
+                {
+                    var Ass_FixAssetsentity = this.BaseRepository().FindEntity<Ass_FixAssetsEntity>(x => x.FAId == entity.FAId);
+                    Ass_FixAssetsentity.UsePeople = entity.UsePeople;
+                    Ass_FixAssetsentity.StorageId = entity.StorageIdNew;
+                    this.BaseRepository().Update(Ass_FixAssetsentity);
+                }
             }
             catch (Exception e)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptEntity.cs

@@ -77,6 +77,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("SYNCFLAG")]
         public bool? SyncFlag { get; set; }
+        /// <summary>
+        /// 资助审核人
+        /// </summary>
+        [Column("DEPTSUBSIDIZER")]
+        public string DeptSubsidizer { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs

@@ -81,13 +81,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     empSql += $@"  and EPLId = T.EPLId FOR XML PATH('') ), 1, 1, '') AS empno FROM Exam_ExamPlanRoom AS T
                     where EPLId ='{queryParam["EPLId"].ToString()}'";
                     var obj = this.BaseRepository("CollegeMIS").FindList<Exam_ExamPlanRoomEntity>(empSql).Select(x => x.EmpNo).Distinct().ToList();
-                    if (!string.IsNullOrEmpty(obj[0]))
+                    if (obj.Count() > 0)
                     {
-                        //if (obj[0].IsEmpty())
-                        //{
                         var empNo = string.Join("','", obj[0].ToString().Split(',').Distinct());
                         strSql.Append($" AND t.EmpNo not in ('{empNo}')");
-                        //}
                     }
 
                     //筛选掉考试时间冲突的老师和专业课的代课老师

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfoOfElectiveOnline/LessonInfoOfElectiveOnlineBLL.cs

@@ -0,0 +1,153 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-05-29 14:28
+    /// 描 述：线上课程
+    /// </summary>
+    public class LessonInfoOfElectiveOnlineBLL : LessonInfoOfElectiveOnlineIBLL
+    {
+        private LessonInfoOfElectiveOnlineService lessonInfoOfElectiveOnlineService = new LessonInfoOfElectiveOnlineService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<LessonInfoOfElectiveOnlineEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return lessonInfoOfElectiveOnlineService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取LessonInfoOfElectiveOnline表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public LessonInfoOfElectiveOnlineEntity GetLessonInfoOfElectiveOnlineEntity(string keyValue)
+        {
+            try
+            {
+                return lessonInfoOfElectiveOnlineService.GetLessonInfoOfElectiveOnlineEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                lessonInfoOfElectiveOnlineService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, LessonInfoOfElectiveOnlineEntity entity)
+        {
+            try
+            {
+                lessonInfoOfElectiveOnlineService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 启用/停用实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoLock(string keyValue, string status)
+        {
+            try
+            {
+                lessonInfoOfElectiveOnlineService.DoLock(keyValue, status);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfoOfElectiveOnline/LessonInfoOfElectiveOnlineEntity.cs

@@ -0,0 +1,275 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-05-29 14:28
+    /// 描 述：线上课程
+    /// </summary>
+    public class LessonInfoOfElectiveOnlineEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// MakeDate
+        /// </summary>
+        [Column("MAKEDATE")]
+        public DateTime? MakeDate { get; set; }
+        /// <summary>
+        /// AcademicYearNo
+        /// </summary>
+        [Column("ACADEMICYEARNO")]
+        public string AcademicYearNo { get; set; }
+        /// <summary>
+        /// Semester
+        /// </summary>
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
+        /// <summary>
+        /// LessonNo
+        /// </summary>
+        [Column("LESSONNO")]
+        public string LessonNo { get; set; }
+        /// <summary>
+        /// PartCode
+        /// </summary>
+        [Column("PARTCODE")]
+        public string PartCode { get; set; }
+        /// <summary>
+        /// LessonName
+        /// </summary>
+        [Column("LESSONNAME")]
+        public string LessonName { get; set; }
+        /// <summary>
+        /// LessonSortNo
+        /// </summary>
+        [Column("LESSONSORTNO")]
+        public string LessonSortNo { get; set; }
+        /// <summary>
+        /// LessonSortDetailNo
+        /// </summary>
+        [Column("LESSONSORTDETAILNO")]
+        public string LessonSortDetailNo { get; set; }
+        /// <summary>
+        /// LessonSection
+        /// </summary>
+        [Column("LESSONSECTION")]
+        public string LessonSection { get; set; }
+        /// <summary>
+        /// LessonTime
+        /// </summary>
+        [Column("LESSONTIME")]
+        public string LessonTime { get; set; }
+        /// <summary>
+        /// StudyScore
+        /// </summary>
+        [Column("STUDYSCORE")]
+        public decimal? StudyScore { get; set; }
+        /// <summary>
+        /// StartWeek
+        /// </summary>
+        [Column("STARTWEEK")]
+        public int? StartWeek { get; set; }
+        /// <summary>
+        /// EndWeek
+        /// </summary>
+        [Column("ENDWEEK")]
+        public int? EndWeek { get; set; }
+        /// <summary>
+        /// StartDate
+        /// </summary>
+        [Column("STARTDATE")]
+        public DateTime? StartDate { get; set; }
+        /// <summary>
+        /// EndDate
+        /// </summary>
+        [Column("ENDDATE")]
+        public DateTime? EndDate { get; set; }
+        /// <summary>
+        /// CheckStyleNo
+        /// </summary>
+        [Column("CHECKSTYLENO")]
+        public string CheckStyleNo { get; set; }
+        /// <summary>
+        /// ScoreRecordStyleNo
+        /// </summary>
+        [Column("SCORERECORDSTYLENO")]
+        public string ScoreRecordStyleNo { get; set; }
+        /// <summary>
+        /// EmpNo
+        /// </summary>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// EmpName
+        /// </summary>
+        [Column("EMPNAME")]
+        public string EmpName { get; set; }
+        /// <summary>
+        /// ClassRoomNo
+        /// </summary>
+        [Column("CLASSROOMNO")]
+        public string ClassRoomNo { get; set; }
+        /// <summary>
+        /// ClassRoomName
+        /// </summary>
+        [Column("CLASSROOMNAME")]
+        public string ClassRoomName { get; set; }
+        /// <summary>
+        /// CheckMark
+        /// </summary>
+        [Column("CHECKMARK")]
+        public string CheckMark { get; set; }
+        /// <summary>
+        /// StuNumMax
+        /// </summary>
+        [Column("STUNUMMAX")]
+        public int? StuNumMax { get; set; }
+        /// <summary>
+        /// StuNum
+        /// </summary>
+        [Column("STUNUM")]
+        public int? StuNum { get; set; }
+        /// <summary>
+        /// ModifyTime
+        /// </summary>
+        [Column("MODIFYTIME")]
+        public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// ModifyUserId
+        /// </summary>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// ModifyUserName
+        /// </summary>
+        [Column("MODIFYUSERNAME")]
+        public string ModifyUserName { get; set; }
+        /// <summary>
+        /// F_SchoolId
+        /// </summary>
+        [Column("F_SCHOOLID")]
+        public string F_SchoolId { get; set; }
+        /// <summary>
+        /// TeachMajorNo
+        /// </summary>
+        [Column("TEACHMAJORNO")]
+        public string TeachMajorNo { get; set; }
+        /// <summary>
+        /// OrdinaryScoreScale
+        /// </summary>
+        [Column("ORDINARYSCORESCALE")]
+        public decimal? OrdinaryScoreScale { get; set; }
+        /// <summary>
+        /// TermInScoreScale
+        /// </summary>
+        [Column("TERMINSCORESCALE")]
+        public decimal? TermInScoreScale { get; set; }
+        /// <summary>
+        /// TermEndScoreScale
+        /// </summary>
+        [Column("TERMENDSCORESCALE")]
+        public decimal? TermEndScoreScale { get; set; }
+        /// <summary>
+        /// OtherScoreScale
+        /// </summary>
+        [Column("OTHERSCORESCALE")]
+        public decimal? OtherScoreScale { get; set; }
+        /// <summary>
+        /// PracticeHour
+        /// </summary>
+        [Column("PRACTICEHOUR")]
+        public string PracticeHour { get; set; }
+        /// <summary>
+        /// HaveBeforeLesson
+        /// </summary>
+        [Column("HAVEBEFORELESSON")]
+        public string HaveBeforeLesson { get; set; }
+        /// <summary>
+        /// BeforeLesson
+        /// </summary>
+        [Column("BEFORELESSON")]
+        public string BeforeLesson { get; set; }
+        /// <summary>
+        /// IsAllowEdit
+        /// </summary>
+        [Column("ISALLOWEDIT")]
+        public bool? IsAllowEdit { get; set; }
+        /// <summary>
+        /// State
+        /// </summary>
+        [Column("STATE")]
+        public int? State { get; set; }
+        /// <summary>
+        /// ClassroomType
+        /// </summary>
+        [Column("CLASSROOMTYPE")]
+        public int? ClassroomType { get; set; }
+        /// <summary>
+        /// ClassroomPracticeType
+        /// </summary>
+        [Column("CLASSROOMPRACTICETYPE")]
+        public int? ClassroomPracticeType { get; set; }
+        /// <summary>
+        /// CheckMarkDept
+        /// </summary>
+        [Column("CHECKMARKDEPT")]
+        public string CheckMarkDept { get; set; }
+        /// <summary>
+        /// TeachingBookNo
+        /// </summary>
+        [Column("TEACHINGBOOKNO")]
+        public string TeachingBookNo { get; set; }
+        /// <summary>
+        /// TestMark
+        /// </summary>
+        [Column("TESTMARK")]
+        public int? TestMark { get; set; }
+        /// <summary>
+        /// StuSortNo
+        /// </summary>
+        [Column("STUSORTNO")]
+        public string StuSortNo { get; set; }
+        /// <summary>
+        /// 是否可选
+        /// </summary>
+        [Column("ISALLOWSELECT")]
+        public int? IsAllowSelect { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+            this.MakeDate = DateTime.Now;
+            this.CheckMark = "0";//停用
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+            this.ModifyTime = DateTime.Now;
+            this.ModifyUserId = LoginUserInfo.Get().userId;
+            this.ModifyUserName = LoginUserInfo.Get().realName;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfoOfElectiveOnline/LessonInfoOfElectiveOnlineIBLL.cs

@@ -0,0 +1,58 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-05-29 14:28
+    /// 描 述：线上课程
+    /// </summary>
+    public interface LessonInfoOfElectiveOnlineIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<LessonInfoOfElectiveOnlineEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取LessonInfoOfElectiveOnline表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        LessonInfoOfElectiveOnlineEntity GetLessonInfoOfElectiveOnlineEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, LessonInfoOfElectiveOnlineEntity entity);
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 启用/停用实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DoLock(string keyValue, string status);
+
+
+        #endregion
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfoOfElectiveOnline/LessonInfoOfElectiveOnlineService.cs

@@ -0,0 +1,199 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-05-29 14:28
+    /// 描 述：线上课程
+    /// </summary>
+    public class LessonInfoOfElectiveOnlineService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<LessonInfoOfElectiveOnlineEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM LessonInfoOfElectiveOnline t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    dp.Add("LessonNo", "%" + queryParam["LessonNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.LessonNo Like @LessonNo ");
+                }
+                if (!queryParam["LessonName"].IsEmpty())
+                {
+                    dp.Add("LessonName", "%" + queryParam["LessonName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.LessonName Like @LessonName ");
+                }
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpNo = @EmpNo ");
+                }
+                if (!queryParam["CheckMark"].IsEmpty())
+                {
+                    dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CheckMark = @CheckMark ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<LessonInfoOfElectiveOnlineEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取LessonInfoOfElectiveOnline表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public LessonInfoOfElectiveOnlineEntity GetLessonInfoOfElectiveOnlineEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<LessonInfoOfElectiveOnlineEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<LessonInfoOfElectiveOnlineEntity>(t => t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, LessonInfoOfElectiveOnlineEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 启用/停用实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoLock(string keyValue, string status)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").ExecuteBySql($"update LessonInfoOfElectiveOnline set CheckMark='{status}' where Id='{keyValue}' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs

@@ -85,8 +85,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     //不查看状态为草稿的记录
                     strSql.Append(" AND t.Status > 0 ");
-                    //二级学院审核专员==系部负责人==登录用户
-                    strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+                    //二级学院审核专员==系部的资助审核人==登录用户，系统管理员除外
+                    if (LoginUserInfo.Get().account.ToLower() != "system")
+                    {
+                        strSql.Append($" and d.DeptSubsidizer='{LoginUserInfo.Get().account}' ");
+                    }
                 }
                 if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核
                 {
@@ -98,6 +101,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Status", queryParam["Status"].ToString(), DbType.String);
                     strSql.Append(" AND t.Status = @Status ");
                 }
+                if (!queryParam["CreateUserNo"].IsEmpty())
+                {
+                    dp.Add("CreateUserNo", queryParam["CreateUserNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CreateUserNo = @CreateUserNo ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<SchoolLevelScholarshipEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -245,7 +253,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
                 }
-                else if (step == "3")//第三步：退回辅导员、退回二级学院
+                else if (step == "3")//第三步：退回辅导员、退回二级学院、取消归档
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs

@@ -75,7 +75,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                
+
                 if (!queryParam["Types"].IsEmpty())//助学金类型：1国家助学金，2校级助学金
                 {
                     dp.Add("Types", queryParam["Types"].ToString(), DbType.String);
@@ -132,8 +132,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     //不查看状态为草稿的记录
                     strSql.Append(" AND t.Status > 0 ");
-                    //二级学院审核专员==系部负责人==登录用户
-                    strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+                    //二级学院审核专员==系部的资助审核人==登录用户，系统管理员除外
+                    if (LoginUserInfo.Get().account.ToLower() != "system")
+                    {
+                        strSql.Append($" and d.DeptSubsidizer='{LoginUserInfo.Get().account}' ");
+                    }
                 }
                 if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核
                 {
@@ -145,6 +148,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Status", queryParam["Status"].ToString(), DbType.String);
                     strSql.Append(" AND t.Status = @Status ");
                 }
+                if (!queryParam["CreateUserNo"].IsEmpty())
+                {
+                    dp.Add("CreateUserNo", queryParam["CreateUserNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CreateUserNo = @CreateUserNo ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<StuFellowshipEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -293,7 +301,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
                 }
-                else if (step == "3")//第三步：退回辅导员、退回二级学院
+                else if (step == "3")//第三步：退回辅导员、退回二级学院、取消归档
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1883,6 +1883,10 @@
     <Compile Include="AssetManagementSystem\Ass_FixAssetsApply\Ass_FixAssetsApplyService.cs" />
     <Compile Include="AssetManagementSystem\Ass_FixAssetsApply\Ass_FixAssetsApplyBLL.cs" />
     <Compile Include="AssetManagementSystem\Ass_FixAssetsApply\Ass_FixAssetsApplyIBLL.cs" />
+    <Compile Include="EducationalAdministration\LessonInfoOfElectiveOnline\LessonInfoOfElectiveOnlineEntity.cs" />
+    <Compile Include="EducationalAdministration\LessonInfoOfElectiveOnline\LessonInfoOfElectiveOnlineService.cs" />
+    <Compile Include="EducationalAdministration\LessonInfoOfElectiveOnline\LessonInfoOfElectiveOnlineBLL.cs" />
+    <Compile Include="EducationalAdministration\LessonInfoOfElectiveOnline\LessonInfoOfElectiveOnlineIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/FamilyEconomy/FamilyEconomyEntity.cs

@@ -374,11 +374,11 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         [NotMapped]
         public string StuName { get; set; }
         /// <summary>
-        /// 院校
+        /// 院系
         /// </summary>
         /// <returns></returns>
         [NotMapped]
-        public string F_SchoolId { get; set; }
+        public string DeptNo { get; set; }
         /// <summary>
         /// 班级
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/FamilyEconomy/FamilyEconomyService.cs

@@ -138,7 +138,7 @@ namespace Learun.Application.TwoDevelopment.StudentWork
                 var dp = new DynamicParameters(new { });
 
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.*,s.StuName,s.F_SchoolId,s.ClassNo,s.IdentityCardNo ");
+                strSql.Append("SELECT t.*,s.StuName,s.DeptNo,s.ClassNo,s.IdentityCardNo ");
                 strSql.Append(" FROM FamilyEconomy t ");
                 strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo ");
                 strSql.Append(" left join ClassInfo c on t.CreateUserNo=c.ClassTutorNo and s.ClassNo=c.ClassNo ");
@@ -149,15 +149,15 @@ namespace Learun.Application.TwoDevelopment.StudentWork
                     dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.StuNo like @StuNo ");
                 }
-                if (!queryParam["F_SchoolId"].IsEmpty())
+                if (!queryParam["DeptNo"].IsEmpty())
                 {
-                    dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);
-                    strSql.Append(" AND t.F_SchoolId = @F_SchoolId ");
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND s.DeptNo = @DeptNo ");
                 }
                 if (!queryParam["ClassNo"].IsEmpty())
                 {
                     dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                    strSql.Append(" AND s.ClassNo = @ClassNo ");
                 }
                 if (!queryParam["IsLowIncome"].IsEmpty())
                 {
@@ -247,8 +247,11 @@ namespace Learun.Application.TwoDevelopment.StudentWork
                 {
                     //不查看状态为草稿的记录
                     strSql.Append(" AND t.Status > 0 ");
-                    //二级学院审核专员==系部负责人==登录用户
-                    strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+                    //二级学院审核专员==系部的资助审核人==登录用户，系统管理员除外
+                    if (LoginUserInfo.Get().account.ToLower() != "system")
+                    {
+                        strSql.Append($" and d.DeptSubsidizer='{LoginUserInfo.Get().account}' ");
+                    }
                 }
                 if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核
                 {
@@ -260,6 +263,11 @@ namespace Learun.Application.TwoDevelopment.StudentWork
                     dp.Add("Status", queryParam["Status"].ToString(), DbType.String);
                     strSql.Append(" AND t.Status = @Status ");
                 }
+                if (!queryParam["CreateUserNo"].IsEmpty())
+                {
+                    dp.Add("CreateUserNo", queryParam["CreateUserNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CreateUserNo = @CreateUserNo ");
+                }
 
                 return this.BaseRepository("CollegeMIS").FindList<FamilyEconomyEntity>(strSql.ToString(), dp, pagination);
             }
@@ -407,7 +415,7 @@ namespace Learun.Application.TwoDevelopment.StudentWork
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql($"update FamilyEconomy set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
                 }
-                else if (step == "3")//第三步：退回辅导员、退回二级学院
+                else if (step == "3")//第三步：退回辅导员、退回二级学院、取消归档
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql($"update FamilyEconomy set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj

@@ -95,6 +95,7 @@
     <Compile Include="Delegate\NWFDelegateRuleEntity.cs" />
     <Compile Include="Delegate\NWFDelegateService.cs" />
     <Compile Include="NodeMethod\Acc_DormitoryChangeMethod.cs" />
+    <Compile Include="NodeMethod\Ass_FixAssetsMethod.cs" />
     <Compile Include="NodeMethod\Ass_FixAssetsApplyMethod.cs" />
     <Compile Include="NodeMethod\DispatchMethod.cs" />
     <Compile Include="NodeMethod\MeetingManagementApplyMethod.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Ass_FixAssetsMethod.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Learun.Application.TwoDevelopment.AssetManagementSystem;
+
+namespace Learun.Application.WorkFlow
+{
+    public class Ass_FixAssetsMethod : IWorkFlowMethod
+    {
+        Ass_FixAssetsIBLL asset = new Ass_FixAssetsBLL();
+       
+
+        public void Execute(WfMethodParameter parameter)
+        {
+            if (parameter.code == "agree")
+            {
+                asset.ChangeStatusByProcessId(parameter.processId, 2);
+            }
+            else
+            {
+                asset.ChangeStatusByProcessId(parameter.processId, 3);
+            }
+        }
+    }
+}

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue

@@ -375,11 +375,18 @@ export default {
             id: item.F_Id,
           }).then((data) => {
             if (data && data.value) {
-              const { value } = data;
+				let { value } = data;
+				if(value&&value.length){
+					 value = value.sort((a,b)=>{
+						 return new Date(b.f_time).valueOf() - new Date(a.f_time).valueOf()
+					})
+				}
               this.noticeData.push({
                 title: item.F_Name,
+				F_Sort:item.F_Sort,
                 content: value,
               });
+			  this.noticeData = this.noticeData.sort((a,b)=>a.F_Sort - b.F_Sort)
             }
           })
         ),

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config

@@ -5,9 +5,9 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <connectionStrings>
-    <add name="ConnectionPfcMisDBString" connectionString="server=123.57.209.16;database=CollegeMIS_西昌;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=bjqjkj@2014~2015!;" providerName="System.Data.SqlClient" />
+    <add name="ConnectionPfcMisDBString" connectionString="server=123.57.209.16;database=CollegeMIS_塔里木;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=bjqjkj@2014~2015!;" providerName="System.Data.SqlClient" />
     <add name="ConnectionPfcMisDBString2" connectionString="server=192.168.100.225;database=CollegeMIS_金隅;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=Jykj@2019;" providerName="System.Data.SqlClient" />
-    <add name="CoreDBString" connectionString="server=123.57.209.16;database=adms7ultimate2_西昌;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=bjqjkj@2014~2015!;" providerName="System.Data.SqlClient" />
+    <add name="CoreDBString" connectionString="server=123.57.209.16;database=adms7ultimate2_塔里木;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=bjqjkj@2014~2015!;" providerName="System.Data.SqlClient" />
     <add name="CoreDBString2" connectionString="server=192.168.100.225;database=adms7ultimate2_金隅;Max Pool Size=1000;Min Pool Size=5;UID=sa;Pwd=Jykj@2019;" providerName="System.Data.SqlClient" />
     <add name="HangfireConnString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
     <add name="YKTDBString" connectionString="Data Source=xcykt;Persist Security Info=True;User ID=xcysdata;Password=xcysdata2019;Unicode=True" providerName="System.Data.OracleClient" />

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/Quanjiang.DigitalScholl.JobService.csproj

@@ -20,6 +20,7 @@
     <SccProvider>
     </SccProvider>
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -32,7 +33,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>