Merge branch '黑龙江艺术高中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

# Conflicts:
#	Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue

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

@@ -157,7 +157,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 int index = 0;
                 foreach (var item in jo["predata"])
                 {
-                    index++;
+                    //index++;
                     if (string.IsNullOrEmpty(lastdata) || lastdata != item["LessonTime"].ToString())
                     {
                         lastdata = item["LessonTime"].ToString();
@@ -177,6 +177,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                         NewLessonTime = newlessontime
                     };
                     query.Add(term);
+                    index++;
                 }
                 entity.query = query;
             }

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

@@ -4,6 +4,7 @@ using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
 using Learun.Application.TwoDevelopment.LR_CodeDemo;
 using System.Collections.Generic;
+using System;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -47,6 +48,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 主页面-学工查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfTeacher()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据
@@ -72,6 +82,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListOfTeacher(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuCancelDisciplineManagementIBLL.GetPageListOfTeacher(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
         /// <summary>
         /// 获取表单数据
         /// </summary>
@@ -129,8 +161,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
+            var userInfo = LoginUserInfo.Get();
             StuCancelDisciplineManagementEntity entity = strEntity.ToObject<StuCancelDisciplineManagementEntity>();
             entity.CheckStatus = "0";
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = userInfo.userId;
+            entity.CreateUserNo = userInfo.account;
             stuCancelDisciplineManagementIBLL.SaveEntity(keyValue,entity);
             return Success("保存成功！");
         }

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

@@ -48,6 +48,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 主页面-学生查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfStudent()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据

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

@@ -121,6 +121,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 全院班级成绩查看页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StuScoreRank()
+        {
+            return View();
+        }
+        /// <summary>
         /// 新版成绩录入
         /// </summary>
         /// <returns></returns>
@@ -855,6 +864,23 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success(data);
         }
 
+        /// <summary>
+        /// 学生成绩排名
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreListRank(string queryJson)
+        {
+            var data = stuScoreIBLL.GetScoreListRank(queryJson);
+            if (data.Any())
+            {
+                data = data.OrderByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x => x.LessonSortNo).ThenBy(x => x.LessonNo);
+            }
+            return Success(data);
+        }
+
         public ActionResult GetScoreCharts(string AcademicYearNo, string Semester, string ClassNo, string LessonNo)
         {
             var data = stuScoreIBLL.GetScoreCharts(AcademicYearNo, Semester, ClassNo, LessonNo);

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

@@ -484,7 +484,7 @@ var bootstrap = function ($, learun) {
                 learun.alert.warning("校区、学年、学期不一致！");
                 return false;
             }
-        } else if (formData.AttemperType == "01") {     //调课：调度时间比较；教师或教室必填一个；
+        } else if (formData.AttemperType == "01") {     //换课：调度时间比较；教师或教室必填一个；
             if ((formData.NewEmpNo == null || formData.NewEmpNo == "") && (formData.NewClassroomNo == null || formData.NewClassroomNo == "")) {
                 learun.alert.warning("课程新安排中教师或教室不能为空！");
                 return false;
@@ -493,7 +493,7 @@ var bootstrap = function ($, learun) {
                 learun.alert.warning("调度结束时间不能小于调度开始时间！");
                 return false;
             }
-        } else if (formData.AttemperType == "04") {
+        } else if (formData.AttemperType == "04") {     //调课
             if (formData) {
                 formData.predata = JSON.parse($('#gridtable').attr("data-val"));
                 formData.tardata = JSON.parse( $('#gridtable1').attr("data-val"));

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

@@ -142,11 +142,13 @@
         </div>
         <div class="col-xs-6 lr-form-item AttemperType AttemperTypeTiao" data-table="ArrangeLessonTermAttemper">
             <div class="lr-form-item-title">调度开始时间<font face="宋体">*</font></div>
-            <div id="AttemperStartTime"></div>
+            @*<div id="AttemperStartTime"></div>*@
+            <input id="AttemperStartTime" type="text" class="form-control" readonly />
         </div>
         <div class="col-xs-6 lr-form-item AttemperType AttemperTypeTiao" data-table="ArrangeLessonTermAttemper">
             <div class="lr-form-item-title">调度结束时间<font face="宋体">*</font></div>
-            <div id="AttemperEndTime"></div>
+            @*<div id="AttemperEndTime"></div>*@
+            <input id="AttemperEndTime" type="text" class="form-control" readonly />
         </div>
     </div>
 

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

@@ -189,7 +189,7 @@ var bootstrap = function ($, learun) {
             $('#NewEmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
             $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' });
             $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' });
-
+            
         },
         initData: function () {
             if (!!keyValue) {
@@ -274,7 +274,7 @@ var bootstrap = function ($, learun) {
                                 }
                                 html1 += '日期：' + oldtime + ' <br>节次：' + oldjieci.join(';') + ' <br>课程：' + course + ' <br>教师：' + teacher + '; <br>班级：' + class_.join(';') + '<br>教室：' + classroom;
                                 html2 += '调整到：' + newtime + '的' + newjieci.join(';');
-                                console.log(html1)
+                                //console.log(html1)
                                 $("#gridtable").html(html1);
                                 //{"targettime":"2023-6-24","targetjieci":"1节；2节；"}
                                 var target_json = { "targettime": newtime, "targetjieci": newjieci.join(';') }
@@ -282,7 +282,7 @@ var bootstrap = function ($, learun) {
                                 $("#gridtable1").html(html2)
                             }
                         }
-                        
+                       
                     }
                 });
             }
@@ -290,15 +290,30 @@ var bootstrap = function ($, learun) {
     };
     bindData = function (temprow) {
         if (!!temprow) {
-            //$('#F_SchoolId').lrselectSet(temprow.schooldId);
-            $('#AcademicYearNo').lrselectSet(temprow.academicyear);
-            $('#Semester').lrselectSet(temprow.semester);
-            $('#DeptNo').lrselectSet(temprow.deptNo);
-            $('#MajorNo').lrselectSet(temprow.majorNo);
-            $('#LessonNo').lrselectSet(temprow.lessonNo);
-            $('#TeachClassNo').lrselectSet(temprow.teachClassNo);
-            $('#EmpNo').lrselectSet(temprow.empno);
-            $('#ClassroomNo').lrselectSet(temprow.classRoomNo);
+            if ($("#AttemperType").lrselectGet() == "04") {
+                //console.log(temprow)
+                var dataparams = temprow.predata;
+                //$('#gridtable').jfGridSet('refreshdata', temprow.predata);
+                var datahtml = temprow.predatastr;//tardata.targettime + '的' + tardata.targetjieci;
+                $('#gridtable').html(datahtml);
+                $('#gridtable').attr("data-val", JSON.stringify(dataparams))
+                var tardata = (temprow.tardata);
+                var html = '调整到：' + tardata.targettime + '的' + tardata.targetjieci;
+                $('#gridtable1').html(html);
+                $('#gridtable1').attr("data-val", JSON.stringify(tardata))
+                //$('#gridtable1').jfGridSet('refreshdata', temprow.predata);
+                //$('#gridtable').
+            } else {
+                //$('#F_SchoolId').lrselectSet(temprow.schooldId);
+                $('#AcademicYearNo').lrselectSet(temprow.academicyear);
+                $('#Semester').lrselectSet(temprow.semester);
+                $('#DeptNo').lrselectSet(temprow.deptNo);
+                $('#MajorNo').lrselectSet(temprow.majorNo);
+                $('#LessonNo').lrselectSet(temprow.lessonNo);
+                $('#TeachClassNo').lrselectSet(temprow.teachClassNo);
+                $('#EmpNo').lrselectSet(temprow.empno);
+                $('#ClassroomNo').lrselectSet(temprow.classRoomNo);
+            }
             page.query();
         }
     };
@@ -402,7 +417,7 @@ var bootstrap = function ($, learun) {
                             }
                             html1 += '日期：' + oldtime + ' <br>节次：' + oldjieci.join(';') + ' <br>课程：' + course + ' <br>教师：' + teacher + '; <br>班级：' + class_.join(';') + '<br>教室：' + classroom;
                             html2 += '调整到：' + newtime + '的' + newjieci.join(';');
-                            console.log(html1)
+                            //console.log(html1)
                             $("#gridtable").html(html1);
                             //{"targettime":"2023-6-24","targetjieci":"1节；2节；"}
                             var target_json = { "targettime": newtime, "targetjieci": newjieci.join(';') }

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

@@ -254,7 +254,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "日期", name: "AcademicYearNo", width: 100, align: "left",
+                    {
+                        label: "日期", name: "AcademicYearNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.httpAsyncGet('/EducationalAdministration/ArrangeLessonTermAttemper/GetchildData?code=' + row.Id, function (res) {
                                 if (res.code == learun.httpCode.success) {
@@ -275,7 +276,7 @@ var bootstrap = function ($, learun) {
                             learun.httpAsyncGet('/EducationalAdministration/ArrangeLessonTermAttemper/GetchildData?code=' + row.Id, function (res) {
                                 if (res.code == learun.httpCode.success) {
                                     var t_data = [];
-                                    var t_w=[]
+                                    var t_w = []
                                     for (var i = 0; i < res.data.length; i++) {
                                         if (t_data.indexOf(res.data[i].LessonTime.substring(1)) < 0) {
                                             t_data.push(res.data[i].LessonTime.substring(1))
@@ -285,7 +286,7 @@ var bootstrap = function ($, learun) {
                                         }
                                     }
                                     if (row.AttemperType == '04') {
-                                        callback("星期" + weekChina[t_w.join(',') - 1]+'第'+t_data.join(',')+'节');
+                                        callback("星期" + weekChina[t_w.join(',') - 1] + '第' + t_data.sort((a, b) => { return a - b; }).join(',') + '节');
                                     } else {
                                         callback('');
                                     }
@@ -301,7 +302,7 @@ var bootstrap = function ($, learun) {
                                 if (res.code == learun.httpCode.success) {
                                     var t_data = [];
                                     for (var i = 0; i < res.data.length; i++) {
-                                        if (t_data.indexOf(res.data[i].NewLessonDate.substring(0,10)) < 0) {
+                                        if (t_data.indexOf(res.data[i].NewLessonDate.substring(0, 10)) < 0) {
                                             t_data.push(res.data[i].NewLessonDate.substring(0, 10))
                                         }
                                     }
@@ -317,7 +318,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: "调课星期/节次", name: "AcademicYearNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.httpAsyncGet( '/EducationalAdministration/ArrangeLessonTermAttemper/GetchildData?code=' + row.Id, function (res) {
+                            learun.httpAsyncGet('/EducationalAdministration/ArrangeLessonTermAttemper/GetchildData?code=' + row.Id, function (res) {
                                 if (res.code == learun.httpCode.success) {
                                     var t_data = [];
                                     var t_w = []
@@ -330,21 +331,10 @@ var bootstrap = function ($, learun) {
                                         }
                                     }
                                     if (row.AttemperType == '04') {
-                                        callback("星期" + weekChina[t_w.join(',') - 1] + '第' + t_data.join(',') + '节');
+                                        callback("星期" + weekChina[t_w.join(',') - 1] + '第' + t_data.sort((a, b) => { return a - b; }).join(',') + '节');
                                     } else {
                                         callback('');
                                     }
-                                    //var t_data = [];
-                                    //for (var i = 0; i < res.data.length; i++) {
-                                    //    if (t_data.indexOf(res.data[i].NewLessonTime.substring(1)) < 0) {
-                                    //        t_data.push(res.data[i].NewLessonTime.substring(1))
-                                    //    }
-                                    //}
-                                    //if (row.AttemperType == '04') {
-                                    //    callback(t_data.join(',') + '节');
-                                    //} else {
-                                    //    callback('');
-                                    //}
                                 }
                             });
                         }
@@ -543,6 +533,9 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
+                param.CreateUserId = learun.clientdata.get(['userinfo']).userId;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -3,21 +3,17 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item"  data-table="StuCancelDisciplineManagement" >
-        <div class="lr-form-item-title">申请人</div>
-        <input id="CreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelDisciplineManagement">
+        <div class="lr-form-item-title">事情经过<font face="宋体">*</font></div>
+        <textarea id="Things" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="StuCancelDisciplineManagement" >
-        <div class="lr-form-item-title">申请时间</div>
-        <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelDisciplineManagement">
+        <div class="lr-form-item-title">撤销原因<font face="宋体">*</font></div>
+        <textarea id="Reason" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuCancelDisciplineManagement" >
-        <div class="lr-form-item-title">事情经过</div>
-        <textarea id="Things" class="form-control" style="height:100px;"  ></textarea>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuCancelDisciplineManagement" >
-        <div class="lr-form-item-title">撤销原因</div>
-        <textarea id="Reason" class="form-control" style="height:100px;"  ></textarea>
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelDisciplineManagement">
+        <div class="lr-form-item-title">证明材料</div>
+        <div id="Files"></div>  
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Form.js")

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

@@ -6,6 +6,7 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var DisciplineId = request('DisciplineId');//违纪表主键
 // 设置权限
 var setAuthorize;
 // 设置表单数据
@@ -42,9 +43,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
-            $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
-            $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#Files').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {
@@ -90,6 +89,8 @@ var bootstrap = function ($, learun) {
     // 保存数据
     save = function (processId, callBack, i) {
         var formData = $('body').lrGetFormData();
+        //违纪表主键
+        formData.DisciplineId = DisciplineId;
         if (!!processId) {
             formData.ProcessId = processId;
         }

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

@@ -3,21 +3,17 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item" data-table="StuCancelDisciplineManagement">
-        <div class="lr-form-item-title">申请人</div>
-        <input id="CreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuCancelDisciplineManagement">
-        <div class="lr-form-item-title">申请时间</div>
-        <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelDisciplineManagement">
+        <div class="lr-form-item-title">事情经过<font face="宋体">*</font></div>
+        <textarea id="Things" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuCancelDisciplineManagement">
-        <div class="lr-form-item-title">事情经过</div>
-        <textarea id="Things" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+        <div class="lr-form-item-title">撤销原因<font face="宋体">*</font></div>
+        <textarea id="Reason" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuCancelDisciplineManagement">
-        <div class="lr-form-item-title">撤销原因</div>
-        <textarea id="Reason" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+        <div class="lr-form-item-title">证明材料</div>
+        <div id="Files"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/FormView.js")

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

@@ -6,6 +6,7 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var DisciplineId = request('DisciplineId');//违纪表主键
 // 设置权限
 var setAuthorize;
 // 设置表单数据
@@ -43,9 +44,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
-            $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
-            $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#Files').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {
@@ -90,6 +89,8 @@ var bootstrap = function ($, learun) {
     // 保存数据
     save = function (processId, callBack, i) {
         var formData = $('body').lrGetFormData();
+        //违纪表主键
+        formData.DisciplineId = DisciplineId;
         if(!!processId){
             formData.ProcessId =processId;
         }

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

@@ -13,8 +13,8 @@
                         <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="StuName" type="text" class="form-control"/>
+                                    <div class="lr-form-item-title">处分类别</div>
+                                    <input id="SType" type="text" class="form-control"/>
                                 </div>
                             </div>
                         </div>
@@ -25,7 +25,7 @@
                         <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_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>
                     </div>

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

@@ -21,27 +21,43 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            $('#SType').lrDataItemSelect({ code: 'DisType' });
             // 新增
             $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/Form',
-                    width: 1000,
-                    height: 600,
-                    callBack: function (id) {
-                        var res = false;
-                        // 验证数据
-                        res = top[id].validForm();
-                        // 保存数据
-                        if (res) {
-                            res = top[id].save('', function () {
-                                page.search();
-                            });
-                        }
-                        return res;
+                var DisciplineId = $('#gridtable').jfGridValue('DisciplineId');
+                if (learun.checkrow(DisciplineId)) {
+                    var keyValue = $('#gridtable').jfGridValue('Id');
+                    if (keyValue != null) {
+                        learun.alert.warning("已申请撤销，请点击编辑！");
+                        return false;
                     }
-                });
+                    //判断违纪的审核时间，达到半年后，才可申请撤销；
+                    var DisciplineCheckTime = $('#gridtable').jfGridValue('DisciplineCheckTime');
+                    var DisciplineCheckTimeDate = new Date(DisciplineCheckTime);
+                    if (new Date() <= DisciplineCheckTimeDate.setMonth(DisciplineCheckTimeDate.getMonth()+6)) {
+                        learun.alert.warning("违纪的审核时间未达到半年，不可以申请撤销！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '新增',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/Form?DisciplineId=' + DisciplineId,
+                        width: 800,
+                        height: 600,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
             });
             // 编辑
             $('#lr_edit').on('click', function () {
@@ -56,7 +72,7 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/Form?keyValue=' + keyValue,
-                        width: 1000,
+                        width: 800,
                         height: 600,
                         callBack: function (id) {
                             var res = false;
@@ -99,7 +115,7 @@ var bootstrap = function ($, learun) {
                         id: 'formview',
                         title: '查看',
                         url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/FormView?keyValue=' + keyValue,
-                        width: 1000,
+                        width: 800,
                         height: 600,
                         btn: null
                     });
@@ -127,26 +143,54 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/GetPageList',
                 headData: [
                     {
-                        label: "申请人", name: "CreateUserId", width: 100, align: "left",
+                        label: "违纪学生", name: "StuNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
                                 key: value,
+                                keyId: 'stuno',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['stuname']);
                                 }
                             });
                         }
                     },
-                    { label: "申请时间", name: "CreateTime", width: 120, align: "left" },
-                    { label: "事情经过", name: "Things", width: 150, align: "left" },
+                    {
+                        label: "处分类别", name: "SType", width: 80, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DisType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "违纪审核时间", name: "DisciplineCheckTime", width: 120, align: "left" },
+                    { label: "违纪事情经过", name: "DisciplineThings", width: 200, align: "left" },
+                    { label: "申请撤销时间", name: "CreateTime", width: 120, align: "left" },
+                    { label: "撤销事情经过", name: "Things", width: 200, align: "left" },
                     { label: "撤销原因", name: "Reason", width: 150, align: "left" },
                     {
-                        label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
-                            return cellvalue == "1" ? "<span class=\"label label-warning\">审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">审核通过</span>" : cellvalue == "3" ? "<span class=\"label label-danger\">审核未通过</span>" : "<span class=\"label label-default\">草稿</span>";
+                        label: "撤销审核状态", name: "CheckStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            if (row.Id == null || row.Id == undefined || row.Id == "") {
+                                callback("");
+                            } else {
+                                if (value == "1") {
+                                    callback("<span class=\"label label-warning\">审核中</span>");
+                                } else if (value == "2") {
+                                    callback("<span class=\"label label-success\">审核通过</span>");
+                                } else if (value == "3") {
+                                    callback("<span class=\"label label-danger\">审核未通过</span>");
+                                } else {
+                                    callback("<span class=\"label label-default\">草稿</span>");
+                                }
+                            }
                         }
                     },
                 ],
@@ -158,6 +202,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.StuNo = learun.clientdata.get(['userinfo']).account;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/IndexOfTeacher.cshtml

@@ -0,0 +1,40 @@
+@{
+                /**/
+
+                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="SType" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">违纪学生</div>
+                                    <div id="StuNo"></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-plus"></i>&nbsp;查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/IndexOfTeacher.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/IndexOfTeacher.js

@@ -0,0 +1,128 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-04-14 11:52
+ * 描  述：学生撤销违纪管理
+ */
+var refreshGirdData;
+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);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#SType').lrDataItemSelect({ code: 'DisType' });
+            $('#StuNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetAllList',
+                param: { strWhere: "1=1 " },
+                value: "StuNo",
+                text: "StuName"
+            });
+            //  查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/FormView?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/GetPageListOfTeacher',
+                headData: [
+                    {
+                        label: "违纪学生", name: "StuNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
+                                key: value,
+                                keyId: 'stuno',
+                                callback: function (_data) {
+                                    callback(_data['stuname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "处分类别", name: "SType", width: 80, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DisType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "违纪审核时间", name: "DisciplineCheckTime", width: 120, align: "left" },
+                    { label: "违纪事情经过", name: "DisciplineThings", width: 200, align: "left" },
+                    { label: "申请撤销时间", name: "CreateTime", width: 120, align: "left" },
+                    { label: "撤销事情经过", name: "Things", width: 200, align: "left" },
+                    { label: "撤销原因", name: "Reason", width: 150, align: "left" },
+                    {
+                        label: "撤销审核状态", name: "CheckStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            if (row.Id == null || row.Id == undefined || row.Id == "") {
+                                callback("");
+                            } else {
+                                if (value == "1") {
+                                    callback("<span class=\"label label-warning\">审核中</span>");
+                                } else if (value == "2") {
+                                    callback("<span class=\"label label-success\">审核通过</span>");
+                                } else if (value == "3") {
+                                    callback("<span class=\"label label-danger\">审核未通过</span>");
+                                } else {
+                                    callback("<span class=\"label label-default\">草稿</span>");
+                                }
+                            }
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: "CreateTime desc"
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (!!res) {
+            if (res.code == 200) {
+                // 发起流程
+                var postData = {
+                    schemeCode: 'StuCancelDisciplineManagement',// 填写流程对应模板编号
+                    processId: processId,
+                    level: '1',
+                };
+                learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                    learun.loading(false);
+                });
+            }
+            page.search();
+        }
+    };
+    page.init();
+}

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

@@ -24,8 +24,8 @@
         <input id="DealTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#DealTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuDisciplineManagement">
-        <div class="lr-form-item-title">事情经过</div>
-        <textarea id="Things" class="form-control" style="height:100px;"></textarea>
+        <div class="lr-form-item-title">事情经过<font face="宋体">*</font></div>
+        <textarea id="Things" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuDisciplineManagement">
         <div class="lr-form-item-title">学生态度</div>

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

@@ -24,8 +24,8 @@
         <input id="DealTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#DealTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuDisciplineManagement">
-        <div class="lr-form-item-title">事情经过</div>
-        <textarea id="Things" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+        <div class="lr-form-item-title">事情经过<font face="宋体">*</font></div>
+        <textarea id="Things" class="form-control" style="height:100px;" readonly="readonly" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuDisciplineManagement">
         <div class="lr-form-item-title">学生态度</div>

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

@@ -94,7 +94,7 @@ var bootstrap = function ($, learun) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
+                                page.search();
                             });
                         }
                     });
@@ -109,7 +109,7 @@ var bootstrap = function ($, learun) {
                         title: '查看',
                         url: top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/FormView?keyValue=' + keyValue,
                         width: 1000,
-                        height: 600,
+                        height: 800,
                         btn: null
                     });
                 }
@@ -235,6 +235,11 @@ var bootstrap = function ($, learun) {
                             return cellvalue == "1" ? "<span class=\"label label-warning\">审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">审核通过</span>" : cellvalue == "3" ? "<span class=\"label label-danger\">审核未通过</span>" : "<span class=\"label label-default\">草稿</span>";
                         }
                     },
