【修改】资助管理优化；

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -62,7 +62,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -72,8 +72,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#FundingLevel').lrDataItemSelect({ code: 'SchoolFundingLevel' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -155,7 +175,7 @@ var bootstrap = function ($, learun) {
                                  }
                              });
                         }},
-                    { label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                    { label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('custmerData', {
                                  url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -170,7 +190,7 @@ var bootstrap = function ($, learun) {
                         label: "身份证件类型", name: "IdCardType", width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -286,6 +306,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};

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

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

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

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

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

@@ -37,7 +37,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -63,7 +63,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -74,9 +74,29 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 350, 400);
             //下拉框绑定
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
+
             //判断助学金类型：1国家助学金，2校级助学金
             if (types == "1") {
                 $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' });
@@ -109,7 +129,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -125,7 +145,7 @@ var bootstrap = function ($, learun) {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -234,6 +254,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
@@ -242,7 +263,9 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.StartTimeRelease = startTimeRelease;
             param.EndTimeRelease = endTimeRelease;
-            param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
+                param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

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

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

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

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

@@ -68,7 +68,7 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm"  learun-authorize="yes">
-                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;上传附件</a>
                     </div>
                     <div class=" btn-group btn-group-sm"  learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交学工部</a>

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

@@ -37,7 +37,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -63,7 +63,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTimeRelease = begin;
                     endTimeRelease = end;
@@ -74,8 +74,28 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 350, 400);
             //下拉框绑定
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
 
             //判断助学金类型：1国家助学金，2校级助学金
             if (types == "1") {
@@ -166,7 +186,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        label: "所属班级", name: "ClassNo", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -182,7 +202,7 @@ var bootstrap = function ($, learun) {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
                         , formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -291,6 +311,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};

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

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

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

@@ -34,7 +34,7 @@ var bootstrap = function ($, learun) {
             }
         },
         bind: function () {
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
             $('#IdCardType').lrselectSet('01');
@@ -98,9 +98,9 @@ var bootstrap = function ($, learun) {
                     { label: "年级", name: "grade", width: 100, align: "left" }
                 ],
                 select: function (item) {
-                    //自动带出内容：姓名 院校 班级 身份证件号 身份证件类型
+                    //自动带出内容：姓名 院系 班级 身份证件号 身份证件类型
                     $("#StuName").val(item.stuname);
-                    $("#F_SchoolId").lrselectSet(item.f_schoolid);
+                    $("#DeptNo").lrselectSet(item.deptno);
                     $("#ClassNo").lrselectSet(item.classno);
                     $("#IdentityCardNo").val(item.identitycardno);
                 }

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

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

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

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

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

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

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

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -46,8 +46,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 450, 600);
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -77,20 +97,20 @@ var bootstrap = function ($, learun) {
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
+                        label: '院系', name: 'DeptNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
                                 key: value,
-                                keyId: 'f_companyid',
+                                keyId: 'deptno',
                                 callback: function (_data) {
-                                    callback(_data['f_fullname']);
+                                    callback(_data['deptname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: '班级', name: 'ClassNo', width: 100, align: "left",
+                        label: '班级', name: 'ClassNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -105,7 +125,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -338,12 +358,15 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
-            param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+            if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
+                param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

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

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

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

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

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

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

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
                 preyShow: false,
                 yShow: false,
                 // 默认
-                dfvalue: '1',
+                dfvalue: '-1',
                 selectfn: function (begin, end) {
                     startTime = begin;
                     endTime = end;
@@ -46,8 +46,28 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 450, 600);
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -135,20 +155,20 @@ var bootstrap = function ($, learun) {
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
+                        label: '院系', name: 'DeptNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
                                 key: value,
-                                keyId: 'f_companyid',
+                                keyId: 'deptno',
                                 callback: function (_data) {
-                                    callback(_data['f_fullname']);
+                                    callback(_data['deptname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: '班级', name: 'ClassNo', width: 100, align: "left",
+                        label: '班级', name: 'ClassNo', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -163,7 +183,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: '身份证件类型', name: 'IdCardType', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
-                                key: value,
+                                key: (value == null || value == "" || value == undefined) ? "01" : value,
                                 code: 'IdCardType',
                                 callback: function (_data) {
                                     callback(_data.text);
@@ -396,6 +416,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 sidx: 'SubmitTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};

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

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

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

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

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

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

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

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