【修改】班级人数日报表：专业部、年级、班级调整为联动下拉；

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

@@ -13,11 +13,11 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuArriveSchool">
         <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
-        <input id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div id="Grade" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuArriveSchool">
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-        <input id="Class" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div id="Class" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuArriveSchool">
         <div class="lr-form-item-title">应到人数</div>

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

@@ -6,7 +6,7 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
-var type = request('type');//copy代表复制
+var type = request('type');//copy代表复制，checkedit代表专业部编辑
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -14,10 +14,104 @@ var bootstrap = function ($, learun) {
             $('.lr-form-wrap').lrscroll();
             page.bind();
             page.initData();
+            if (type == "checkedit") {
+                //日期、专业部、年级、班级无法编辑
+                $("#Date").attr("readonly", "readonly");
+                $("#DeptNo").attr("readonly", "readonly");
+                $("#Grade").attr("readonly", "readonly");
+                $("#Class").attr("readonly", "readonly");
+            }
         },
         bind: function () {
             $('#Date').val(getnow());
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                value: "deptno",
+                text: "deptname",
+                param: { strWhere: "1=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text',
+                select: function (item) {
+                    var DeptNo = $("#DeptNo").lrselectGet();
+                    if (DeptNo != null && DeptNo != "" && DeptNo != "undefined") {
+                        if (item) {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "deptno='" + DeptNo + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#Class').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
+            });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -19,11 +19,11 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">年级</div>
-                                    <input id="Grade" type="text" class="form-control" />
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
-                                    <input id="Class" type="text" class="form-control" />
+                                    <div id="Class"></div>
                                 </div>
                             </div>
                         </div>
@@ -44,7 +44,7 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_checkEdit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;专业部编辑</a>
-                        <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
+                        <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;一键审核</a>
                     </div>
                 </div>
             </div>

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

@@ -45,7 +45,94 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                value: "deptno",
+                text: "deptname",
+                param: { strWhere: "1=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text',
+                select: function (item) {
+                    var DeptNo = $("#DeptNo").lrselectGet();
+                    if (DeptNo != null && DeptNo != "" && DeptNo != "undefined") {
+                        if (item) {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "deptno='" + DeptNo + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#Class').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#Class').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -68,6 +155,10 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 var Status = $('#gridtable').jfGridValue('Status');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(",") != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作!");
+                        return false;
+                    }
                     if (Status == "1") {
                         learun.alert.warning("该项已提交，无法编辑！");
                         return false;
@@ -91,6 +182,10 @@ var bootstrap = function ($, learun) {
             $('#lr_copy').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(",") != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作!");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '新增',
@@ -108,6 +203,10 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 var Status = $('#gridtable').jfGridValue('Status');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(",") != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作!");
+                        return false;
+                    }
                     if (Status == "1") {
                         learun.alert.warning("该项已提交，无法删除！");
                         return false;
@@ -129,10 +228,14 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 var Status = $('#gridtable').jfGridValue('Status');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(",") != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作!");
+                        return false;
+                    }
                     if (Status == "1") {
                         learun.alert.warning("该项已提交！");
                         return false;
-                    }else if (Status == "2") {
+                    } else if (Status == "2") {
                         learun.alert.warning("该项已审核！");
                         return false;
                     }
@@ -150,15 +253,15 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 var Status = $('#gridtable').jfGridValue('Status');
                 if (learun.checkrow(keyValue)) {
-                    if (Status == "2") {
-                        learun.alert.warning("该项已审核！");
+                    if (Status.indexOf("2") != -1) {
+                        learun.alert.warning("选中项中包含已审核的数据！");
                         return false;
                     }
-                    if (Status != "1") {
-                        learun.alert.warning("该项未提交，无法审核！");
+                    if (Status.indexOf("0") != -1 || Status.indexOf(" ") != -1) {
+                        learun.alert.warning("选中项中包含未提交的数据！");
                         return false;
                     }
-                    learun.layerConfirm('是否确认审核该项！', function (res) {
+                    learun.layerConfirm('是否确认审核选中项！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuArriveSchool/DoSubmit', { keyValue: keyValue, status: "2" }, function () {
                                 refreshGirdData();
@@ -172,6 +275,10 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 var Status = $('#gridtable').jfGridValue('Status');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(",") != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作!");
+                        return false;
+                    }
                     if (Status == "2") {
                         learun.alert.warning("该项已审核！");
                         return false;
@@ -183,7 +290,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'form',
                         title: '专业部编辑',
-                        url: top.$.rootUrl + '/EducationalAdministration/StuArriveSchool/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/EducationalAdministration/StuArriveSchool/Form?type=checkedit&keyValue=' + keyValue,
                         width: 1000,
                         height: 800,
                         callBack: function (id) {
@@ -203,7 +310,7 @@ var bootstrap = function ($, learun) {
                             if (cellvalue == "1") {
                                 return '<span class=\"label label-warning\">已提交</span>';
                             } else if (cellvalue == "2") {
-                                return '<span class=\"label label-success\">已审批</span>';
+                                return '<span class=\"label label-success\">已审核</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }
@@ -228,23 +335,36 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "年级", name: "Grade", width: 50, align: "left" },
-                    { label: "班级", name: "Class", width: 100, align: "left" },
-                    { label: "应到人数", name: "YingDaoNum", width: 100, align: "left", statistics: true },
-                    { label: "实到人数", name: "ShiDaoNum", width: 100, align: "left", statistics: true },
-                    { label: "未到人数", name: "WeiDaoNum", width: 100, align: "left", statistics: true },
-                    { label: "病假人数", name: "BingJiaNum", width: 100, align: "left", statistics: true },
+                    {
+                        label: "班级", name: "Class", 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: "YingDaoNum", width: 100, align: "left", statistics: true, isInt: true },
+                    { label: "实到人数", name: "ShiDaoNum", width: 100, align: "left", statistics: true, isInt: true },
+                    { label: "未到人数", name: "WeiDaoNum", width: 100, align: "left", statistics: true, isInt: true },
+                    { label: "病假人数", name: "BingJiaNum", width: 100, align: "left", statistics: true, isInt: true },
                     { label: "病假人员", name: "BingJiaPeople", width: 100, align: "left" },
-                    { label: "事假人数", name: "ShiJiaNum", width: 100, align: "left", statistics: true },
+                    { label: "事假人数", name: "ShiJiaNum", width: 100, align: "left", statistics: true, isInt: true },
                     { label: "事假人员", name: "ShiJiaPeople", width: 100, align: "left" },
-                    { label: "拟退学人数", name: "NiTuiXueNum", width: 100, align: "left", statistics: true },
+                    { label: "拟退学人数", name: "NiTuiXueNum", width: 100, align: "left", statistics: true, isInt: true },
                     { label: "拟退学人员", name: "NiTuiXuePeople", width: 100, align: "left" },
-                    { label: "拟休学人数", name: "NiXiuXueNum", width: 100, align: "left", statistics: true },
+                    { label: "拟休学人数", name: "NiXiuXueNum", width: 100, align: "left", statistics: true, isInt: true },
                     { label: "拟休学人员", name: "NiXiuXuePeople", width: 100, align: "left" },
-                    { label: "拟转出人数", name: "NiZhuanChuNum", width: 100, align: "left", statistics: true },
+                    { label: "拟转出人数", name: "NiZhuanChuNum", width: 100, align: "left", statistics: true, isInt: true },
                     { label: "拟转出人员", name: "NiZhuanChuPeople", width: 100, align: "left" },
                 ],
                 mainId: 'Id',
                 isPage: true,
+                isMultiselect: true,
                 sidx: 'Date desc,DeptNo',
                 sord: 'asc'
             });

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuArriveSchool/StuArriveSchoolService.cs

@@ -220,7 +220,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 else//审核
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuArriveSchool set Status='{status}',CheckUserId='{LoginUserInfo.Get().userId}',CheckTime='{DateTime.Now}' where Id='{keyValue}' ");
+                    var keyValueArr = string.Join("','", keyValue.Split(','));
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuArriveSchool set Status='{status}',CheckUserId='{LoginUserInfo.Get().userId}',CheckTime='{DateTime.Now}' where Id in ('{keyValueArr}') ");
                 }
             }
             catch (Exception ex)