+                    {
+                        label: "是否申请撤销", name: "CancelId", width: 100, align: "left", formatter: function (cellvalue) {
+                            return (cellvalue != null && cellvalue != undefined && cellvalue != "") ? "是" : "否";
+                        }
+                    },
                 ],
                 mainId: 'Id',
                 isPage: true,

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

@@ -0,0 +1,36 @@
+@{
+                /**/
+
+                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>
+                                    <div id="EmpNo"></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-plus"></i>&nbsp;查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuDisciplineManagement/IndexOfStudent.js")

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

@@ -0,0 +1,159 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-26 15:23
+ * 描  述：学生违纪管理
+ */
+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);
+            }, 220, 400);
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+            // 刷新
+            $('#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/StuDisciplineManagement/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/GetPageList',
+                headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    {
+                        label: "处分类别", name: "SType", width: 80, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DisType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "违纪学生", name: "StuNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
+                                key: value,
+                                keyId: 'stuno',
+                                callback: function (_data) {
+                                    callback(_data['stuname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "性别", name: "GenderNo", width: 50, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    { label: "电话", name: "Mobile", 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: "majorno", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        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: "EmpNo", width: 100, 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: "DealTime", width: 120, align: "left" },
+                    { label: "事情经过", name: "Things", width: 200, align: "left" },
+                    { label: "学生态度", name: "StudentAttitude", width: 100, align: "left" },
+                    { label: "班主任意见", name: "TeacherOpinion", width: 100, align: "left" },
+                    { label: "家长意见", name: "ParentsOpinion", width: 100, align: "left" },
+                    { label: "学院意见", name: "SchoolOpinion", width: 100, align: "left" },
+                    {
+                        label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-warning\">审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">审核通过</span>" : cellvalue == "3" ? "<span class=\"label label-danger\">审核未通过</span>" : "<span class=\"label label-default\">草稿</span>";
+                        }
+                    },
+                    {
+                        label: "是否申请撤销", name: "CancelId", width: 100, align: "left", formatter: function (cellvalue) {
+                            return (cellvalue != null && cellvalue != undefined && cellvalue != "") ? "是" : "否";
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: "CreateTime desc"
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StuNo = learun.clientdata.get(['userinfo']).account;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    page.init();
+}

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

@@ -7,10 +7,6 @@
         <div class="lr-form-item-title">学校<font face="宋体">*</font></div>
         <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
-        <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic" id="CodeId">
         <div class="lr-form-item-title">学籍号</div>
         <input id="StuCode" type="text" class="form-control" />
@@ -20,101 +16,141 @@
         <input id="ksh" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">通知书号<font face="宋体">*</font></div>
-        <input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
-        <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">通知书号<font face="宋体">*</font></div>
+            <input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
         <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">民族<font face="宋体">*</font></div>
-        <div id="NationalityNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">性别<font face="宋体">*</font></div>
         <div id="GenderNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">疫情状态</div>
-        <div id="HealthStatus"></div>
+        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
+        <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">出生日期<font face="宋体">*</font></div>
+        <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">民族<font face="宋体">*</font></div>
+        <div id="NationalityNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">疫情状态</div>
+            <div id="HealthStatus"></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
         <div id="PartyFaceNo"></div>
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">健康状况</div>
+            <div id="HealthStatusNo"></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">出生日期<font face="宋体">*</font></div>
-        <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">档案自带</div>
+        <div id="IsArchives"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">健康状况</div>
-        <div id="HealthStatusNo"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">户口分类</div>
         <div id="ResidenceNo"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">籍贯</div>
-        <div class="col-xs-12 lr-form-area">
-            <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
-            <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
-            <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
-        </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">系所<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">照片</div>
-        <div id="Photo"></div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
-        <input id="mobile" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">E-mail</div>
-        <input id="EMail" type="text" class="form-control" />
+        <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
+        <div id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">开户银行<font face="宋体">*</font></div>
-        <div id="DepositBank" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">学制</div>
+        <div id="EduSystem"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">开户卡账号<font face="宋体">*</font></div>
-        <input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" />
+        <div class="lr-form-item-title">学习形式</div>
+        <div id="StudyModality"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">开户银行位置</div>
-        <input id="BankLocation" type="text" class="form-control" />
+        <div class="lr-form-item-title">入学年月<font face="宋体">*</font></div>
+        <input id="EntranceDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EntranceDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">通信地址<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">通讯地址<font face="宋体">*</font></div>
         <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">邮政编码<font face="宋体">*</font></div>
-        <input id="PostalCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">照片</div>
+        <div id="Photo"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">户口所在地</div>
-        <input id="FatherUnit" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
+        <input id="mobile" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">档案所在地</div>
-        <input id="MatherUnit" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">生源地</div>
+        <div id="StuPlaceCode" type="text" class="form-control"></div>
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">E-mail</div>
+            <input id="EMail" type="text" class="form-control" />
+        </div>*@
+    @*<div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">户口所在地</div>
+            <input id="FatherUnit" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">档案所在地</div>
+            <input id="MatherUnit" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">户籍所在地</div>
         <input id="Domicile" type="text" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">籍贯</div>
+        <div class="col-xs-12 lr-form-area">
+            <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
+            <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
+            <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
+        </div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">是否单亲</div>
-        <div id="IsSingle"></div>
+        <div class="lr-form-item-title">邮政编码<font face="宋体">*</font></div>
+        <input id="PostalCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">开户银行<font face="宋体">*</font></div>
+        <div id="DepositBank" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">开户卡账号<font face="宋体">*</font></div>
+        <input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">开户银行位置</div>
+        <input id="BankLocation" type="text" class="form-control" />
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">是否单亲</div>
+            <div id="IsSingle"></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">父亲姓名</div>
         <input id="FatherName" type="text" class="form-control" />
@@ -139,22 +175,22 @@
         <div class="lr-form-item-title">母亲电话</div>
         <input id="MatherPhone" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">户籍地址</div>
-        <input id="OneDomicile" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">户籍地址</div>
-        <input id="TwoDomicile" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">现住址</div>
-        <input id="OneAddress" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">现住址</div>
-        <input id="TwoAddress" type="text" class="form-control" />
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">户籍地址</div>
+            <input id="OneDomicile" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">户籍地址</div>
+            <input id="TwoDomicile" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">现住址</div>
+            <input id="OneAddress" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">现住址</div>
+            <input id="TwoAddress" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">监护人姓名</div>
         <input id="GuardianName" type="text" class="form-control" />
@@ -167,10 +203,10 @@
         <div class="lr-form-item-title">监护人电话</div>
         <input id="GuardianPhone" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">监护人户籍地址</div>
-        <input id="GuardianDomicile" type="text" class="form-control" />
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">监护人户籍地址</div>
+            <input id="GuardianDomicile" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">监护人现住址</div>
         <input id="GuardianAddress" type="text" class="form-control" />
@@ -184,77 +220,53 @@
         <div id="OverseasChineseNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
-        <div id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">培养层次</div>
+        <div id="PieceCultivateWay"></div>
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">本专科</div>
+                <div id="GraduateNo"></div>
+            </div
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">报到日期<font face="宋体">*</font></div>
+                <input id="RegisterDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#RegisterDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+            </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">本专科</div>
-        <div id="GraduateNo"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">学制</div>
-        <div id="EduSystem"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">报到日期<font face="宋体">*</font></div>
-        <input id="RegisterDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#RegisterDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">学习形式</div>
-        <div id="StudyModality"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">毕业证号</div>
-        <input id="DiplomaNo" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">毕业日期</div>
+        <div class="lr-form-item-title">预计毕业日期</div>
         <input id="GraduateYear" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#GraduateYear').trigger('change'); } })" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">毕业证书备注</div>
-        <input id="DiplomaRemark" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">系所<font face="宋体">*</font></div>
-        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">入学年月<font face="宋体">*</font></div>
-        <input id="EntranceDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EntranceDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">入党时间</div>
-        <input id="JoinPartyDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#JoinPartyDate').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">入团时间</div>
-        <input id="JoinLeagueDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#JoinLeagueDate').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">校内地址</div>
-        <input id="InSchoolAddress" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">校内电话</div>
-        <input id="InSchoolTelephone" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">QQ</div>
-        <input id="QQ" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">特长</div>
-        <input id="GoodAt" type="text" class="form-control" />
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">毕业证号</div>
+            <input id="DiplomaNo" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">毕业证书备注</div>
+            <input id="DiplomaRemark" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">入党时间</div>
+            <input id="JoinPartyDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#JoinPartyDate').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">入团时间</div>
+                <input id="JoinLeagueDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#JoinLeagueDate').trigger('change'); } })" />
+            </div>
+            <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">校内地址</div>
+                <input id="InSchoolAddress" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">校内电话</div>
+                <input id="InSchoolTelephone" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">QQ</div>
+                <input id="QQ" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">特长</div>
+                <input id="GoodAt" type="text" class="form-control" />
+            </div>*@
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">备注</div>
         <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>

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

@@ -72,6 +72,9 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' });
+            $('#StuPlaceCode').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname' });
+            $('#IsArchives').lrDataItemSelect({ code: 'YesOrNoInt' });
+            $('#PieceCultivateWay').lrDataItemSelect({ code: 'EducationLevel' });
             $('#F_ProvinceId').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {
@@ -119,7 +122,7 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
+            $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });            
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataItemSelect({ code: 'National' });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });

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

@@ -235,10 +235,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
-                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left" },
                     { label: "考生号", name: "ksh", width: 100, align: "left" },
-                    { label: "通知书号", name: "NoticeNo", width: 100, align: "left" },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -334,14 +332,39 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
+                    //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
                     { label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
                     //{ label: "余额", name: "Balance", width: 100, align: "left" },
                     { label: "通讯地址", name: "MailAddress", width: 100, align: "left" },
                     { label: "联系电话", name: "mobile", width: 100, align: "left" },
-                    { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
-                    { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+                    {
+                        label: "生源地", name: "StuPlaceCode", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
+                        }
+                    },
+                    //{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
+                    //{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
                     { label: "户籍所在地", name: "Domicile", width: 100, align: "left" },
+                    {
+                        label: "档案是否自带", name: "IsArchives", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "户口分类", name: "ResidenceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -393,6 +416,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
                     //{ label: "E-mail", name: "E-mail", width: 100, align: "center" },
                     {
                         label: "开户银行", name: "DepositBank", width: 100, align: "center",
@@ -408,32 +432,31 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "开户卡账号", name: "BankCard", width: 100, align: "center" },
                     { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" },
-                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
-                    {
-                        label: "是否单亲", name: "IsSingle", width: 100, align: "left",
-                        formatter: function (value, row) {
-                            if (value == true) {
-                                return '是';
-                            }
-                            else if (value == false) {
-                                return '否';
-                            }
-                        }
-                    },
+                    //{
+                    //    label: "是否单亲", name: "IsSingle", width: 100, align: "left",
+                    //    formatter: function (value, row) {
+                    //        if (value == true) {
+                    //            return '是';
+                    //        }
+                    //        else if (value == false) {
+                    //            return '否';
+                    //        }
+                    //    }
+                    //},
                     { label: "父亲姓名", name: "FatherName", width: 100, align: "center" },
                     { label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" },
                     { label: "父亲电话", name: "FatherPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
-                    { label: "现住址", name: "OneAddress", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
+                    //{ label: "现住址", name: "OneAddress", width: 100, align: "center" },
                     { label: "母亲姓名", name: "MatherName", width: 100, align: "center" },
                     { label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" },
                     { label: "母亲电话", name: "MatherPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
-                    { label: "现住址", name: "TwoAddress", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
+                    //{ label: "现住址", name: "TwoAddress", width: 100, align: "center" },
                     { label: "监护人姓名", name: "GuardianName", width: 100, align: "center" },
                     { label: "身份证号", name: "GuardianIdCardNo", width: 100, align: "center" },
                     { label: "监护人电话", name: "GuardianPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
                     { label: "现住址", name: "GuardianAddress", width: 100, align: "center" },
                     {
                         label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center",
@@ -460,25 +483,38 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                        label: "培养层次", name: "PieceCultivateWay", width: 100, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'CollegeType',
+                                code: 'EducationLevel',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+
+                    //{
+                    //    label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'CollegeType',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "毕业日期", name: "GraduateYear", width: 100, align: "center",
                         formatter: function (cellvalue) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
                     },
-                    { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
+                    //{ label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+                    //{ label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
                     //{
                     //    label: "入党时间", name: "BankCard", width: 100, align: "center",
                     //    formatter: function (cellvalue) {
@@ -491,10 +527,10 @@ var bootstrap = function ($, learun) {
                     //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                     //    }
                     //},
-                    { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
-                    { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
-                    { label: "QQ", name: "QQ", width: 100, align: "center" },
-                    { label: "特长", name: "GoodAt", width: 100, align: "center" },
+                    //{ label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
+                    //{ label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
+                    //{ label: "QQ", name: "QQ", width: 100, align: "center" },
+                    //{ label: "特长", name: "GoodAt", width: 100, align: "center" },
                     { label: "备注", name: "Remark", width: 200, align: "center" },
                     {
                         label: "异动状态", name: "MoveStatus", width: 80, align: "center",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js

@@ -235,10 +235,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "学籍号", name: "StuCode", width: 100, align: "left" },
-                    //{ label: "考生号", name: "ksh", width: 100, align: "left" },
-                    { label: "通知书号", name: "NoticeNo", width: 100, align: "left" },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -334,14 +332,39 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
+                    //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
                     { label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
                     //{ label: "余额", name: "Balance", width: 100, align: "left" },
                     { label: "通讯地址", name: "MailAddress", width: 100, align: "left" },
                     { label: "联系电话", name: "mobile", width: 100, align: "left" },
-                    { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
-                    { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+                    {
+                        label: "生源地", name: "StuPlaceCode", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
+                        }
+                    },
+                    //{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
+                    //{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
                     { label: "户籍所在地", name: "Domicile", width: 100, align: "left" },
+                    {
+                        label: "档案是否自带", name: "IsArchives", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "户口分类", name: "ResidenceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -393,6 +416,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
                     //{ label: "E-mail", name: "E-mail", width: 100, align: "center" },
                     {
                         label: "开户银行", name: "DepositBank", width: 100, align: "center",
@@ -408,32 +432,31 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "开户卡账号", name: "BankCard", width: 100, align: "center" },
                     { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" },
-                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
-                    {
-                        label: "是否单亲", name: "IsSingle", width: 100, align: "left",
-                        formatter: function (value, row) {
-                            if (value == true) {
-                                return '是';
-                            }
-                            else if (value == false) {
-                                return '否';
-                            }
-                        }
-                    },
+                    //{
+                    //    label: "是否单亲", name: "IsSingle", width: 100, align: "left",
+                    //    formatter: function (value, row) {
+                    //        if (value == true) {
+                    //            return '是';
+                    //        }
+                    //        else if (value == false) {
+                    //            return '否';
+                    //        }
+                    //    }
+                    //},
                     { label: "父亲姓名", name: "FatherName", width: 100, align: "center" },
                     { label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" },
                     { label: "父亲电话", name: "FatherPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
-                    { label: "现住址", name: "OneAddress", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
+                    //{ label: "现住址", name: "OneAddress", width: 100, align: "center" },
                     { label: "母亲姓名", name: "MatherName", width: 100, align: "center" },
                     { label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" },
                     { label: "母亲电话", name: "MatherPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
-                    { label: "现住址", name: "TwoAddress", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
+                    //{ label: "现住址", name: "TwoAddress", width: 100, align: "center" },
                     { label: "监护人姓名", name: "GuardianName", width: 100, align: "center" },
                     { label: "身份证号", name: "GuardianIdCardNo", width: 100, align: "center" },
                     { label: "监护人电话", name: "GuardianPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
                     { label: "现住址", name: "GuardianAddress", width: 100, align: "center" },
                     {
                         label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center",
@@ -460,25 +483,37 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                        label: "培养层次", name: "PieceCultivateWay", width: 100, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'CollegeType',
+                                code: 'EducationLevel',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+                    //{
+                    //    label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'CollegeType',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "毕业日期", name: "GraduateYear", width: 100, align: "center",
                         formatter: function (cellvalue) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
                     },
-                    { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
+                    //{ label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+                    //{ label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
                     //{
                     //    label: "入党时间", name: "BankCard", width: 100, align: "center",
                     //    formatter: function (cellvalue) {
@@ -491,10 +526,10 @@ var bootstrap = function ($, learun) {
                     //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                     //    }
                     //},
-                    { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
-                    { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
-                    { label: "QQ", name: "QQ", width: 100, align: "center" },
-                    { label: "特长", name: "GoodAt", width: 100, align: "center" },
+                    //{ label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
+                    //{ label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
+                    //{ label: "QQ", name: "QQ", width: 100, align: "center" },
+                    //{ label: "特长", name: "GoodAt", width: 100, align: "center" },
                     { label: "备注", name: "Remark", width: 200, align: "center" },
                     {
                         label: "异动状态", name: "MoveStatus", width: 80, align: "center",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/StuScoreRank.cshtml

@@ -0,0 +1,50 @@
+@{ ViewBag.Title = "全院学生成绩查看"; Layout = "~/Views/Shared/_Index.cshtml"; }
+<style>
+    .lr-select {
+        width: 150px;
+    }
+</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="AcademicYearNo" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="Semester" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <input id="StuNo" type="text" class="form-control" placeholder="请输入学号" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <label>应修学分总计：</label>
+                        <span id="spanstudyscoreall">0</span>
+                    </div>    
+                         <div class="lr-layout-tool-item">
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <label>已取得学分：</label>
+                        <span id="spanstudyscore">0</span>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-check-circle"></i>&nbsp;打印</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/StuScoreRank.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/StuScoreRank.js

@@ -0,0 +1,126 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-14 11:02
+ * 描  述：全院学生成绩查看
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.bind();
+            page.bindSelect();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var p = {};
+                p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+                p.Semester = $('#Semester').lrselectGet();
+                p.StuNo = $.trim($('#StuNo').val());
+                if (p.StuNo == null || p.StuNo == "") {
+                    learun.alert.warning("请输入学号！");
+                    return;
+                }
+
+                page.initGird();
+                page.search(p);
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //打印
+            $('#lr_print').on('click', function () {
+                var AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+                var Semester = $('#Semester').lrselectGet();
+                var StuNo = $.trim($('#StuNo').val());
+                if (StuNo == null || StuNo == "") {
+                    learun.alert.warning("请输入学号！");
+                    return;
+                }
+                learun.layerForm({
+                    id: 'AllStuScoreQueryPrint',
+                    title: '学生成绩单',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuScore/AllStuScoreQueryPrint?StuNo=' + StuNo + '&AcademicYearNo=' + AcademicYearNo + '&Semester=' + Semester,
+                    width: 1200,
+                    height: 800,
+                    btn: null
+                });
+            });
+        },
+        bindSelect: function () {
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListRank',
+                headData: [
+                    { label: '学号', name: 'StuNo', width: 100, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 200, align: "left" },
+                    { label: '专业', name: 'MajorName', width: 100, align: "left" },
+                    { label: '班级', name: 'ClassName', width: 100, align: "left" },
+                    { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
+                    { label: '学期', name: 'Semester', width: 50, align: "left" },
+                    { label: '课程分类', name: 'LessonSortName', width: 60, align: "left" },
+                    { label: '课程类型', name: 'LessonTypeName', width: 100, align: "left" },
+                    { label: '科目', name: 'LessonName', width: 300, align: "left" },
+                    { label: '学分', name: 'StudyScore', width: 50, align: "left" },
+                    { label: '成绩', name: 'Score', width: 100, align: "left" },
+                    { label: '第一次补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" },
+                    { label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" },
+                    { label: '专业排名', name: 'RankInMajor', width: 100, align: "left" },
+                    { label: '班级排名', name: 'RankInClass', width: 100, align: "left" },
+                    { label: '系排名', name: 'RankIndept', width: 100, align: "left" },
+                ],
+                mainId: 'StuNo',
+                isPage: false,
+                sidx: '',
+                sord: '',
+                onRenderComplete: function (data) {
+                    var studyscoreall = 0;
+                    var studyscore = 0;
+                    for (var i = 0; i < data.length; i++) {
+                        if (!!data[i].LessonSortNo && data[i].LessonSortNo == "1") {
+                            if (!!data[i].StudyScore) {
+                                studyscoreall += data[i].StudyScore;
+                            }
+                        }
+                        if (!!data[i].Score && data[i].Score >= 60) {
+                            studyscore += data[i].StudyScore;
+                        }
+                    }
+                    $("#spanstudyscoreall").html(studyscoreall + 10);
+                    $("#spanstudyscore").html(studyscore);
+                }
+            });
+
+            //page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs

@@ -193,6 +193,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
             {
                 dtListEntity.F_Sql = dtListEntity.F_Sql.Replace("@@@userId", "'" + loginUserInfo.userId + "'");
             }
+            dtListEntity.F_Sql += " order by F_time desc";
             var reqDataTable = databaseLinkIbll.FindTable(dtListEntity.F_DataSourceId.Trim(), dtListEntity.F_Sql);
             if (dtListEntity.F_Id == "88f94781-acb8-47ca-864b-f96e3d9b5587")
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs

@@ -6,6 +6,9 @@ using System.Collections.Generic;
 using System.Collections;
 using System;
 using System.Linq;
+using Learun.Application.OA;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.WorkFlow;
 
 namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
 {
@@ -91,6 +94,98 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
 
             return Success(count);
         }
+
+
+        private SYS_ReceiveMessageIBLL sYS_ReceiveMessageIBLL = new SYS_ReceiveMessageBLL();
+        private NWFProcessIBLL nWFProcessIBLL = new NWFProcessBLL();
+        private NoticeIBLL newsIBLL = new NoticeBLL();
+        private Sys_ReceiveFileIBLL sys_ReceiveFileIBLL = new Sys_ReceiveFileBLL();
+        /// <summary>
+        /// 获取未读的消息的数量
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetCountFortotalUnread()
+        {
+            int totalcount = 0;
+            #region 待办
+            var userinfo = LoginUserInfo.Get();
+            Pagination paginationobj = new Pagination() { rows = 100, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" };
+            //未读邮件
+            int UnreadMail = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userinfo.userId + "\"}").Count(m => m.READFLAG == 0);
+            //办公事项
+            paginationobj.sidx = "F_CreateDate";
+            int UnreadTask = nWFProcessIBLL.GetMyTaskPageList(userinfo, paginationobj, "{}").Count();
+            //公告
+            List<NewsEntity> outnewslist = new List<NewsEntity>();
+            var newsList = newsIBLL.GetPageList(paginationobj, "");
+            foreach (var newsitemEntity in newsList)
+            {
+                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+                {
+                    if (!string.IsNullOrEmpty(userinfo.postIds))
+                    {
+                        if (userinfo.postIds.Contains(","))
+                        {
+                            foreach (var postid in userinfo.postIds.Split(','))
+                            {
+                                if (newsitemEntity.F_SendPostId.Contains(postid))
+                                {
+                                    outnewslist.Add(newsitemEntity);
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
+                            {
+                                outnewslist.Add(newsitemEntity);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+                    {
+                        if (userinfo.departmentId != null && newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
+                        {
+                            outnewslist.Add(newsitemEntity);
+                        }
+                    }
+                    else
+                    {
+                        outnewslist.Add(newsitemEntity);
+                    }
+                }
+            }
+            //var readnewslist = newsIBLL.GetList("", userinfo.userId).Where(m => !string.IsNullOrEmpty(m.RNewsId)).Select(m => m.F_NewsId);
+            var readnewslist = readbll.GetListOfSelf().Select(m => m.NewsId).ToList();
+            int UnreadNews = outnewslist.Count(m => !readnewslist.Contains(m.F_NewsId));
+            paginationobj.sidx = "SendTime";
+            int UnreadFile = sys_ReceiveFileIBLL.GetPageListBySenderId(userinfo.userId).Count();
+            //普通教师请假-未归档数
+            int UnfileLeave = 0;
+            //中层领导请假-未归档数
+            int UnfileLeaveZC = 0;
+
+            totalcount = UnreadFile + UnreadNews + UnreadTask + UnreadMail + UnfileLeave + UnfileLeaveZC;
+            #endregion
+            var data = new
+            {
+                UnreadTask= UnreadTask,
+                UnreadNews= UnreadNews,
+                UnfileLeave= UnfileLeave,
+                UnfileLeaveZC= UnfileLeaveZC,
+                totalcount = totalcount
+            };
+            return Success(data);
+        }
+        private static LR_OA_NewsReadBLL readbll = new LR_OA_NewsReadBLL();
         /// <summary>
         /// 获取未读的消息
         /// </summary>
@@ -245,11 +340,32 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
                 else
                 {
                     messageRindIBLL.SaveReadSigns(keyValue);
+
+
+                    //var loginUserInfo = LoginUserInfo.Get();
+
+                    //var model = messageRindIBLL.GetMessageRemindEntity(keyValue);
+                    ////判断当前用户是否阅读当前通知公告
+                    //var entity = lR_OA_NewsReadIBLL.GetLR_OA_NewsReadEntityByNewsIdAndUserId(model.InstanceId, loginUserInfo.userId);
+                    //if (entity == null)
+                    //{
+                    //    var lR_OA_NewsRead = new LR_OA_NewsReadEntity()
+                    //    {
+                    //        NewsId = model.InstanceId,
+                    //        RUserId = loginUserInfo.userId,
+                    //        RUserName = loginUserInfo.realName,
+                    //        RTime = DateTime.Now
+                    //    };
+                    //    lR_OA_NewsReadIBLL.SaveEntity("", lR_OA_NewsRead);
+
+                    //    //修改当前通知公告的浏览量
+                    //    lR_OA_NewsReadIBLL.UpdateNewsPV(model.InstanceId);
+                    //}
                 }
             }
             return Success("保存成功！");
         }
-
+        private static LR_OA_NewsReadBLL lR_OA_NewsReadIBLL = new LR_OA_NewsReadBLL();
         /// <summary>
         /// 更改状态为已读
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.cshtml

@@ -12,7 +12,7 @@
                     <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">
                         <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>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/WeChatTemplet/Index.js

@@ -65,7 +65,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_Desktop/WeChatTemplet/GetPageList',
                 headData: [
                     { label: "模板名称", name: "TName", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs

@@ -250,6 +250,13 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         /// <returns></returns>
         public ActionResult SignForm()
         {
+            ViewBag.IsHaveStampRight = false;
+            var loginUserInfo = LoginUserInfo.Get();
+            if (loginUserInfo.Description.Contains("管理员") || loginUserInfo.roleIds.Split(',').Contains(Config.GetValue("StampRightRoleId")))
+            {
+                ViewBag.IsHaveStampRight = true;
+            }
+
             return View();
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/StampInfoController.cs

@@ -47,6 +47,31 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         {
             return View();
         }
+
+        /// <summary>
+        /// 管理页面【个人印章】
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult IndexInPersonal()
+        {
+            return View("~/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.cshtml");
+        }
+        /// <summary>
+        /// 表单页面【个人印章】
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult FormInPersonal()
+        {
+            return View("~/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.cshtml");
+        }
+        /// <summary>
+        /// 流程审批-个人印章【个人印章】
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult StampDetailIndexInPersonal()
+        {
+            return View("~/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.cshtml");
+        }
         #endregion
 
         #region 获取数据
@@ -80,9 +105,9 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         /// <returns></returns>
         [HttpGet]
         [AjaxOnly]
-        public ActionResult GetList(string keyword)
+        public ActionResult GetList(string keyword, string userId, string category)
         {
-            var data = lr_StampManageIBLL.GetList(keyword);
+            var data = lr_StampManageIBLL.GetList(keyword,userId,category);
             return Success(data);
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml

@@ -18,7 +18,9 @@
 </style>
 @Html.AppendCssFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css")
 <div class="lr-layout-panel-btn">
-    <a id="print" class="btn btn-primary">打印表单</a>
+    @*<a id="print" class="btn btn-primary">打印表单</a>*@
+    @*流程任务-打印表单*@
+    <a id="print2" class="btn btn-primary">打印表单</a>
 </div>
 <div class="lr-layout-panel">
     <div class="tab-pane" id="forminfo">

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

@@ -8,6 +8,7 @@
 var processId = request('processId');      // 流程实例主键
 var nodeId = request('nodeId');            // 流程节点
 var schemeObj2;
+var nodeInfoList = [];  //审核节点部分，流程任务-打印表单需要使用
 
 var bootstrap = function ($, learun) {
     "use strict";
@@ -240,6 +241,36 @@ var bootstrap = function ($, learun) {
                 $.print('.lr-layout-panel');
             });
             $('#print').show();
+            // 流程任务-打印表单
+            $('#print2').on('click', function () {
+                var $iframes = $('#form_list_iframes');
+                var iframeId = $iframes.find('.form-list-iframe.active').attr('id');
+                //表单部分
+                let res = [];
+                if (iframeId) {
+                    var $iframe = learun.iframe(iframeId, frames);
+                    res = $iframe.$('body').lrGetFormShow();
+                } else {
+                    res = $iframes.lrGetFormShow();
+                }
+                //审核部分
+                let anodeinfoList = [];
+                for (var i = 0; i < nodeInfoList.length; i++) {
+                    var nodeItem = nodeInfoList[i];
+                    if (nodeItem.title != "开始") {
+                        var anodeinfo = {
+                            type: 'anodeinfo',
+                            title: nodeItem.title,
+                            content: nodeItem.content,
+                            date: nodeItem.time,
+                            user: nodeItem.people,
+                        };
+                        anodeinfoList.push(anodeinfo);
+                    }
+                }
+                $.jqprintForm(res.concat(anodeinfoList));
+            });
+            $('#print2').show();
         },
         // iframe 加载
         iframeLoad: function (iframeId, url, callback, formData) {
@@ -256,7 +287,11 @@ var bootstrap = function ($, learun) {
                 }
 
                 if (!!iframeObj.$) {
-                    callback(iframeObj, formData);
+                    //callback(iframeObj, formData);
+                    //优化系统表单中的数据无法回显问题；
+                    setTimeout(function () {
+                        callback(iframeObj, formData);
+                    }, 10);
                 }
             };
 
@@ -405,6 +440,7 @@ var bootstrap = function ($, learun) {
 
                                 nodelist.push(point);
                             }
+                            nodeInfoList = nodelist;
                             $('#wf_timeline').lrtimelineEsc(nodelist);
                         }
                     });

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

@@ -74,8 +74,8 @@
                 </div>
             </div>
             <div class="col-xs-12 lr-form-item flow-item" style="padding:0;" id="flow-des">
-                <div class="lr-form-item-title" style="position:relative;width:100%;text-align:left;">审批意见<font face="宋体">*</font></div>
-                <textarea id="des" class="form-control" style="height: 120px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+                <div class="lr-form-item-title" style="position:relative;width:100%;text-align:left;">审批意见</div>
+                <textarea id="des" class="form-control" style="height: 120px;"></textarea>
             </div>
             <div class="col-xs-12 flow-btn">
                 <a id="release" class="btn btn-success">创建流程</a>

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

@@ -132,7 +132,7 @@
 
         .form-list-tabs .nav-tabs > li {
             white-space: nowrap;
-            display: inline-block !important;
+            /*display: inline-block !important;*/
             float: initial;
         }
 
@@ -236,13 +236,13 @@
 
 .auditinfo-s {
     position: absolute;
-    top: 0;
-    right: 200px;
-    height: 100px;
+    top: 25px;
+    right: 225px;
+    height: 50px;
 }
 
     .auditinfo-s img {
-        height: 100px;
+        height: 50px;
     }
 
 .auditinfo-sg {

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

@@ -86,11 +86,11 @@ var bootstrap = function ($, learun) {
                     nwflow.initAgainCreate();
                     break;
                 case 'audit':// 审批
-                    $("#des").attr('isvalid', 'yes');
+                    //$("#des").attr('isvalid', 'yes');
                     nwflow.initAudit();
                     break;
                 case 'signAudit':// 加签审批
-                    $("#des").attr('isvalid', 'yes');
+                    //$("#des").attr('isvalid', 'yes');
                     nwflow.initSignAudit();
                     break;
                 case 'refer': // 查阅
@@ -673,6 +673,13 @@ var bootstrap = function ($, learun) {
                         //    }
                         //});
 
+                        //需要填写审批意见时，验证审批意见的必填性
+                        var des = $('#des').val();
+                        if (btnData.isOpinion == '1' && !des) {
+                            learun.alert.warning('请签署审批意见！');
+                            return false;
+                        }
+
                         top.flowAuditfn = function (signUrl, stamp) {
                             // 下个流程是否需要可以手动选择审核人
                             getNextUsers(btnData, nwflow.currentNode, '', nwflow.processId, nwflow.taskId, function (data) {
@@ -709,7 +716,7 @@ var bootstrap = function ($, learun) {
                                                         operationName: btnData.name,
                                                         processId: nwflow.processId,
                                                         taskId: nwflow.taskId,
-                                                        des: $('#des').val(),
+                                                        des: des,
                                                         auditors: JSON.stringify(auditers),
                                                         signUrl: signUrl,
                                                         stamp: stamp
@@ -736,7 +743,7 @@ var bootstrap = function ($, learun) {
                                             operationName: btnData.name,
                                             processId: nwflow.processId,
                                             taskId: nwflow.taskId,
-                                            des: $('#des').val(),
+                                            des: des,
                                             signUrl: signUrl,
                                             stamp: stamp
                                         };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.cshtml

@@ -4,18 +4,30 @@
 }
 <script src="~/Content/jquery/plugin/jSignature.min.js"></script>
 <div class="lr-rblock" style="padding-bottom:40px;">
-    <div  class="lr-rblock" style="padding:20px;">
+    <div class="lr-rblock" style="padding:20px;">
         <div id="signature" style="border: 2px dotted black;background-color: lightgrey;"></div>
     </div>
-    <div style="position:absolute;top:30px;right:30px;width:120px;height:120px;display:none;" id="stamp" >
+    <div style="position:absolute;top:30px;right:30px;width:120px;height:120px;display:none;" id="stamp">
         <img style="width:120px;height:120px;" src="" />
     </div>
 
     <div class="lr-form-bottom-button" id="wizard-actions">
-        <a id="btn_stamp" class="btn btn-default">盖章</a>
+        <a id="btn_stampPersonal" class="btn btn-default">个人签章</a>
+        <a id="btn_stamp" class="btn btn-default">学校签章</a>
         <a id="btn_reset" class="btn btn-danger">重置</a>
         <a id="btn_finish" class="btn btn-success">确认</a>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/SignForm.js")
 
+<script>
+    var IsHaveStampRight = "@ViewBag.IsHaveStampRight";
+    //console.log(IsHaveStampRight);
+    if (IsHaveStampRight.toLowerCase() == "true") {
+        $("#btn_stamp").attr("style", "display:inline-block;");
+    } else {
+        $("#btn_stamp").attr("style","display:none;");
+    }
+
+</script>
+

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

@@ -22,6 +22,7 @@ var bootstrap = function ($, learun) {
                 $('#stamp').hide();
                 stampUrl = '';
             });
+            //学校公章
             $('#btn_stamp').on('click', function () {
                 learun.layerForm({
                     id: 'StampDetailIndex',
@@ -39,6 +40,45 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
+            //个人印章
+            $('#btn_stampPersonal').on('click', function () {
+                learun.layerForm({
+                    id: 'StampDetailIndexInPersonal',
+                    title: '印章列表',
+                    url: top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/StampDetailIndexInPersonal',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(function (imgutl) {
+                            $('#stamp').find('img').attr('src', top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=' + imgutl);
+                            $('#stamp').show();
+                            stampUrl = imgutl;
+                            console.log(stampUrl);
+                        });
+                    }
+                });
+            });
+
+            function debounce(fn, delay) {
+                let time = null;
+                return function () {
+                    if (time !== null) {
+                        clearTimeout(time);
+                    }
+                    time = setTimeout(() => {
+                        fn.call(this);
+                    }, delay)
+                }
+            }
+
+            //$('#btn_finish').on('click', debounce(function () {
+            //    console.log('123456')
+               
+            //    var datapair = $sigdiv.jsignature("getdata");
+            //    top.flowauditfn(datapair,stampurl);
+            //    learun.layerclose(window.name);
+                
+            //},500))
 
             function debounce(fn, delay) {
                 let time = null;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Form.js

@@ -54,6 +54,8 @@ var bootstrap = function ($, learun) {
             return false;
         }
 
+        postData.F_Category = 1;
+
         var f = document.getElementById('uploadFile').files[0];
         //是否上传图片
         if (!!f) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/Index.js

@@ -198,6 +198,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.F_StampType = F_StampType;
             param.F_EnabledMark = F_EnabledMark;
+            param.F_Category = 1;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.cshtml

@@ -11,7 +11,7 @@
             <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
         </div>
         <div class="lr-item" style="float:right;width:200px;margin-right:10px;">
-            <input id="F_Password" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"  placeholder="请输入密码"/>
+            <input id="F_Password" type="password" class="form-control" isvalid="yes" checkexpession="NotNull"  placeholder="请输入密码"/>
         </div>
     </div>
     <div id="datagird"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampInfo/StampDetailIndex.js

@@ -38,14 +38,14 @@ var bootstrap = function ($, learun) {
             });
         },
         initData: function () {
-            $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + '', function (data) {
+            $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + '' +'&category=1', function (data) {
                 $('.lr-layout-wrap').lrSetFormData(data.data);
                 $('#datagird').jfGridSet('refreshdata', data);
             });
         },
         search: function (param) {
             param = param || {};
-            $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + keyword, function (data) {
+            $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + keyword+'&category=1', function (data) {
                 $('.lr-layout-wrap').lrSetFormData(data.data);
                 $('#datagird').jfGridSet('refreshdata', data);
 
@@ -54,14 +54,35 @@ var bootstrap = function ($, learun) {
     };
     acceptClick = function (callBack) {
         var keyValue = $("#datagird").jfGridValue("F_StampId");
+        if (!keyValue) {
+            learun.alert.error("请选择印章！");
+            return false;
+        }
         if (!$('.lr-item').lrValidform()) {
             return false;
         }
         var postData = $('.lr-item').lrGetFormData();
         var F_Password = $.md5(postData.F_Password);
-        learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) {
-            callBack(keyValue);
+
+        //learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) {
+        //    callBack(keyValue);
+        //});
+
+        learun.loading(true, '正在提交数据');
+        learun.httpAsyncPost(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) {
+            learun.loading(false);
+            if (res.code == learun.httpCode.success) {
+                callBack(keyValue);
+                learun.alert.success(res.info);
+                top.layer.close(top.layer.index);
+            }
+            else {
+                learun.alert.error(res.info);
+                learun.httpErrorLog(res.info);
+                location.reload();
+            }
         });
+
     };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.cshtml

@@ -0,0 +1,43 @@
+
+@{
+    ViewBag.Title = "个人印章操作";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+@Html.AppendCssFile("/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.css")
+<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>
+        <input id="F_StampName" type="text" class="form-control" 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="F_StampType" 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="F_Password" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
+        <input id="F_Sort" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-12" style="padding-left:100px;">
+        <div class="lr-form-item-title">图片文件</div>
+        <div class="fileEx">
+            <input type="file" name="uploadFile" id="uploadFile">
+        </div>
+        <div class="text">
+            上传图片尺寸为200x200，大小不超过1M。
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="F_Description" type="text" class="form-control" style="height:140px;"></textarea>
+    </div>
+
+</div>
+
+@Html.AppendJsFile("/Views/LR_Content/script/lr-fileupload.js", "/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.js")
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.css

@@ -0,0 +1,21 @@
+.fileEx {
+    width: 100%;
+    height: 120px;
+    position: relative;
+    overflow: hidden;
+}
+
+    .fileEx input {
+        position: absolute;
+        font-size: 120px;
+        right: 0;
+        top: 0;
+        opacity: 0;
+        cursor: pointer !important;
+    }
+
+    .fileEx img {
+        width: 120px;
+        height: 120px;
+        cursor: pointer;
+    }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Form.js

@@ -0,0 +1,88 @@
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2018 上海力软信息技术有限公司
+ * 创建人：力软-前端开发组
+ * 日 期：2022.12.05
+ * 描 述：个人印章管理
+ */
+
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+
+    function uploadImg() {
+        var f = document.getElementById("uploadFile").files[0];//获取文件
+        var src = window.URL.createObjectURL(f);
+        document.getElementById('uploadPreview').src = src;
+    }
+    var page = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            // 印章分类
+            $('#F_StampType').lrDataItemSelect({ code: 'StampType' });
+            //图片显示
+            $('#uploadFile').on('change', uploadImg);
+            $('.fileEx').prepend('<img id="uploadPreview"  src="' + top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=' + keyValue + '" >');
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                selectedRow.F_Password = '*****';
+                $('#form').lrSetFormData(selectedRow);
+                
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData(keyValue);
+        if (postData.F_Password != '*****' || !keyValue) {
+            postData.F_Password = $.md5(postData.F_Password);
+        }
+        else {
+            delete postData.F_Password;
+        }
+        if (!keyValue && !postData.uploadFile) {
+            learun.alert.error("请选择图片");
+            return false;
+        }
+
+        postData.F_Category = 2;
+
+        var f = document.getElementById('uploadFile').files[0];
+        //是否上传图片
+        if (!!f) {
+            learun.loading(true, '正在保存...');
+            $.ajaxFileUpload({
+                data: postData,
+                url: top.$.rootUrl + "/LR_NewWorkFlow/StampInfo/UploadFile?keyValue=" + keyValue,
+                secureuri: false,
+                fileElementId: 'uploadFile',
+                dataType: 'json',
+                success: function (data) {
+                    if (!!callBack) {
+                        callBack();
+                    }
+                    learun.loading(false);
+                    learun.layerClose(window.name);
+                }
+            });
+        }
+        else {
+            $.lrSaveForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+                // 保存成功后才回调 
+                if (!!callBack) {
+                    callBack();
+                }
+            });
+        }
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.cshtml

@@ -0,0 +1,61 @@
+
+@{
+    ViewBag.Title = "个人印章管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title lrlg ">印章分类信息</div>
+            <div id="lr_left_tree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">
+                <span class="lrlg">印章管理</span> - <span id="titleinfo" class="lrlg">未选择分类</span>
+            </div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item" style="margin-top:-4px;margin-right:8px;">
+                        <div class="radio">
+                            <label><input name="isEnabled" id="isEnable" type="radio" value="1" />启用</label>
+                            <label><input name="isEnabled" id="isDisable" type="radio" value="0" />禁用</label>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入印章名称" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                    </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;<span class="lrlg">新增</span></a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;<span class="lrlg">编辑</span></a>
+                       
+                        <a id="lr_more" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            <i class="fa fa-reorder"></i>&nbsp;<span class="lrlg">更多</span><span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu pull-right">
+                            <li id="lr_delete"><a><i></i>&nbsp;<span class="lrlg">删除</span></a></li>
+                            <li id="lr_enable"><a><i></i>&nbsp;<span class="lrlg">启用</span></a></li>
+                            <li id="lr_disabled"><a><i></i>&nbsp;<span class="lrlg">停用</span></a></li>
+                        </ul>
+
+                    </div>
+                    <div class="btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_category" class="btn btn-default"><i class="fa fa-tags"></i>&nbsp;<span class="lrlg">分类管理</span></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.js")
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/Index.js

@@ -0,0 +1,210 @@
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2018 上海力软信息技术有限公司
+ * 创建人：
+ * 日 期：2022.12.05
+ * 描 述：个人印章管理	
+ */
+var selectedRow;
+var refreshGirdData;
+var F_StampType;
+var F_StampName;
+var F_EnabledMark;
+var acceptClick;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGrid();
+            page.bind();
+        },
+        bind: function () {
+            // 左侧数据加载
+            $('#lr_left_tree').lrtree({
+                url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailTree',
+                param: { itemCode: 'StampType' },
+                nodeClick: function (item) {
+                    F_StampType = item.value;
+                    F_StampName = null;//将文本框数据设置为null，如果不设置，那么不能按照左侧分类查询
+                    F_EnabledMark = null;//将文本框数据设置为null，如果不设置，那么不能按照左侧分类查询
+                    $('#titleinfo').text(item.text);
+                    page.search();
+                }
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                F_StampType = null;
+                page.search({ F_StampName: keyword });
+            });
+
+            $('[name="isEnabled"]').on('click', function () {
+                var value = $(this).val(); //状态查询
+                if (value == 1) {
+                    F_EnabledMark = value;
+                    page.search();
+                }
+                else {
+                    F_EnabledMark = value;
+                    page.search();
+                }
+            });
+            //刷新
+            $("#lr_refresh").on('click', function () {
+                location.reload();
+            });
+            //新增
+            $("#lr_add").on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '添加印章',
+                    url: top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/FormInPersonal',
+                    width: 700,
+                    height: 500,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            //编辑
+            $("#lr_edit").on("click", function () {
+                selectedRow = $("#gridtable").jfGridGet("rowdata");//获取选中的当前行数据
+                var keyValue = $("#gridtable").jfGridValue("F_StampId");//获取当前选中的主键值
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'Form',
+                        title: '编辑印章',
+                        url: top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/FormInPersonal?keyValue=' + keyValue,
+                        width: 750,
+                        height: 500,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            //删除
+            $("#lr_delete").on("click", function () {
+                var keyValue = $('#gridtable').jfGridValue('F_StampId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 启用
+            $('#lr_enable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('F_StampId');
+                var enabledMark = $('#gridtable').jfGridValue('F_EnabledMark');
+                if (learun.checkrow(keyValue)) {
+                    if (enabledMark != 1) {
+                        learun.layerConfirm('是否确认启用该项！', function (res) {
+                            if (res) {
+                                learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/UpDateSate', { keyValue: keyValue, state: 1 }, function () {
+                                    refreshGirdData();
+                                });
+                            }
+                        });
+                    }
+                    else {
+                        learun.alert.warning('该项已启用!');
+                    }
+                }
+            });
+            // 禁用
+            $('#lr_disabled').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('F_StampId');
+                var enabledMark = $('#gridtable').jfGridValue('F_EnabledMark');
+
+                if (learun.checkrow(keyValue)) {
+                    if (enabledMark == 1) {
+                        learun.layerConfirm('是否确认禁用该项！', function (res) {
+                            if (res) {
+                                learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/UpDateSate', { keyValue: keyValue, state: 0 }, function () {
+                                    refreshGirdData();
+                                });
+                            }
+                        });
+                    }
+                    else {
+                        learun.alert.warning('该项已禁用!');
+                    }
+                }
+            });
+            /*分类管理*/
+            $('#lr_category').on('click', function () {
+                learun.layerForm({
+                    id: 'ClassifyIndex',
+                    title: '分类管理',
+                    url: top.$.rootUrl + '/LR_SystemModule/DataItem/DetailIndex?itemCode=StampType',
+                    width: 800,
+                    height: 500,
+                    maxmin: true,
+                    btn: null,
+                    end: function () {
+                        learun.clientdata.update('dataItem');
+                        location.reload();
+                    }
+                });
+            });
+        },
+        initGrid: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetPageList',
+                headData: [
+                    { label: '印章名称', name: 'F_StampName', width: 150, align: "center" },
+                    {
+                        label: '印章分类', name: 'F_StampType', width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StampType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '图片', name: 'F_ImgFile', width: 110, align: "center",
+                        formatter: function (value, row, op, $cell) {
+                            return '<img src="' + top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=' + row.F_StampId + '"  style="position: absolute;height:100px;width:100px;top:5px;left:5px;" >';
+                        }
+                    },
+                    {
+                        label: '状态', name: 'F_EnabledMark', width: 60, align: "center", formatter: function (value, row, op, $cell) {
+                            if (value == 1) {
+                                return '<span class=\"label label-success\" style=\"cursor: pointer;\">启用</span>';
+                            } else if (value == 0) {
+                                return '<span class=\"label label-default\" style=\"cursor: pointer;\">禁用</span>';
+                            }
+                        }
+                    },
+                    { label: '备注', name: 'F_Description', width: 200, align: "left" }
+                ],
+                mainId: 'F_StampId',
+                isPage: true,
+                rowHeight: 110,
+                sidx: 'F_EnabledMark Desc,F_Sort ASC'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.F_StampType = F_StampType;
+            param.F_EnabledMark = F_EnabledMark;
+            param.F_Category = 2;
+            param.F_CreateUserId = learun.clientdata.get(['userinfo']).userId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    }
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.cshtml

@@ -0,0 +1,64 @@
+@{
+    ViewBag.Title = "个人印章管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-layout">
+    <div class="lr-form-layout-top">
+        <div class="lr-item">
+            <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" style="width:240px;" />
+        </div>
+        <div class="lr-item">
+            <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+        </div>
+        <div class="lr-item" style="float:right;width:200px;margin-right:10px;">
+            <input id="F_Password" type="password" class="form-control" isvalid="yes" checkexpession="NotNull"  placeholder="请输入密码"/>
+        </div>
+    </div>
+    <div id="datagird"></div>
+</div>
+
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.js")
+
+<style>
+    .lr-form-layout {
+    padding: 44px 0 0 0;
+}
+
+.lr-form-layout-top {
+    position: absolute;
+    top: 0;
+    left: 0;
+    border-bottom: 1px solid #ddd;
+    height: 44px;
+    width: 100%;
+    padding-left: 3px;
+    z-index: 4;
+}
+
+.lr-item {
+    position: relative;
+    float: left;
+    padding-top: 8px;
+    padding-left: 5px;
+    line-height: 28px;
+}
+
+    .lr-item .btn {
+        position: relative;
+        display: inline-block;
+        height: 28px;
+        margin-bottom: 1px;
+        line-height: 14px;
+    }
+
+    .lr-item .lr-select {
+        width: 170px;
+    }
+
+    .lr-item .lr-field-error-info {
+        top: 9px;
+        height: 26px;
+    }
+
+</style>
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/StampPersonal/StampDetailIndex.js

@@ -0,0 +1,88 @@
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2018 上海力软信息技术有限公司
+ * 创建人：
+ * 日 期：2022.12.05
+ * 描 述：个人印章管理
+ */
+var keyword;
+var acceptClick;
+var path = '';
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 保存数据
+    var page = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            // 订单产品信息
+            $('#datagird').jfGrid({
+                headData: [
+                    { label: '名称', name: 'F_StampName', width: 150, align: "center" },
+                    {
+                        label: '印章', name: 'F_ImgFile', width: 110, align: "left",
+                        formatter: function (value, row, op, $cell) {
+                            return '<img src="' + top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=' + row.F_StampId + '"  style="position: absolute;height:100px;width:100px;top:5px;left:5px;" >';
+                        }
+                    }
+                ],
+                mainId: 'F_StampId',
+                rowHeight: 110,
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+        },
+        initData: function () {
+            $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + '' + '&category=2&userId=' + learun.clientdata.get(['userinfo']).userId, function (data) {
+                $('.lr-layout-wrap').lrSetFormData(data.data);
+                $('#datagird').jfGridSet('refreshdata', data);
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            $.lrSetForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/GetList?keyword=' + keyword + '&category=2&userId=' + learun.clientdata.get(['userinfo']).userId, function (data) {
+                $('.lr-layout-wrap').lrSetFormData(data.data);
+                $('#datagird').jfGridSet('refreshdata', data);
+
+            });
+        }
+    };
+    acceptClick = function (callBack) {
+        var keyValue = $("#datagird").jfGridValue("F_StampId");
+        if (!keyValue) {
+            learun.alert.error("请选择印章！");
+            return false;
+        }
+        if (!$('.lr-item').lrValidform()) {
+            return false;
+        }
+        var postData = $('.lr-item').lrGetFormData();
+        var F_Password = $.md5(postData.F_Password);
+        
+        //learun.postForm(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) {
+        //    callBack(keyValue);
+        //});
+
+        learun.loading(true, '正在提交数据');
+        learun.httpAsyncPost(top.$.rootUrl + '/LR_NewWorkFlow/StampInfo/EqualForm', { keyValue: keyValue, Password: F_Password }, function (res) {
+            learun.loading(false);
+            if (res.code == learun.httpCode.success) {
+                callBack(keyValue);
+                learun.alert.success(res.info);
+                top.layer.close(top.layer.index);
+            }
+            else {
+                learun.alert.error(res.info);
+                learun.httpErrorLog(res.info);
+                location.reload();
+            }
+        });
+
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs

@@ -42,6 +42,12 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             return View();
         }
 
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+
         [HttpGet]
         public ActionResult AttendanceReportByWeek()
         {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml

@@ -21,12 +21,26 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
         <div class="lr-form-item-title">打卡状态</div>
-        <div id="ClockStatus" >
+        <div id="ClockStatus">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">是否外勤</div>
+        <div id="AIsOut">
         </div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
         <div class="lr-form-item-title">打卡地点</div>
         <input id="ClockPlace" type="text" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">照片</div>
+        <div id="ADPhoto">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">备注</div>
+        <input id="ARemark" type="text" class="form-control" />
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/ADR_Record/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js

@@ -23,6 +23,8 @@ var bootstrap = function ($, learun) {
             });
             $('#ADType').lrDataItemSelect({ code: 'ADType' });
             $('#ClockStatus').lrDataItemSelect({ code: 'ADStatus' });
+            $('#AIsOut').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#ADPhoto').lrUploader();
             $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml

@@ -0,0 +1,46 @@
+@{
+    ViewBag.Title = "考勤记录";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">员工名字</div>
+        <div id="UserNo" type="text" class="form-control" disabled="disabled"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">考勤类型</div>
+        <div id="ADType" disabled="disabled"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">考勤时间</div>
+        <input id="ADTime" type="text" disabled="disabled" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ADTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">打卡时间</div>
+        <input id="ClockTime" type="text" disabled="disabled" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ClockTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">打卡状态</div>
+        <div id="ClockStatus" disabled="disabled">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">是否外勤</div>
+        <div id="AIsOut" disabled="disabled">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">打卡地点</div>
+        <input id="ClockPlace" type="text" class="form-control" disabled="disabled" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">照片</div>
+        <div id="ADPhoto" disabled="disabled">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">备注</div>
+        <input id="ARemark" type="text" class="form-control" disabled="disabled" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ADR_Record/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js

@@ -0,0 +1,48 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-08-28 18:09
+ * 描  述：考勤记录
+ */
+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 () {
+            $('#Department').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                param: {} 
+            });
+            $('#ADType').lrDataItemSelect({ code: 'ADType' });
+            $('#ClockStatus').lrDataItemSelect({ code: 'ADStatus' });
+            $('#AIsOut').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#ADPhoto').lrUploader({ isUpload: false});
+            $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/ADR_Record/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]);
+                        }
+                        $("#ADTime").val(data[id].ADTime);
+                        $("#ClockTime").val(data[id].ClockTime);
+                    }
+                });
+            }
+        }
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml

@@ -42,8 +42,9 @@
                         <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_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_view" 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>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
             }, 250, 400);
             $('#Department').lrDepartmentSelect();
             $('#ADR_Device').lrDataSourceSelect({ code: 'ADR_Device', value: 'dname', text: 'dname' });
-            $('#ADStatus').lrDataItemSelect({ code: 'ADStatus'});
+            $('#ADStatus').lrDataItemSelect({ code: 'ADStatus' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -81,6 +81,19 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看',
+                        url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/FormView?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        btn: null
+                });
+                }
+            });
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
@@ -97,7 +110,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/GetPageList',
                 headData: [
                     {
@@ -157,7 +170,12 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "打卡地点", name: "ClockPlace", width: 100, align: "left" },
+                    {
+                        label: "是否外勤", name: "AIsOut", width: 100, align: "left", formatter: function (value) {
+                            return value == true ? "是" : "否";
+                        }
+                    },
+                    { label: "打卡地点", name: "ClockPlace", width: 200, align: "left" },
                     { label: "考勤数据上传时间", name: "ADTime", width: 150, align: "left" }
                 ],
                 mainId: 'ID',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/StatisticDetailIndex.js

@@ -54,9 +54,9 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "日期", name: "ClockDate", width: 100, align: "left" },
-                    { label: "班次", name: "BanCi", width: 60, align: "left" },
-                    { label: "时间段", name: "TimePeriod", width: 150, align: "left" },
+                    { label: "日期", name: "ClockDate", width: 100, align: "left", sort: true },
+                    { label: "班次", name: "BanCi", width: 60, align: "left", sort: true },
+                    { label: "时间段", name: "TimePeriod", width: 150, align: "left", sort: true },
                     {
                         label: "上班状态", name: "ADStatusWork", width: 60, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
@@ -76,7 +76,7 @@ var bootstrap = function ($, learun) {
 
                                 }
                             });
-                        }
+                        }, sort: true
                     },
                     {
                         label: "下班状态", name: "ADStatusClose", width: 60, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
@@ -96,16 +96,16 @@ var bootstrap = function ($, learun) {
 
                                 }
                             });
-                        }
+                        }, sort: true
                     },
-                    { label: "签到时间", name: "ClockTimeWork", width: 80, align: "left" },
-                    { label: "签退时间", name: "ClockTimeClose", width: 80, align: "left" },
-                    { label: "迟到(分钟)", name: "ChidaoMinutes", width: 80, align: "left" },
-                    { label: "早退(分钟)", name: "ZaoTuiMinutes", width: 80, align: "left" },
-                    { label: "出勤(分钟)", name: "ChuQinMinutes", width: 80, align: "left" },
-                    { label: "缺勤(分钟)", name: "QueQinMinutes", width: 80, align: "left" },
-                    { label: "工作(分钟)", name: "WorkMinutes", width: 80, align: "left" },
-                    { label: "休息(分钟)", name: "RestMinutes", width: 80, align: "left" },
+                    { label: "签到时间", name: "ClockTimeWork", width: 80, align: "left", sort: true },
+                    { label: "签退时间", name: "ClockTimeClose", width: 80, align: "left", sort: true},
+                    { label: "迟到(分钟)", name: "ChidaoMinutes", width: 80, align: "left", sort: true },
+                    { label: "早退(分钟)", name: "ZaoTuiMinutes", width: 80, align: "left", sort: true},
+                    { label: "出勤(分钟)", name: "ChuQinMinutes", width: 80, align: "left", sort: true },
+                    //{ label: "缺勤(分钟)", name: "QueQinMinutes", width: 80, align: "left",sort: true },
+                    { label: "工作(分钟)", name: "WorkMinutes", width: 80, align: "left",sort: true },
+                    { label: "休息(分钟)", name: "RestMinutes", width: 80, align: "left", sort: true },
                 ],
                 mainId: '',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -61,6 +61,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList()
+        {
+            var data = conferenceRoomIBLL.GetList();
+            return Success(data);
+        }
         /// <summary>
         /// 获取表单数据
         /// <summary>
@@ -69,8 +82,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var ConferenceRoomData = conferenceRoomIBLL.GetConferenceRoomEntity( keyValue );
-            var jsonData = new {
+            var ConferenceRoomData = conferenceRoomIBLL.GetConferenceRoomEntity(keyValue);
+            var jsonData = new
+            {
                 ConferenceRoom = ConferenceRoomData,
             };
             return Success(jsonData);
@@ -102,9 +116,21 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             ConferenceRoomEntity entity = strEntity.ToObject<ConferenceRoomEntity>();
-            conferenceRoomIBLL.SaveEntity(keyValue,entity);
+            conferenceRoomIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+        /// <summary>
+        /// 启用禁用实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoEnable(string keyValue, string status)
+        {
+            conferenceRoomIBLL.DoEnable(keyValue, status);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs

@@ -57,7 +57,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return View();
         }
         /// <summary>
-        /// 主页面-我参加的会议
+        /// 主页面-我申请的会议
         /// <summary>
         /// <returns></returns>
         [HttpGet]
@@ -65,13 +65,13 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
-
-        /// <summary>
-        /// 报表统计
-        /// <summary>
-        /// <returns></returns>
         [HttpGet]
-        public ActionResult IndexStatistics()
+        public ActionResult IndexAll()
+        {
+            return View();
+        }
+        [HttpGet]
+        public ActionResult qrCode()
         {
             return View();
         }
@@ -113,18 +113,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return Success(data);
         }
         /// <summary>
-        /// 获取报表数据
-        /// <summary>
-        /// <param name="queryJson">查询参数</param>
-        /// <returns></returns>
-        [HttpGet]
-        [AjaxOnly]
-        public ActionResult GetStatisticList(string queryJson)
-        {
-            var data = meetingManagementIBLL.GetStatisticList(queryJson);
-            return Success(data);
-        }
-        /// <summary>
         /// 获取表单数据
         /// <summary>
         /// <returns></returns>
@@ -182,6 +170,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             UserInfo userInfo = LoginUserInfo.Get();
             MeetingManagementEntity entity = strEntity.ToObject<MeetingManagementEntity>();
+            //判断会议场地是否被占用
+            var isOccupy = meetingManagementIBLL.JudgeIsOccupy(entity);
+            if (isOccupy)
+            {
+                return Fail("会议场地当前时间段已被占用！");
+            }
             entity.CreateUser = userInfo.userId;
             entity.CreateTime = DateTime.Now;
             entity.CheckStatus = "0";
@@ -212,6 +206,13 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult DoSubmit(string keyValue, string status, string processId)
         {
+            //判断会议场地是否被占用
+            var entity = meetingManagementIBLL.GetMeetingManagementEntity(keyValue);
+            var isOccupy = meetingManagementIBLL.JudgeIsOccupy(entity);
+            if (isOccupy)
+            {
+                return Fail("会议场地当前时间段已被占用！");
+            }
             meetingManagementIBLL.DoSubmit(keyValue, status, processId);
             return Success("操作成功！");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs

@@ -0,0 +1,128 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-08 10:36
+    /// 描 述：会议纪要
+    /// </summary>
+    public class MeetingMinutesController : MvcControllerBase
+    {
+        private MeetingMinutesIBLL meetingMinutesIBLL = new MeetingMinutesBLL();
+
+        #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 = meetingMinutesIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = meetingMinutesIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MeetingMinutesData = meetingMinutesIBLL.GetMeetingMinutesEntity( keyValue );
+            var jsonData = new {
+                MeetingMinutes = MeetingMinutesData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            meetingMinutesIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            MeetingMinutesEntity entity = strEntity.ToObject<MeetingMinutesEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUser = userInfo.userId;
+            meetingMinutesIBLL.SaveEntity(userInfo,keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingNoticeController.cs

@@ -0,0 +1,128 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-08 10:36
+    /// 描 述：会议通知
+    /// </summary>
+    public class MeetingNoticeController : MvcControllerBase
+    {
+        private MeetingNoticeIBLL meetingNoticeIBLL = new MeetingNoticeBLL();
+
+        #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 = meetingNoticeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = meetingNoticeIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MeetingNoticeData = meetingNoticeIBLL.GetMeetingNoticeEntity( keyValue );
+            var jsonData = new {
+                MeetingNotice = MeetingNoticeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            meetingNoticeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            MeetingNoticeEntity entity = strEntity.ToObject<MeetingNoticeEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUser = userInfo.userId;
+            meetingNoticeIBLL.SaveEntity(userInfo,keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs

@@ -37,25 +37,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
-        /// <summary>
-        /// 会议考勤
-        /// <summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult IndexAttendance()
-        {
-            return View();
-        }
-        /// <summary>
-        /// 会议考勤-查看
-        /// <summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult FormViewAttendance()
-        {
-            return View();
-        }
-
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.cshtml

@@ -3,25 +3,29 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
-        <div class="lr-form-item-title">名称</div>
-        <input id="Name" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
+        <div class="lr-form-item-title">场地名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
-        <div class="lr-form-item-title">地点</div>
-        <input id="Address" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
+        <div class="lr-form-item-title">地点<font face="宋体">*</font></div>
+        <input id="Address" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
         <div class="lr-form-item-title">状态</div>
-        <input id="Status" type="text" class="form-control"  />
+        <div id="Status"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
         <div class="lr-form-item-title">可容纳人数</div>
-        <input id="Scale" type="text" class="form-control"  />
+        <input id="Scale" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
+        <div class="lr-form-item-title">添加时间<font face="宋体">*</font></div>
+        <input id="CreateTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#CreateTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $("#Status").lrDataItemSelect({ code: 'EnableStatus' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.cshtml

@@ -11,12 +11,12 @@
                         <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>
+                                    <div class="lr-form-item-title">场地名称</div>
                                     <input id="Name" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">状态</div>
-                                    <input id="Status" type="text" class="form-control" />
+                                    <div id="Status"></div>
                                 </div>
                             </div>
                         </div>
@@ -31,6 +31,10 @@
                         <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>
                     </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_enable" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;启用</a>
+                        <a id="lr_disable" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;禁用</a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.js

@@ -16,18 +16,19 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
+            $("#Status").lrDataItemSelect({ code: 'EnableStatus' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
             // 新增
             $('#lr_add').on('click', function () {
-               learun.layerForm({
+                learun.layerForm({
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/Form',
-                    width: 600,
-                    height: 400,
+                    width: 800,
+                    height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -41,8 +42,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 800,
+                        height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -53,9 +54,45 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                   learun.layerConfirm('是否确认删除该项！', function (res) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 启用
+            $('#lr_enable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == "1") {
+                        learun.alert.warning("当前项已启用！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认启用该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DoEnable', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 禁用
+            $('#lr_disable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "1") {
+                        learun.alert.warning("当前项未启用！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认禁用该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DoEnable', { keyValue: keyValue, status: "0" }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -68,20 +105,25 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetPageList',
                 headData: [
-                    { label: "名称", name: "Name", width: 100, align: "left"},
-                    { label: "地点", name: "Address", width: 100, align: "left"},
-                    { label: "状态", name: "Status", width: 100, align: "left"},
-                    { label: "可容纳人数", name: "Scale", width: 100, align: "left"},
-                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                    { label: "场地名称", name: "Name", width: 200, align: "left" },
+                    { label: "地点", name: "Address", width: 200, align: "left" },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == 1 ? "启用" : "禁用";
+                        }
+                    },
+                    { label: "可容纳人数", name: "Scale", width: 100, align: "left" },
+                    { label: "添加时间", name: "CreateTime", width: 100, align: "left" },
                 ],
-                mainId:'ID',
-                isPage: true
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'CreateTime desc'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml

@@ -21,11 +21,11 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
         <div class="lr-form-item-title">会议开始时间<font face="宋体">*</font></div>
-        <input id="BeginTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#BeginTime').trigger('change'); } })" />
+        <input id="BeginTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" data-dateFmt="yyyy-MM-dd HH:mm:ss" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#BeginTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
         <div class="lr-form-item-title">会议结束时间<font face="宋体">*</font></div>
-        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#EndTime').trigger('change'); } })" />
+        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" data-dateFmt="yyyy-MM-dd HH:mm:ss" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#EndTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
         <div class="lr-form-item-title">会议记录者</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js

@@ -93,6 +93,14 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
+        //验证结束时间必须大于开始时间
+        var BeginTime = $("#BeginTime").val();
+        var EndTime = $("#EndTime").val();
+        if (new Date(EndTime) <= new Date(BeginTime)) {
+            learun.alert.warning("会议结束时间必须大于会议开始时间！");
+            return false;
+        }
+
         return true;
     };
     // 保存数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml

@@ -22,11 +22,11 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
         <div class="lr-form-item-title">会议开始时间<font face="宋体">*</font></div>
-        <input id="BeginTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+        <input id="BeginTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull"  data-dateFmt="yyyy-MM-dd HH:mm:ss" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#BeginTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
         <div class="lr-form-item-title">会议结束时间<font face="宋体">*</font></div>
-        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull"  data-dateFmt="yyyy-MM-dd HH:mm:ss" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#EndTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
         <div class="lr-form-item-title">会议记录者</div>
@@ -44,9 +44,9 @@
         <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
         <input id="LinkPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+    @*<div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
         <div class="lr-form-item-title">扫码签到</div>
         <div id="qrCode"></div>
-    </div>
+    </div>*@
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js

@@ -97,19 +97,12 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     save = function (processId, callBack, i) {
-        var formData = $('body').lrGetFormData();
-        if (!!processId) {
-            formData.ProcessId = processId;
+        if (!!callBack) {
+            var res = {
+                code: 200, data: {}
+            };
+            callBack(res, i);
         }
-        var postData = {
-            strEntity: JSON.stringify(formData)
-        };
-        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack(res, i);
-            }
-        });
     };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml

@@ -43,8 +43,8 @@
                         <a id="lr_attendance" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;考勤</a>
                         <a id="lr_minutes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;纪要</a>
                         <a id="lr_notice" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;通知</a>
-                        <a id="lr_checkyes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核通过</a>
-                        <a id="lr_checkno" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核不通过</a>
+                        @*<a id="lr_checkyes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核通过</a>
+                        <a id="lr_checkno" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核不通过</a>*@
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.cshtml

@@ -0,0 +1,46 @@
+@{
+    /**/
+
+    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="MeetingTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">会议场地</div>
+                                    <div id="MeetingPlace"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">申请人</div>
+                                    <div id="CreateUser"></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-plus"></i>&nbsp;查看</a>
+                        <a id="lr_case" 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/PersonnelManagement/Views/MeetingManagement/IndexAll.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexAll.js

@@ -0,0 +1,145 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+var refreshGirdData;
+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);
+            }, 220, 400);
+            $('#MeetingPlace').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList',
+                value: "ID",
+                text: "Name"
+            });
+            $('#CreateUser').lrUserSelect(0);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '查看会议工作',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+            // 会议签到情况
+            $('#lr_case').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '签到情况',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+           
+            
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetPageList',
+                headData: [
+                    { label: "会议主题", name: "MeetingTitle", width: 150, align: "left" },
+                    { label: "会议场地", name: "ConferenceRoomName", width: 100, align: "left" },
+                    { label: "开始时间", name: "BeginTime", width: 120, align: "left" },
+                    { label: "结束时间", name: "EndTime", width: 120, align: "left" },
+                    {
+                        label: "会议记录者", name: "RecordPerson", 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: "Linkman", width: 100, align: "left" },
+                    { label: "联系电话", name: "LinkPhone", width: 100, align: "left" },
+                    {
+                        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: "CreateTime", width: 120, align: "left" },
+                    {
+                        label: "会议状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已通过</span>" : cellvalue == "2" ? "<span class=\"label label-danger\">未通过</span>" : cellvalue == "3" ? "<span class=\"label label-warning\">审核中</span>" : "<span class=\"label label-default\">未审核</span>";
+                        }
+                    },
+                    {
+                        label: "审核人", name: "CheckUser", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    //callback(_data.name);
+                                    return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "审核时间", name: "CheckTime", width: 120, align: "left", formatter: function (value, row) {
+                            return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : value;
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (res && res.code && res.code == 200) {
+            // 发起流程
+            var postData = {
+                schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+        }
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml

@@ -4,6 +4,7 @@
     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 ">
@@ -38,13 +39,15 @@
                         <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-plus"></i>&nbsp;查看</a>
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
+                        <a id="lr_print" 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_attendance" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;考勤</a>
+                        @*<a id="lr_attendance" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;考勤</a>*@
                         <a id="lr_minutes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;纪要</a>
                         <a id="lr_notice" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;通知</a>
-                        <a id="lr_checkyes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核通过</a>
-                        <a id="lr_checkno" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核不通过</a>
+                        <a id="lr_case" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;签到情况</a>
+                        @*<a id="lr_checkyes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核通过</a>
+                            <a id="lr_checkno" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核不通过</a>*@
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js

@@ -137,9 +137,34 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 考勤
             // 纪要
+            $('#lr_minutes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'MeetingMinutesIndex',
+                        title: '会议纪要',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
             // 通知
+            $('#lr_notice').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'MeetingNoticeIndex',
+                        title: '会议通知',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
             // 审核通过
             $('#lr_checkyes').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -176,6 +201,35 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 会议签到情况
+            $('#lr_case').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '签到情况',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+            // 查看
+            $('#lr_print').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '二维码',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/qrCode?keyValue=' + keyValue,
+                        width: 700,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+            
         },
         // 初始化列表
         initGird: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml

@@ -1,7 +1,7 @@
 @{
     /**/
 
-    ViewBag.Title = "我参加的会议";
+    ViewBag.Title = "会议管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <div class="lr-layout ">
@@ -34,8 +34,15 @@
                     </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>
+                        <a id="lr_case" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;签到情况</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        @*<a id="lr_attendance" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;考勤</a>*@
+                        <a id="lr_minutes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;纪要</a>
+                        <a id="lr_notice" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;通知</a>
+                        @*<a id="lr_checkyes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核通过</a>
+                        <a id="lr_checkno" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核不通过</a>*@
                     </div>
-                   
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js

@@ -28,6 +28,79 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'addform',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form',
+                    width: 1000,
+                    height: 800,
+                    callBack: function (id) {
+                        var res = false;
+                        // 验证数据
+                        res = top[id].validForm();
+                        // 保存数据
+                        if (res) {
+                            res = top[id].save('', function () {
+                                page.search();
+                            });
+                        }
+                        return res;
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1") {
+                        learun.alert.warning("当前项已审核通过！");
+                        return false;
+                    } else if (CheckStatus == "3") {
+                        learun.alert.warning("当前项审核中！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'editform',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已审核或审核中！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 查看
             $('#lr_view').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -42,7 +115,106 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            
+            //提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1") {
+                        learun.alert.warning("当前项已审核通过！");
+                        return false;
+                    } else if (CheckStatus == "3") {
+                        learun.alert.warning("当前项审核中！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoSubmit', { keyValue: keyValue, status: '3', processId: processId }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+            // 纪要
+            $('#lr_minutes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'MeetingMinutesIndex',
+                        title: '会议纪要',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+            // 通知
+            $('#lr_notice').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'MeetingNoticeIndex',
+                        title: '会议通知',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+            // 审核通过
+            $('#lr_checkyes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == '1') {
+                        learun.alert.warning("该项已审核通过！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 审核不通过
+            $('#lr_checkno').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == '2') {
+                        learun.alert.warning("该项已审核不通过！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '2' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 会议签到情况
+            $('#lr_case').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '签到情况',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -114,6 +286,17 @@ var bootstrap = function ($, learun) {
         }
     };
     refreshGirdData = function (res, postData) {
+        if (res && res.code && res.code == 200) {
+            // 发起流程
+            var postData = {
+                schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+        }
         page.search();
     };
     page.init();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.cshtml

@@ -0,0 +1,23 @@
+@{
+    ViewBag.Title = "会议管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script src="~/Content/jquery/qrcode.min.js"></script>
+<div id="subprint" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
+    打印
+</div>
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议主题<font face="宋体">*</font></div>
+        <input id="MeetingTitle" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议场地<font face="宋体">*</font></div>
+        <div id="MeetingPlace" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col lr-form-item" data-table="MeetingManagement">
+        <div id="qrCode" style="text-align:center"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.js")
+@Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js", "/Content/js/qrcode.min.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/qrCode.js

@@ -0,0 +1,116 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+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 () {
+            $('#MeetingPlace').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList',
+                value: "ID",
+                text: "Name"
+            });
+            $('#subprint').on('click', function () {
+                $('#form').jqprint();
+            })
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/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]);
+                        }
+                        //扫码签到
+                        makeCode(data[id].Id);
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/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 == 'MeetingManagement' && 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) {
+        if (!!callBack) {
+            var res = {
+                code: 200, data: {}
+            };
+            callBack(res, i);
+        }
+    };
+    page.init();
+}
+//扫码签到
+var qrcode = new QRCode(document.getElementById("qrCode"), {
+    width: 550,
+    height: 550
+});
+function makeCode(urls) {
+    qrcode.makeCode(urls);
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "会议纪要";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="MeetingMinutes">
+        <div class="lr-form-item-title">纪要标题<font face="宋体">*</font></div>
+        <input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingMinutes">
+        <div class="lr-form-item-title">纪要内容</div>
+        <textarea id="Content" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingMinutes">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="Files"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-08 10:36
+ * 描  述：会议纪要
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var MeetID = request('MeetID');//会议ID
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#Files').lrUploader();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/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 data = $('body').lrGetFormData();
+        data.MeetID = MeetID;
+        var postData = {
+            strEntity: JSON.stringify(data)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml

@@ -0,0 +1,43 @@
+@{
+                /**/
+
+                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="MeetingTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">纪要标题</div>
+                                    <input id="Title" 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_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_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js

@@ -0,0 +1,98 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-08 10:36
+ * 描  述：会议纪要
+ */
+var refreshGirdData;
+var MeetID = request('MeetID');//会议ID
+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);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'MeetingMinutesform',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Form?MeetID=' + MeetID,
+                    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)) {
+                    learun.layerForm({
+                        id: 'MeetingMinutesform',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Form?keyValue=' + keyValue + '&MeetID=' + MeetID,
+                        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)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/GetPageList',
+                headData: [
+                    { label: "会议", name: "MeetingTitle", width: 150, align: "left" },
+                    { label: "纪要标题", name: "Title", width: 150, align: "left" },
+                    { label: "内容", name: "Content", width: 150, align: "left" },
+                    { label: "创建时间", name: "CreateTime", width: 100, align: "left" },
+                    { label: "创建人", name: "CreateUser", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.MeetID = MeetID;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.cshtml

@@ -0,0 +1,15 @@
+@{
+    ViewBag.Title = "会议通知";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="MeetingNotice">
+        <div class="lr-form-item-title">通知标题<font face="宋体">*</font></div>
+        <input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingNotice">
+        <div class="lr-form-item-title">通知内容</div>
+        <textarea id="Content" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingNotice/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Form.js

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-08 10:36
+ * 描  述：会议通知
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var MeetID = request('MeetID');//会议ID
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            //$('#Files').lrUploader();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingNotice/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 data = $('body').lrGetFormData();
+        data.MeetID = MeetID;
+        var postData = {
+            strEntity: JSON.stringify(data)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingNotice/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.cshtml

@@ -0,0 +1,43 @@
+@{
+                /**/
+
+                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="MeetingTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">通知标题</div>
+                                    <input id="Title" 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_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_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingNotice/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingNotice/Index.js

@@ -0,0 +1,98 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-08 10:36
+ * 描  述：会议通知
+ */
+var refreshGirdData;
+var MeetID = request('MeetID');//会议ID
+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);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'MeetingNoticeform',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Form?MeetID=' + MeetID,
+                    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)) {
+                    learun.layerForm({
+                        id: 'MeetingNoticeform',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Form?keyValue=' + keyValue + '&MeetID=' + MeetID,
+                        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)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingNotice/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/GetPageList',
+                headData: [
+                    { label: "会议", name: "MeetingTitle", width: 150, align: "left" },
+                    { label: "通知标题", name: "Title", width: 150, align: "left" },
+                    { label: "内容", name: "Content", width: 150, align: "left" },
+                    { label: "创建时间", name: "CreateTime", width: 100, align: "left" },
+                    { label: "创建人", name: "CreateUser", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.MeetID = MeetID;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js

@@ -5,6 +5,7 @@
  * 描  述：会议签到记录
  */
 var refreshGirdData;
+var MeetID = request('MeetID');//会议ID
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -126,6 +127,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.MeetID = MeetID;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducationSelect_.js

@@ -15,8 +15,7 @@ var bootstrap = function ($, learun) {
             if ($("#predata").text()) {
                 //当前班级
                 var dataval = JSON.parse($("#predata .card-box").attr("data-val"))
-                //var classno = dataval.map(item =>} {})
-                param.ClassNo = dataval.map(item => { return item.className }).filter(function (itm, i, a) {
+                param.ClassNo = dataval.map(item => { return item.teachClassNo }).filter(function (itm, i, a) {
                     return i == a.indexOf(itm);
                 }).join(',');
 

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

@@ -166,13 +166,15 @@ namespace Learun.Application.Web.Controllers
                     }
                 }
             }
-            var readnewslist = newsIBLL.GetList("", userinfo.userId).Where(m => !string.IsNullOrEmpty(m.RNewsId)).Select(m => m.F_NewsId);
+            //var readnewslist = newsIBLL.GetList("", userinfo.userId).Where(m => !string.IsNullOrEmpty(m.RNewsId)).Select(m => m.F_NewsId);
+            var readnewslist = readbll.GetListOfSelf().Select(m => m.NewsId).ToList();
             ViewBag.UnreadNews = outnewslist.Count(m => !readnewslist.Contains(m.F_NewsId));
             paginationobj.sidx = "SendTime";
             //ViewBag.UnreadFile = sys_ReceiveFileIBLL.GetPageListByUserId(paginationobj, "{}", userinfo.userId).Where(a => a.STypeId == 1).Count();
             ViewBag.UnreadFile = sys_ReceiveFileIBLL.GetPageListBySenderId(userinfo.userId);
             return View();
         }
+        private static LR_OA_NewsReadBLL readbll = new LR_OA_NewsReadBLL();
 
         public ActionResult GoTo()
         {

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

@@ -97,7 +97,11 @@ namespace Learun.Application.Web.Controllers
                 case "listfile":
                     return ListFileManager(UeditorConfig.GetString("fileManagerListPath"), UeditorConfig.GetStringList("fileManagerAllowFiles"));
                 case "catchimage":
-                    return CrawlerHandler();
+                    //return CrawlerHandler();存在漏洞
+                    return Content(new
+                    {
+                        state = "action 参数为空或者 action 不被支持。"
+                    }.ToJson());
                 default:
                     return Content(new
                     {

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

@@ -537,6 +537,8 @@
     <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicReportController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicSituationCopyController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MeetingManagementController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingMinutesController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MeetingNoticeController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MeetingSignInRecordController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_PerformanceTrackingController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_QualityObjectivesController.cs" />
@@ -1025,6 +1027,8 @@
     <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\StuCancelDisciplineManagement\IndexOfTeacher.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\IndexOfStudent.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" />
@@ -1042,6 +1046,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\InputScoreIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\InputScoreIndexImport.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\Monitor.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScore\StuScoreRank.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\SlowIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\StuScoreQueryIndexRow.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElectiveOnline\AuditForm.js" />
@@ -1460,6 +1465,7 @@
     <Content Include="Areas\LogisticsManagement\Views\Acc_Punishment\IndexStatistics.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_Reward\IndexStatistics.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ADR_Record\FormView.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticDetailIndex.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticIndex.js" />
     <Content Include="Areas\LogisticsManagement\Views\APAppointmentPsychologist\Form.js" />
@@ -1647,6 +1653,10 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Form.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\Index.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\StampInfo\StampDetailIndex.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Form.css" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Form.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Index.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\StampDetailIndex.js" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\Form.js" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormClaim.js" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormView.js" />
@@ -1730,9 +1740,15 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexAll.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexStatistics.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\qrCode.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\FormViewAttendance.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\Index.js" />
@@ -8273,6 +8289,19 @@
     <Content Include="Areas\LogisticsManagement\Views\RepairReportStudent\EvaluateFormView.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\ADR_Restriction\FormDay.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\IndexCenter.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ADR_Record\FormView.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexAll.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\qrCode.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Form.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\Index.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\StampPersonal\StampDetailIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScore\StuScoreRank.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\IndexOfStudent.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\IndexOfTeacher.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/Views/Home/AdminDesktop/Index.js

@@ -328,4 +328,37 @@
             }
         });
     };
+
+    window.setInterval(gettotalunread, 30000);
+    //未读消息totalcount
+    function gettotalunread() {
+        $.ajax({
+            url: top.$.rootUrl + '/LR_Desktop/MessageRind/GetCountFortotalUnread',
+            type: "get",
+            dataType: "json",
+            async: false,
+            success: function (data) {
+                if (data.data != 0) {
+                    //document.getElementsByClassName("lr-im-bell2")[0].children[0].children[2].innerText = data.data;
+
+                    //UnreadTask = UnreadTask,
+                    //    UnreadNews = UnreadNews,
+                    //    UnfileLeave = UnfileLeave,
+                    //    UnfileLeaveZC = UnfileLeaveZC,
+                    //    totalcount = totalcount
+
+                    //$("#btn_daiban", window.parent.document).html("11")
+                    //$('#btn_tonggao', window.parent.document).html("<22")
+                    ////$('#btn_gongwen').text(data.totalcount)
+                    //$('body > div.lr-im-bell2.open > ul > li:nth-child(5)', window.parent.document).html("44")
+                    //$('body > div.lr-im-bell2 > a > span:nth-child(3)', window.parent.document).html("123")
+                    $("#btn_daiban", window.parent.document).html("<i class='fa fa-comment'></i>待办事项 " + data.data.UnreadTask + " 条")
+                    $('#btn_tonggao', window.parent.document).html("<i class='fa fa-paper-plane'></i>通告 " + data.data.UnreadNews + " 条")
+                    //$('#btn_gongwen').text(data.totalcount)
+                    $('body > div.lr-im-bell2.open > ul > li:nth-child(5)', window.parent.document).html("共 " + data.data.totalcount+" 条")
+                    $('body > div.lr-im-bell2 > a > span:nth-child(3)', window.parent.document).html(data.data.totalcount)
+                }
+            }
+        });
+    };
 });

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js

@@ -22,7 +22,7 @@
         }
         var _width = 0;
         var len = data.length;
-        $.each(data, function (_index, _item) {//_item:label 显示列名 /name 字段名 /width 宽度 /align 对齐方式 /frozen 冻结列 /statistics 统计 /isMerge 合并//ishide 是否隐藏
+        $.each(data, function (_index, _item) {//_item:label 显示列名 /name 字段名 /width 宽度 /align 对齐方式 /frozen 冻结列 /statistics 统计 /isMerge 合并//ishide 是否隐藏 /sort 是否禁用当前列的排序
             if (!_item.ishide) {
                 //设置列表头数据
                 var col = {

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

@@ -162,12 +162,14 @@
 	<!--注册教师生成编号 金隅:jy;西昌：xc；大厂：dc-->
 	<add key="EmpNoRule" value="jy"/>
 	<!--考勤明细统计时查询的职工编号前缀 大厂：DCZZ-->
-	<add key="ADR_RecordUserNoPrev" value="DCZZ"/>
+	<add key="ADR_RecordUserNoPrev" value=""/>
 	<!--第三方登录跳转地址（最后不加/）-->
 	<add key="redirect_url" value="http://localhost:20472"/>
 	<add key="QJUrl" value="www.qj.com"/>
 	<!--系主任角色Id-->
 	<add key="DeptDirectorRoleId" value="9310c5f3-1a0a-4f23-9452-3e5a15b3b722" />
+  <!--学校签章使用权角色Id 流程审批时是否有使用学校签章的权限；-->
+  <add key="StampRightRoleId" value="cf0dc3da-3706-41ec-9032-02d1f4650d3b"/>
 	<!-- 登录次数限制：登录连续错误要禁止登录 -->
 	<add key="ForbidLoginNum" value="5"/>
 	<!-- 禁止登录时间（分钟） -->

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

@@ -221,9 +221,13 @@
   <ItemGroup>
     <Compile Include="Bootstraper.cs" />
     <Compile Include="Modules\LessonInfoOfElectiveOnlineApi.cs" />
+    <Compile Include="Modules\PersonnelManagement\MeetingManagementApi.cs" />
+    <Compile Include="Modules\PersonnelManagement\MeetingMinutesApi.cs" />
+    <Compile Include="Modules\PersonnelManagement\MeetingSignInRecordApi.cs" />
     <Compile Include="Modules\RepairReport\RepairReportTeacherApi.cs" />
     <Compile Include="Modules\RepairReport\RepairReportStudentApi.cs" />
     <Compile Include="Modules\SSOApi.cs" />
+    <Compile Include="Modules\StampPersonalApi.cs" />
     <Compile Include="Modules\StuEnrollOfficialApi.cs" />
     <Compile Include="Modules\AnnexesNoLoginApi.cs" />
     <Compile Include="Modules\AssetManagementSystem\Ass_AssetsInfoItemApi.cs" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs

@@ -19,7 +19,7 @@ namespace Learun.Application.WebApi.Modules
         {
             //判断当前时间是否可以打卡
             Get["/IsAttendance"] = IsAttendance;
-            //打卡
+            //上下班打卡
             Post["/clockin"] = ClockIn;
             //获取考勤打卡记录
             Get["/getrecordpagelist"] = GetRecordPageList;
@@ -29,6 +29,11 @@ namespace Learun.Application.WebApi.Modules
             Post["/clockinStudent"] = ClockInStudent;
             //打卡记录
             Get["/GetTeacherRecord"] = GetTeacherRecord;
+
+            //教师上下课打卡：判断当前打卡状态
+            //Get["IsAttendanceTeacher"] = IsAttendanceTeacher;
+            //教师上下课打卡
+            //Post["/clockinTeacher"] = ClockInTeacher;
         }
         private ADR_RestrictionIBLL adr_RestrictionBLL = new ADR_RestrictionBLL();
         private ADR_RecordIBLL adr_RecordBLL = new ADR_RecordBLL();
@@ -91,7 +96,7 @@ namespace Learun.Application.WebApi.Modules
         }
 
         /// <summary>
-        /// 打卡
+        /// 上下班打卡
         /// </summary>
         /// <param name="_"></param>
         /// <returns></returns>
@@ -103,6 +108,11 @@ namespace Learun.Application.WebApi.Modules
 
             return Success("打卡成功");
         }
+        /// <summary>
+        /// 学生打卡
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
         public Response ClockInStudent(dynamic _)
         {
             Attendance parameter = this.GetReqData<Attendance>();
@@ -129,5 +139,33 @@ namespace Learun.Application.WebApi.Modules
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 教师上下课打卡：判断当前打卡状态
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response IsAttendanceTeacher(dynamic _)
+        {
+            var res = adr_RestrictionBLL.IsAttendanceTeacher();
+            var jsondata =
+                new
+                {
+                    data = res
+                };
+            return Success(jsondata);
+        }
+        /// <summary>
+        /// 教师上下课打卡
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response ClockInTeacher(dynamic _)
+        {
+            Attendance parameter = this.GetReqData<Attendance>();
+            adr_RestrictionBLL.ClockInTeacher(parameter.ALon, parameter.ALat, parameter.AIsOut, parameter.ARemark, parameter.ADPhoto, parameter.ClockPlace, parameter.LessonSortNo, parameter.ALTId, parameter.ALTOEId);
+
+            return Success("打卡成功");
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs

@@ -191,7 +191,7 @@ namespace Learun.Application.WebApi
             ReqParameter req = this.Bind<ReqParameter>();
             loginMark = req.loginMark;
             token = req.token;
-            if (path == "/learun/adms/user/login"|| path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img"||path== "/learun/adms/user/imgfordc"||path== "/learun/adms/timetable/timeTableData"||path== "/quanjiang/sso/authorize")
+            if (path == "/learun/adms/user/login" || path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img" || path == "/learun/adms/user/imgfordc" || path == "/learun/adms/timetable/timeTableData" || path == "/quanjiang/sso/authorize" || path == "/learun/adms/StampPersonal/img")
             {// 登录接口，默认页面接口不做权限验证处理
                 return null;
             }