解决冲突

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html

@@ -42,8 +42,8 @@
 	</div>
 	<div class="lr-form-row  " data-table="StuInfoBasic">
 	
-	    <label>开户行位置</label>
-	    <input id="BankLocation" type="text" />
+	    <label>开户网点</label>
+	    <input id="BankLocation" type="text" placeholder="例如中国建设银行西昌西客站支行" />
 	</div>
     <div class="lr-form-row  " data-table="StuInfoBasic">
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.js

@@ -176,6 +176,7 @@
 			// 	type: 'dataItem',
 
 			// });
+			//
 			$page.find('#DepositBank').lrpickerex({
 				code: 'DepositBank',
 				type: 'dataItem'

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/Check/Check.css

@@ -0,0 +1 @@
+

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/Check/Check.html

@@ -0,0 +1,24 @@
+<div class="lr-page lr-EducationalAdministrationStuLeaveManagement-page">
+    <div class="lr-page-tool">
+        <div class="lr-tool-left">
+            总共<span class="lr-badge lr-badge-primary">0</span>条
+        </div>
+        <div class="lr-tool-right">
+            <div class="lr-tool-right-btn lr_multiple_search">
+                <i class="iconfont icon-searchlist"></i>
+                <div class="lr-tool-right-btn-content lr-form-container">
+                    <div class="lr-form-row">
+                        <label>请假类型</label>
+                        <div id="LeaveType"></div>
+                    </div>
+                    <div class="lr-form-row">
+                        <label>审核状态</label>
+                        <div id="CheckStatus"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="lr-page-content" id="lr_EducationalAdministrationStuLeaveManagement_list"></div>
+   
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/Check/Check.js

@@ -0,0 +1,170 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-25 10:39
+ * 描  述：学生请假管理
+ */
+(function () {
+    var begin = '';
+    var end = '';
+    var multipleData = null;
+    var page = {
+        grid: null,
+        init: function ($page) {
+            begin = '';
+            end = '';
+            multipleData = null;
+            page.grid = $page.find('#lr_EducationalAdministrationStuLeaveManagement_list').lrpagination({
+                lclass: page.lclass,
+                rows: 10,                            // 每页行数
+                getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调
+                    param.multipleData = multipleData;
+                    page.loadData(param, callback, $page);
+                },
+                renderData: function (_index, _item, _$item) {// 渲染数据模板
+                    return page.rowRender(_index, _item, _$item, $page);
+                },
+                click: function (item, $item, $et) {// 列表行点击事件
+                    if ($et.hasClass('lr-btn-danger')) {
+                        page.btnClick(item, $item, $page);
+                    }
+                    else {
+                        page.rowClick(item, $item, $page);
+                    }
+                },
+                btns: page.rowBtns
+            });
+            // 多条件查询
+            var $multiple = $page.find('.lr_multiple_search').multiplequery({
+                callback: function (data) {
+                    begin = '';
+                    end = '';
+                    multipleData = data || {};
+                    page.grid.reload();
+                }
+            });
+            $multiple.find('#LeaveType').lrpickerex({
+                type: 'dataItem',
+                code: 'LeaveType'
+            });
+            $multiple.find('#CheckStatus').lrpickerex({
+                type: 'dataItem',
+                code: 'LeaveCheck'
+            });
+        },
+        lclass: 'lr-list',
+        loadData: function (param, callback, $page) {// 列表加载后台数据
+            var _postParam = {
+                pagination: {
+                    rows: param.rows,
+                    page: param.page,
+                    sidx: 'CreateTime desc',
+                    sord: 'DESC'
+                },
+                queryJson: JSON.stringify({ ClassManagerNo: learun.storage.get('userinfo').baseinfo.account })
+            };
+            if (param.multipleData) {
+                multipleData.ClassManagerNo = learun.storage.get('userinfo').baseinfo.account;
+                _postParam.queryJson = JSON.stringify(multipleData);
+            }
+            if (param.begin && param.end) {
+                _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end, ClassManagerNo: learun.storage.get('userinfo').baseinfo.account });
+            }
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/pagelist', _postParam, (data) => {
+                $page.find('.lr-badge').text('0');
+                if (data) {
+                    $page.find('.lr-badge').text(data.records);
+                    callback(data.rows, parseInt(data.records));
+                }
+                else {
+                    callback([], 0);
+                }
+            });
+        },
+        rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据
+            _$item.addClass('lr-list-item lr-list-item-multi');
+            _$item.append($('<p class="lr-ellipsis"><span>审核状态:</span></p>').dataFormatter({
+                value: _item.CheckStatus == "1" ? "同意" : _item.CheckStatus == "2" ? "不同意" : "申请中"
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>审核备注:</span></p>').dataFormatter({ value: _item.CheckRemark }));
+            _$item.append($('<p class="lr-ellipsis"><span>审核时间:</span></p>').dataFormatter({ value: _item.CheckTime }));
+            _$item.append($('<p class="lr-ellipsis"><span>审核人:</span></p>').dataFormatter({
+                value: _item.CheckUserNo,
+                type: 'dataSource',
+                code: 'EmpInfo',
+                keyId: 'empno',
+                text: 'empname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>请假类型:</span></p>').dataFormatter({
+                value: _item.LeaveType,
+                type: 'dataItem',
+                code: 'LeaveType'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>开始时间:</span></p>').dataFormatter({ value: _item.StartTime }));
+            _$item.append($('<p class="lr-ellipsis"><span>结束时间:</span></p>').dataFormatter({ value: _item.EndTime }));
+            _$item.append($('<p class="lr-ellipsis"><span>请假天数:</span></p>').dataFormatter({ value: _item.LeaveDay }));
+            _$item.append($('<p class="lr-ellipsis"><span>请假事由:</span></p>').dataFormatter({ value: _item.LeaveReason }));
+            _$item.append($('<p class="lr-ellipsis"><span>学号:</span></p>').dataFormatter({ value: _item.CreateUserNo }));
+            _$item.append($('<p class="lr-ellipsis"><span>姓名:</span></p>').dataFormatter({ value: _item.CreateUserName }));
+            _$item.append($('<p class="lr-ellipsis"><span>申请时间:</span></p>').dataFormatter({ value: _item.CreateTime }));
+            _$item.append($('<p class="lr-ellipsis"><span>班级:</span></p>').dataFormatter({
+                value: _item.ClassNo,
+                type: 'dataSource',
+                code: 'bjsj',
+                keyId: 'classno',
+                text: 'classname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>系部:</span></p>').dataFormatter({
+                value: _item.DeptNo,
+                type: 'dataSource',
+                code: 'CdDeptInfo',
+                keyId: 'deptno',
+                text: 'deptname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>专业:</span></p>').dataFormatter({
+                value: _item.MajorNo,
+                type: 'dataSource',
+                code: 'CdMajorInfo',
+                keyId: 'majorno',
+                text: 'majorname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>班主任:</span></p>').dataFormatter({
+                value: _item.ClassDiredctorNo,
+                type: 'dataSource',
+                code: 'EmpInfo',
+                keyId: 'empno',
+                text: 'empname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>辅导员:</span></p>').dataFormatter({
+                value: _item.ClassTutorNo,
+                type: 'dataSource',
+                code: 'EmpInfo',
+                keyId: 'empno',
+                text: 'empname'
+            }));
+            return '';
+        },
+        rowClick: function (item, $item, $page) {// 列表行点击触发方法
+            learun.nav.go({ path: 'EducationalAdministration/StuLeaveManagement/Check/form', title: '详情', type: 'right', param: { keyValue: item.Id, LeaveDay: item.LeaveDay } });
+        },
+        btnClick: function (item, $item, $page) {// 左滑按钮点击事件
+            if (item.CheckStatus == "1") {
+                learun.layer.warning("该项已审核通过无法删除！");
+                return false;
+            }
+            learun.layer.confirm('确定要删除该笔数据吗？', function (_index) {
+                if (_index === '1') {
+                    learun.layer.loading(true, '正在删除该笔数据');
+                    learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/delete', item.Id, (data) => {
+                        if (data) {// 删除数据成功
+                            page.grid.reload();
+                        }
+                        learun.layer.loading(false);
+                    });
+                }
+            }, '智慧校园提示', ['取消', '确定']);
+        },
+        rowBtns: [] // 列表行左滑按钮
+    };
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/Check/form/form.css

@@ -0,0 +1 @@
+

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/Check/form/form.html

@@ -0,0 +1,35 @@
+<div class="lr-form-container">
+    <div class="lr-form-row  " data-table="StuLeaveManagement">
+        <font face="宋体">*</font>
+        <label>请假类型</label>
+        <div id="LeaveType" readonly="readonly" isvalid="yes" checkexpession="NotNull" errormsg="请假类型"></div>
+    </div>
+    <div class="lr-form-row  " data-table="StuLeaveManagement">
+        <font face="宋体">*</font>
+        <label>开始时间</label>
+        <div id="StartTime" readonly="readonly" isvalid="yes" checkexpession="NotNull" errormsg="开始时间"></div>
+    </div>
+    <div class="lr-form-row  " data-table="StuLeaveManagement">
+        <font face="宋体">*</font>
+        <label>结束时间</label>
+        <div id="EndTime" readonly="readonly" isvalid="yes" checkexpession="NotNull" errormsg="结束时间"></div>
+    </div>
+    <div class="lr-form-row  " data-table="StuLeaveManagement">
+        <font face="宋体">*</font>
+        <label>请假天数</label>
+        <input id="LeaveDay" readonly="readonly" type="text" isvalid="yes" checkexpession="PositiveFloatint" errormsg="请假天数" />
+    </div>
+    <div class="lr-form-row  lr-form-row-multi" data-table="StuLeaveManagement">
+        <label>请假事由</label>
+        <textarea id="LeaveReason" readonly="readonly" style="height:100px;" errormsg="请假事由"></textarea>
+    </div>
+    <div class="lr-form-row  " data-table="StuLeaveManagement">
+        <font face="宋体">*</font>
+        <label>审核状态</label>
+        <div id="CheckStatus" isvalid="yes" checkexpession="NotNull" errormsg="审核状态"></div>
+    </div>
+    <div class="lr-form-row  lr-form-row-multi" data-table="StuLeaveManagement">
+        <label>审核备注</label>
+        <textarea id="CheckRemark" style="height:100px;" errormsg="审核备注"></textarea>
+    </div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/Check/form/form.js

@@ -0,0 +1,164 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-25 10:39
+ * 描  述：学生请假管理
+ */
+(function () {
+    var keyValue = '';
+    var $header = null;
+    var titleText = '';
+    var page = {
+        isScroll: true,
+        init: function ($page, param) {
+            keyValue = param.keyValue;
+            LeaveDay = param.LeaveDay;
+            // 添加头部按钮列表
+            var _html = '\
+                <div class="lr-form-header-cancel" >取消</div>\
+                <div class="lr-form-header-btnlist" >\
+                    <div class="lr-form-header-more" ><i class="iconfont icon-more" ></i></div>\
+                    <div class="lr-form-header-edit" ><i class="iconfont icon-edit" ></i></div>\
+                </div>\
+                <div class="lr-form-header-submit" >提交</div>';
+            $header = $page.parents('.f-page').find('.f-page-header');
+            $header.append(_html);
+            // 取消
+            $header.find('.lr-form-header-cancel').on('tap', function () {
+                learun.layer.confirm('确定要退出当前编辑？', function (_index) {
+                    if (_index === '1') {
+                        if (keyValue) {// 如果是编辑状态
+                            learun.formblur();
+                            $header.find('.lr-form-header-cancel').hide();
+                            $header.find('.lr-form-header-submit').hide();
+                            $header.find('.lr-form-header-btnlist').show();
+                            $header.find('.f-page-title').text(titleText);
+                            $page.find('.lr-form-container').setFormRead();
+                        }
+                        else {// 如果是新增状态 关闭当前页面
+                            learun.nav.closeCurrent();
+                        }
+                    }
+                }, '智慧校园提示', ['取消', '确定']);
+            });
+            // 编辑
+            $header.find('.lr-form-header-edit').on('tap', function () {
+                if (keyValue) {
+                    //判断是否可以审核：请假天数大于2天且登录用户不是系主任，提示无法审核；
+                    if (LeaveDay > 2) {
+                        //获取是否是系主任
+                        learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/isDeptDirector', "", (data) => {
+                            if (data && data != "" && data != undefined) {
+                                if (data.IsDeptDirector == false) {
+                                    learun.layer.warning("该请假申请大于2天，需要由系主任审核！");
+                                    return false;
+                                } else {
+                                    $header.find('.lr-form-header-btnlist').hide();
+                                    $header.find('.lr-form-header-cancel').show();
+                                    $header.find('.lr-form-header-submit').show();
+                                    titleText = $header.find('.f-page-title').text();
+                                    $header.find('.f-page-title').text('编辑');
+                                    $page.find('.lr-form-container').setFormWrite();
+                                }
+                            }
+                            learun.layer.loading(false);
+                        });
+                    } else {
+                        $header.find('.lr-form-header-btnlist').hide();
+                        $header.find('.lr-form-header-cancel').show();
+                        $header.find('.lr-form-header-submit').show();
+                        titleText = $header.find('.f-page-title').text();
+                        $header.find('.f-page-title').text('编辑');
+                        $page.find('.lr-form-container').setFormWrite();
+                    }
+                }
+            });
+            // 更多
+            $header.find('.lr-form-header-more').on('tap', function () {
+                learun.actionsheet({
+                    id: 'more',
+                    data: [
+                        
+                    ],
+                    cancel: function () {
+                    }
+                });
+            });
+            // 提交
+            $header.find('.lr-form-header-submit').on('tap', function () {
+                // 获取表单数据
+                if (!$page.find('.lr-form-container').lrformValid()) {
+                    return false;
+                }
+                var _postData = {}
+                _postData.keyValue = keyValue;
+                _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
+                learun.layer.loading(true, '正在提交数据');
+                learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/saveCheck', _postData, (data) => {
+                    learun.layer.loading(false);
+                    if (data) {// 表单数据保存成功
+                        if (keyValue) {
+                            learun.layer.toast('保存数据成功!');
+                            learun.formblur();
+                            $header.find('.lr-form-header-cancel').hide();
+                            $header.find('.lr-form-header-submit').hide();
+                            $header.find('.lr-form-header-btnlist').show();
+                            $header.find('.f-page-title').text(titleText);
+                            $page.find('.lr-form-container').setFormRead();
+                        }
+                        else {// 如果是
+                            learun.nav.closeCurrent();
+                        }
+                        var prepage = learun.nav.getpage('EducationalAdministration/StuLeaveManagement/Check');
+                        prepage.grid.reload();
+                    }
+                });
+            });
+            page.bind($page, param);
+            if (keyValue) {
+                // 添加编辑按钮
+                $page.find('.lr-form-container').setFormRead();
+                $header.find('.lr-form-header-btnlist').show();
+                // 获取表单数据
+                learun.layer.loading(true, '获取表单数据');
+                learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/form', keyValue, (data) => {
+                    if (data) {
+                        for (var id in data) {
+                            if (data[id].length) {
+                                $page.find('#' + id).lrgridSet(data[id]);
+                            }
+                            else {
+                                $page.find('[data-table="' + id + '"]').lrformSet(data[id]);
+                            }
+                        }
+                    }
+                    learun.layer.loading(false);
+                });
+            }
+            else {
+                $header.find('.lr-form-header-cancel').show();
+                $header.find('.lr-form-header-submit').show();
+            }
+        },
+        bind: function ($page, param) {
+            $page.find('#LeaveType').lrpickerex({
+                code: 'LeaveType',
+                type: 'dataItem'
+            });
+            $page.find('#StartTime').lrdate({
+                type: 'date'
+            });
+            $page.find('#EndTime').lrdate({
+                type: 'date'
+            });
+            $page.find('#CheckStatus').lrpickerex({
+                code: 'LeaveCheck',
+                type: 'dataItem'
+            });
+        }, destroy: function (pageinfo) {
+            $header = null;
+            keyValue = '';
+        }
+    };
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/StuLeaveManagement.css

@@ -0,0 +1 @@
+

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/StuLeaveManagement.html

@@ -0,0 +1,26 @@
+<div class="lr-page lr-EducationalAdministrationStuLeaveManagement-page">
+    <div class="lr-page-tool">
+        <div class="lr-tool-left">
+            总共<span class="lr-badge lr-badge-primary">0</span>条
+        </div>
+        <div class="lr-tool-right">
+            <div class="lr-tool-right-btn lr_multiple_search">
+                <i class="iconfont icon-searchlist"></i>
+                <div class="lr-tool-right-btn-content lr-form-container">
+                    <div class="lr-form-row">
+                        <label>请假类型</label>
+                        <div id="LeaveType"></div>
+                    </div>
+                    <div class="lr-form-row">
+                        <label>审核状态</label>
+                        <div id="CheckStatus"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="lr-page-content" id="lr_EducationalAdministrationStuLeaveManagement_list"></div>
+    <div class="lr-list-addbtn" id="lr_EducationalAdministrationStuLeaveManagement_btn">
+        <i class="iconfont icon-add1"></i>
+    </div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/StuLeaveManagement.js

@@ -0,0 +1,173 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-25 10:39
+ * 描  述：学生请假管理
+ */
+(function () {
+    var begin = '';
+    var end = '';
+    var multipleData = null;
+    var page = {
+        grid: null,
+        init: function ($page) {
+            begin = '';
+            end = '';
+            multipleData = null;
+            page.grid = $page.find('#lr_EducationalAdministrationStuLeaveManagement_list').lrpagination({
+                lclass: page.lclass,
+                rows: 10,                            // 每页行数
+                getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调
+                    param.multipleData = multipleData;
+                    page.loadData(param, callback, $page);
+                },
+                renderData: function (_index, _item, _$item) {// 渲染数据模板
+                    return page.rowRender(_index, _item, _$item, $page);
+                },
+                click: function (item, $item, $et) {// 列表行点击事件
+                    if ($et.hasClass('lr-btn-danger')) {
+                        page.btnClick(item, $item, $page);
+                    }
+                    else {
+                        page.rowClick(item, $item, $page);
+                    }
+                },
+                btns: page.rowBtns
+            });
+            // 多条件查询
+            var $multiple = $page.find('.lr_multiple_search').multiplequery({
+                callback: function (data) {
+                    begin = '';
+                    end = '';
+                    multipleData = data || {};
+                    page.grid.reload();
+                }
+            });
+            $multiple.find('#LeaveType').lrpickerex({
+                type: 'dataItem',
+                code: 'LeaveType'
+            });
+            $multiple.find('#CheckStatus').lrpickerex({
+                type: 'dataItem',
+                code: 'LeaveCheck'
+            });
+            $page.find('#lr_EducationalAdministrationStuLeaveManagement_btn').on('tap', function () {
+                learun.nav.go({ path: 'EducationalAdministration/StuLeaveManagement/form', title: '新增', type: 'right' });
+            });
+        },
+        lclass: 'lr-list',
+        loadData: function (param, callback, $page) {// 列表加载后台数据
+            var _postParam = {
+                pagination: {
+                    rows: param.rows,
+                    page: param.page,
+                    sidx: 'CreateTime desc',
+                    sord: 'DESC'
+                },
+                queryJson: JSON.stringify({ StuNo: learun.storage.get('userinfo').baseinfo.account })
+            };
+            if (param.multipleData) {
+                multipleData.StuNo = learun.storage.get('userinfo').baseinfo.account;
+                _postParam.queryJson = JSON.stringify(multipleData);
+            }
+            if (param.begin && param.end) {
+                _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end, StuNo: learun.storage.get('userinfo').baseinfo.account });
+            }
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/pagelist', _postParam, (data) => {
+                $page.find('.lr-badge').text('0');
+                if (data) {
+                    $page.find('.lr-badge').text(data.records);
+                    callback(data.rows, parseInt(data.records));
+                }
+                else {
+                    callback([], 0);
+                }
+            });
+        },
+        rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据
+            _$item.addClass('lr-list-item lr-list-item-multi');
+            _$item.append($('<p class="lr-ellipsis"><span>审核状态:</span></p>').dataFormatter({
+                value: _item.CheckStatus == "1" ? "同意" : _item.CheckStatus == "2" ? "不同意" : "申请中"
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>审核备注:</span></p>').dataFormatter({ value: _item.CheckRemark }));
+            _$item.append($('<p class="lr-ellipsis"><span>审核时间:</span></p>').dataFormatter({ value: _item.CheckTime }));
+            _$item.append($('<p class="lr-ellipsis"><span>审核人:</span></p>').dataFormatter({
+                value: _item.CheckUserNo,
+                type: 'dataSource',
+                code: 'EmpInfo',
+                keyId: 'empno',
+                text: 'empname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>请假类型:</span></p>').dataFormatter({
+                value: _item.LeaveType,
+                type: 'dataItem',
+                code: 'LeaveType'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>开始时间:</span></p>').dataFormatter({ value: _item.StartTime }));
+            _$item.append($('<p class="lr-ellipsis"><span>结束时间:</span></p>').dataFormatter({ value: _item.EndTime }));
+            _$item.append($('<p class="lr-ellipsis"><span>请假天数:</span></p>').dataFormatter({ value: _item.LeaveDay }));
+            _$item.append($('<p class="lr-ellipsis"><span>请假事由:</span></p>').dataFormatter({ value: _item.LeaveReason }));
+            _$item.append($('<p class="lr-ellipsis"><span>学号:</span></p>').dataFormatter({ value: _item.CreateUserNo }));
+            _$item.append($('<p class="lr-ellipsis"><span>姓名:</span></p>').dataFormatter({ value: _item.CreateUserName }));
+            _$item.append($('<p class="lr-ellipsis"><span>申请时间:</span></p>').dataFormatter({ value: _item.CreateTime }));
+            _$item.append($('<p class="lr-ellipsis"><span>班级:</span></p>').dataFormatter({
+                value: _item.ClassNo,
+                type: 'dataSource',
+                code: 'bjsj',
+                keyId: 'classno',
+                text: 'classname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>系部:</span></p>').dataFormatter({
+                value: _item.DeptNo,
+                type: 'dataSource',
+                code: 'CdDeptInfo',
+                keyId: 'deptno',
+                text: 'deptname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>专业:</span></p>').dataFormatter({
+                value: _item.MajorNo,
+                type: 'dataSource',
+                code: 'CdMajorInfo',
+                keyId: 'majorno',
+                text: 'majorname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>班主任:</span></p>').dataFormatter({
+                value: _item.ClassDiredctorNo,
+                type: 'dataSource',
+                code: 'EmpInfo',
+                keyId: 'empno',
+                text: 'empname'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>辅导员:</span></p>').dataFormatter({
+                value: _item.ClassTutorNo,
+                type: 'dataSource',
+                code: 'EmpInfo',
+                keyId: 'empno',
+                text: 'empname'
+            }));
+            return '';
+        },
+        rowClick: function (item, $item, $page) {// 列表行点击触发方法
+            learun.nav.go({ path: 'EducationalAdministration/StuLeaveManagement/form', title: '详情', type: 'right', param: { keyValue: item.Id, CheckStatus: item.CheckStatus } });
+        },
+        btnClick: function (item, $item, $page) {// 左滑按钮点击事件
+            if (item.CheckStatus == "1") {
+                learun.layer.warning("该项已审核通过无法删除！");
+                return false;
+            }
+            learun.layer.confirm('确定要删除该笔数据吗？', function (_index) {
+                if (_index === '1') {
+                    learun.layer.loading(true, '正在删除该笔数据');
+                    learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/delete', item.Id, (data) => {
+                        if (data) {// 删除数据成功
+                            page.grid.reload();
+                        }
+                        learun.layer.loading(false);
+                    });
+                }
+            }, '智慧校园提示', ['取消', '确定']);
+        },
+        rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
+    };
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/form/form.css

@@ -0,0 +1 @@
+

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/form/form.html

@@ -0,0 +1,26 @@
+<div class="lr-form-container">
+    <div class="lr-form-row  " data-table="StuLeaveManagement">
+        <font face="宋体">*</font>
+        <label>请假类型</label>
+        <div id="LeaveType" isvalid="yes" checkexpession="NotNull" errormsg="请假类型"></div>
+    </div>
+    <div class="lr-form-row  " data-table="StuLeaveManagement">
+        <font face="宋体">*</font>
+        <label>开始时间</label>
+        <div id="StartTime" isvalid="yes" checkexpession="NotNull" errormsg="开始时间"></div>
+    </div>
+    <div class="lr-form-row  " data-table="StuLeaveManagement">
+        <font face="宋体">*</font>
+        <label>结束时间</label>
+        <div id="EndTime" isvalid="yes" checkexpession="NotNull" errormsg="结束时间"></div>
+    </div>
+    <div class="lr-form-row  " data-table="StuLeaveManagement">
+        <font face="宋体">*</font>
+        <label>请假天数</label>
+        <input id="LeaveDay" type="text" isvalid="yes" checkexpession="PositiveFloatint" errormsg="请假天数" />
+    </div>
+    <div class="lr-form-row  lr-form-row-multi" data-table="StuLeaveManagement">
+        <label>请假事由</label>
+        <textarea id="LeaveReason" style="height:100px;" errormsg="请假事由"></textarea>
+    </div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuLeaveManagement/form/form.js

@@ -0,0 +1,161 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-25 10:39
+ * 描  述：学生请假管理
+ */
+(function () {
+    var keyValue = '';
+    var $header = null;
+    var titleText = '';
+    var page = {
+        isScroll: true,
+        init: function ($page, param) {
+            keyValue = param.keyValue;
+            CheckStatus = param.CheckStatus;
+            // 添加头部按钮列表
+            var _html = '\
+                <div class="lr-form-header-cancel" >取消</div>\
+                <div class="lr-form-header-btnlist" >\
+                    <div class="lr-form-header-more" ><i class="iconfont icon-more" ></i></div>\
+                    <div class="lr-form-header-edit" ><i class="iconfont icon-edit" ></i></div>\
+                </div>\
+                <div class="lr-form-header-submit" >提交</div>';
+            $header = $page.parents('.f-page').find('.f-page-header');
+            $header.append(_html);
+            // 取消
+            $header.find('.lr-form-header-cancel').on('tap', function () {
+                learun.layer.confirm('确定要退出当前编辑？', function (_index) {
+                    if (_index === '1') {
+                        if (keyValue) {// 如果是编辑状态
+                            learun.formblur();
+                            $header.find('.lr-form-header-cancel').hide();
+                            $header.find('.lr-form-header-submit').hide();
+                            $header.find('.lr-form-header-btnlist').show();
+                            $header.find('.f-page-title').text(titleText);
+                            $page.find('.lr-form-container').setFormRead();
+                        }
+                        else {// 如果是新增状态 关闭当前页面
+                            learun.nav.closeCurrent();
+                        }
+                    }
+                }, '智慧校园提示', ['取消', '确定']);
+            });
+            // 编辑
+            $header.find('.lr-form-header-edit').on('tap', function () {
+                if (keyValue) {
+                    if (CheckStatus == "1" || CheckStatus == "2") {
+                        learun.layer.warning("该项已审核无法编辑！");
+                        return false;
+                    }
+                }
+                $header.find('.lr-form-header-btnlist').hide();
+                $header.find('.lr-form-header-cancel').show();
+                $header.find('.lr-form-header-submit').show();
+                titleText = $header.find('.f-page-title').text();
+                $header.find('.f-page-title').text('编辑');
+                $page.find('.lr-form-container').setFormWrite();
+            });
+            // 更多
+            $header.find('.lr-form-header-more').on('tap', function () {
+                learun.actionsheet({
+                    id: 'more',
+                    data: [
+                        {
+                            text: '删除',
+                            mark: true,
+                            event: function () {// 删除当前条信息
+                                learun.layer.confirm('确定要删除该笔数据吗？', function (_index) {
+                                    if (_index === '1') {
+                                        learun.layer.loading(true, '正在删除该笔数据');
+                                        learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/delete', keyValue, (data) => {
+                                            learun.layer.loading(false);
+                                            if (data) {// 删除数据成功
+                                                learun.nav.closeCurrent();
+                                                var prepage = learun.nav.getpage('EducationalAdministration/StuLeaveManagement');
+                                                prepage.grid.reload();
+                                            }
+                                        });
+                                    }
+                                }, '智慧校园提示', ['取消', '确定']);
+                            }
+                        }
+                    ],
+                    cancel: function () {
+                    }
+                });
+            });
+            // 提交
+            $header.find('.lr-form-header-submit').on('tap', function () {
+                // 获取表单数据
+                if (!$page.find('.lr-form-container').lrformValid()) {
+                    return false;
+                }
+                var _postData = {}
+                _postData.keyValue = keyValue;
+                _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
+                learun.layer.loading(true, '正在提交数据');
+                learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/save', _postData, (data) => {
+                    learun.layer.loading(false);
+                    if (data) {// 表单数据保存成功
+                        if (keyValue) {
+                            learun.layer.toast('保存数据成功!');
+                            learun.formblur();
+                            $header.find('.lr-form-header-cancel').hide();
+                            $header.find('.lr-form-header-submit').hide();
+                            $header.find('.lr-form-header-btnlist').show();
+                            $header.find('.f-page-title').text(titleText);
+                            $page.find('.lr-form-container').setFormRead();
+                        }
+                        else {// 如果是
+                            learun.nav.closeCurrent();
+                        }
+                        var prepage = learun.nav.getpage('EducationalAdministration/StuLeaveManagement');
+                        prepage.grid.reload();
+                    }
+                });
+            });
+            page.bind($page, param);
+            if (keyValue) {
+                // 添加编辑按钮
+                $page.find('.lr-form-container').setFormRead();
+                $header.find('.lr-form-header-btnlist').show();
+                // 获取表单数据
+                learun.layer.loading(true, '获取表单数据');
+                learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuLeaveManagement/form', keyValue, (data) => {
+                    if (data) {
+                        for (var id in data) {
+                            if (data[id].length) {
+                                $page.find('#' + id).lrgridSet(data[id]);
+                            }
+                            else {
+                                $page.find('[data-table="' + id + '"]').lrformSet(data[id]);
+                            }
+                        }
+                    }
+                    learun.layer.loading(false);
+                });
+            }
+            else {
+                $header.find('.lr-form-header-cancel').show();
+                $header.find('.lr-form-header-submit').show();
+            }
+        },
+        bind: function ($page, param) {
+            $page.find('#LeaveType').lrpickerex({
+                code: 'LeaveType',
+                type: 'dataItem'
+            });
+            $page.find('#StartTime').lrdate({
+                type: 'date'
+            });
+            $page.find('#EndTime').lrdate({
+                type: 'date'
+            });
+        }, destroy: function (pageinfo) {
+            $header = null;
+            keyValue = '';
+        }
+    };
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html

@@ -92,8 +92,8 @@
 				<input id="BankCard" type="text" placeholder="请填写银行卡号"/>
 			</div>
 			<div class="welInput  ">
-				<span>开户行位置</span>
-				<input id="BankLocation" type="text" placeholder="请填写开户行位置" />
+				<span>开户网点</span>
+				<input id="BankLocation" type="text" placeholder="例如中国建设银行西昌西客站支行" />
 			</div>
 		</div>
 		<div class="welLine"></div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js

@@ -143,6 +143,7 @@
 					}
 					$("#Birthday").html($("#Birthday").text().substr(0, $("#Birthday").text()
 						.indexOf(' ')));
+					//编辑回显
 					$("#DepositBank").lrpickerSet(data.StuInfoFreshEntity.DepositBank);
 					//头像
 					$('#PhotoImg').attr('src', config.web + data['Url']);
@@ -241,7 +242,6 @@
 					StuInfoFreshFamilyEntities: family(),
 					StuInfoFreshEmergePeopleEntities: emergePeople()
 				};
-				console.log(postdata)
 				// return
 				learun.layer.loading(true, '正在提交数据');
 				learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (
@@ -249,7 +249,7 @@
 					learun.layer.loading(false);
 					if (data) {
 						learun.layer.toast('保存成功');
-						location.reload();
+						learun.nav.closeCurrent();
 					}
 				});
 
@@ -267,6 +267,7 @@
 				//赋值
 				$(item).lrpickerSet($(item).attr('value'));
 			});
+			//所属银行赋值
 			$page.find('#DepositBank').lrpickerex({
 				code: 'DepositBank',
 				type: 'dataItem'

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/AnswerQuery.cshtml

@@ -34,7 +34,6 @@
                         <a id="lr_answer" class="btn btn-default"><i class="fa fa-building-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-lock"></i>&nbsp; 审核</a>
                         <a id="lr_unsubmit" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp; 去审核</a>
                     </div>
                 </div>

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

@@ -0,0 +1,121 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-07-06 12:05
+    /// 描 述：收文阅读
+    /// </summary>
+    public class DispatchAuditController : MvcControllerBase
+    {
+        private DispatchAuditIBLL dispatchAuditIBLL = new DispatchAuditBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = dispatchAuditIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = dispatchAuditIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = dispatchAuditIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            dispatchAuditIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,DispatchAuditEntity entity)
+        {
+            dispatchAuditIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,414 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using Learun.Application.TwoDevelopment.LR_CodeDemo;
+using System.Collections.Generic;
+using Learun.Application.WorkFlow;
+using Learun.Application.Base.SystemModule;
+using System.Linq;
+using DocumentFormat.OpenXml.EMMA;
+using Learun.Application.Organization;
+//using Learun.Application.TwoDevelopment.LR_Desktop;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-01 11:49
+    /// 描 述：收文报告
+    /// </summary>
+    public class DispatchController : MvcControllerBase
+    {
+        private DispatchIBLL dispatchIBLL = new DispatchBLL();
+        private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL();
+        private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
+        private DataItemIBLL dataItemIBLL = new DataItemBLL();
+        private DispatchAuditIBLL dispatchAuditIBLL = new DispatchAuditBLL();
+        //private MessageRindIBLL messageRindIBLL = new MessageRindBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面党建
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 校方
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult IndexXF()
+        {
+            return View("IndexXF");
+        }
+
+        public ActionResult ReadIndex()
+        {
+            var userInfo = LoginUserInfo.Get();
+            ViewBag.userId = userInfo.userId;
+            ViewBag.realname = userInfo.realName;
+            return View();
+        }
+
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 流程
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+
+        [HttpGet]
+        public ActionResult ReadForm()
+        {
+            return View();
+        }
+
+
+        [HttpGet]
+        public ActionResult SelectForm()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = dispatchIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var DispatchData = dispatchIBLL.GetDispatchEntity(keyValue);
+            var jsonData = new
+            {
+                Dispatch = DispatchData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="processId">流程实例主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDataByProcessId(string processId)
+        {
+            var DispatchData = dispatchIBLL.GetEntityByProcessId(processId);
+            var jsonData = new
+            {
+                Dispatch = DispatchData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            dispatchIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            DispatchEntity entity = strEntity.ToObject<DispatchEntity>();
+            entity.FlowNo = "0";
+            entity.Reasons = entity.AttachmentName;
+            if (entity.DisOffice == "1")
+            {
+                entity.WorkName = "1";
+            }
+            else
+            {
+                entity.WorkName = "2";
+            }
+            dispatchIBLL.SaveEntity(keyValue, entity);
+
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 提交单子
+        /// </summary>
+        /// <param name="keyValue">表主键</param>
+        /// <param name="pastatus">审核状态</param>
+        /// <param name="processId">流程Id</param>
+        /// <returns></returns>
+        public ActionResult ModifyStatus(string keyValue, int pastatus, string processId)
+        {
+            dispatchIBLL.ModifyStatus(keyValue, pastatus, processId);
+            return Success("提交成功！");
+        }
+
+        /// <summary>
+        /// 打印
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Print(string keyValue)
+        {
+            var dispatchEntity = dispatchIBLL.GetDispatchEntity(keyValue);
+
+            if (dispatchEntity == null)
+            {
+                return View(new DispatchEntity());
+            }
+            #region 获取附件名称
+            if (dispatchEntity.AttachmentName != null)
+            {
+                string str = "";
+                string[] array = annexesFileIBLL.GetFileNames(dispatchEntity.AttachmentName).Split(',');
+                if (array.Length > 0)
+                {
+                    for (int i = 0; i < array.Length; i++)
+                    {
+                        if (array[i].Trim()!="")
+                        {
+                            str += array[i].Substring(0, array[i].IndexOf(".")) + ",";
+                        }
+                    }
+                    str.TrimEnd(',');
+                }
+                dispatchEntity.Reasons = str;
+            }
+            #endregion
+
+            #region 读取标题和办公室
+            if (dispatchEntity.DisTitle != null)
+            {
+                var modelTitle = dataItemIBLL.GetDetailList("DisPatch");
+                foreach (var item in modelTitle)
+                {
+                    if (!string.IsNullOrEmpty(dispatchEntity.DisTitle) && item.F_ItemValue == dispatchEntity.DisTitle)
+                    {
+                        dispatchEntity.DisTitle = item.F_ItemName;
+                    }
+                }
+            }
+            if (dispatchEntity.DisOffice != null)
+            {
+                var modelOffice = dataItemIBLL.GetDetailList("DisOffice");
+                foreach (var item in modelOffice)
+                {
+                    if (!string.IsNullOrEmpty(dispatchEntity.DisOffice) && item.F_ItemValue == dispatchEntity.DisOffice)
+                    {
+                        dispatchEntity.DisOffice = item.F_ItemName;
+                    }
+                }
+            }
+            #endregion
+
+            #region 获取校长的签名盖章  批示+时间+阅 
+            //var listTaskLog = nWFTaskIBLL.GetLogList(dispatchEntity.processId);
+            var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).OrderBy(o => o.F_CreateDate).ToList();
+            var Auditlist = dispatchAuditIBLL.ReadList(keyValue);
+            if (PrintList.Count > 0)
+            {
+                for (int i = 1; i < PrintList.Count; i++)
+                {
+                    if (i == 1)
+                    {
+                        dispatchEntity.Render = PrintList[i].F_Des;
+                        ViewBag.StampImg = PrintList[i].F_StampImg;
+                        ViewBag.SignImg = PrintList[i].F_SignImg;
+                    }
+                    dispatchEntity.Listarray += PrintList[i].F_CreateUserName + PrintList[i].F_CreateDate + "阅" + "&";
+                }
+            }
+            if (Auditlist != null)
+            {
+                for (int i = 0; i < Auditlist.Count; i++)
+                {
+                    dispatchEntity.Listarray += Auditlist[i].AuditName + Auditlist[i].AuditTime + "阅" + "&";
+                }
+            }
+            dispatchEntity.Listarray = dispatchEntity.Listarray.TrimEnd('&');
+            List<string> aaList = new List<string>(dispatchEntity.Listarray.Split('&'));
+            ViewBag.aaList = aaList;
+            #endregion
+
+            return View(dispatchEntity);
+        }
+
+        #region 查阅
+        /// <summary>
+        /// 查阅
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Read(string keyValue)
+        {
+            var userInfo = LoginUserInfo.Get();
+            var model = dispatchAuditIBLL.Repetition(keyValue, userInfo.realName);
+            if (model != null)
+            {
+                return Fail("请勿重复批阅！");
+            }
+            else
+            {
+                var dispatchEntity = dispatchIBLL.GetDispatchEntity(keyValue);
+                var printList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).Select(x => x.F_CreateUserName);
+                if (printList.Contains(userInfo.realName))
+                {
+                    return Fail("请勿重复批阅！");
+                }
+                else
+                {
+                    DispatchAuditEntity entityaudit = new DispatchAuditEntity();
+                    entityaudit.DisId = keyValue;
+                    entityaudit.AuditTime = DateTime.Now;
+                    entityaudit.AuditUser = userInfo.userId;
+                    entityaudit.AuditName = userInfo.realName;
+                    dispatchAuditIBLL.SaveEntity("", entityaudit);
+
+                    dispatchIBLL.SaveEntity(keyValue, dispatchEntity);
+                    return Success("查阅完成！");
+                }
+            }
+        }
+        #endregion
+
+        #region 设置传阅人
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SetRead(string objectId, string userIds)
+        {
+            var model = dispatchIBLL.GetDispatchEntity(objectId);
+            if (!string.IsNullOrEmpty(model.Reader))
+            {
+                return Fail("请勿重复设置传阅人！");
+            }
+            else
+            {
+                model.Reader = userIds;
+                dispatchIBLL.SaveEntity(objectId, model);
+                //var userInfo = LoginUserInfo.Get();
+                //foreach (var item in userIds)
+                //{
+                //    MessageRemindEntity entity = new MessageRemindEntity
+                //    {
+                //        ReceiptId = item.ToString(),
+                //        ReceiptName = userInfo.realName,
+                //        SenderId = userInfo.userId,
+                //        SenderName = userInfo.realName,
+                //        TheTitle = "查阅提醒",
+                //        TheContent = model.DisTitle,
+                //        //entity.InstanceId = item.F_ScheduleId;
+                //        ConnectionUrl = "/EducationalAdministration/Dispatch/ReadIndex?keyValue=",
+                //        SendTime = DateTime.Now,
+                //        ReadSigns = false
+                //    };
+                //    messageRindIBLL.SaveEntity("", entity);
+                //}
+                return Success("设置成功！");
+            }
+        }
+        #endregion
+
+        #region 查阅
+        /// <summary>
+        /// 查阅
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult ReadLD(string keyValue)
+        {
+            var userInfo = LoginUserInfo.Get();
+            var dispatchEntity = dispatchIBLL.GetDispatchEntity(keyValue);
+            var printList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).Select(x => x.F_CreateUserName);
+            if (printList.Contains(userInfo.realName))
+            {
+                return Fail("请勿重复阅读！");
+            }
+            else
+            {
+                DispatchAuditEntity entityaudit = new DispatchAuditEntity();
+                entityaudit.DisId = keyValue;
+                entityaudit.AuditTime = DateTime.Now;
+                entityaudit.AuditUser = userInfo.userId;
+                entityaudit.AuditName = userInfo.realName;
+                dispatchAuditIBLL.SaveEntity("", entityaudit);
+                return Success("阅读成功！");
+            }
+        }
+        #endregion
+
+        #endregion
+
+    }
+}

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

@@ -19,6 +19,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
         public ActionResult FormAdd()
         {
+            ViewBag.EmpNo = CommonHelper.CreateNo();
             return View();
         }
 

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

@@ -0,0 +1,134 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-09 11:43
+    /// 描 述：学生学期注册
+    /// </summary>
+    public class StuInfoSemsterController : MvcControllerBase
+    {
+        private StuInfoSemsterIBLL stuInfoSemsterIBLL = new StuInfoSemsterBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = stuInfoSemsterIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuInfoSemsterIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = stuInfoSemsterIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuInfoSemsterIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, StuInfoSemsterEntity entity)
+        {
+            stuInfoSemsterIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 注册
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoZhuce(string keyValue, string status)
+        {
+            stuInfoSemsterIBLL.DoZhuce(keyValue, status);
+            return Success("操作成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,118 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-28 17:00
+    /// 描 述：学生奖学金管理
+    /// </summary>
+    public class StuScholarshipManageController : MvcControllerBase
+    {
+        private StuScholarshipManageIBLL stuScholarshipManageIBLL = new StuScholarshipManageBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuScholarshipManageIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var StuScholarshipManageData = stuScholarshipManageIBLL.GetStuScholarshipManageEntity( keyValue );
+            var jsonData = new {
+                StuScholarshipManage = StuScholarshipManageData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuScholarshipManageIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            StuScholarshipManageEntity entity = strEntity.ToObject<StuScholarshipManageEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = LoginUserInfo.Get().userId;
+            stuScholarshipManageIBLL.SaveEntity(keyValue,entity);
+           
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,154 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-28 17:40
+    /// 描 述：助学金管理
+    /// </summary>
+    public class StuSubsideManageController : MvcControllerBase
+    {
+        private StuSubsideManageIBLL stuSubsideManageIBLL = new StuSubsideManageBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 主页面-审核
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult CheckIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页-审核
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult CheckForm()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuSubsideManageIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var StuSubsideManageData = stuSubsideManageIBLL.GetStuSubsideManageEntity( keyValue );
+            var jsonData = new {
+                StuSubsideManage = StuSubsideManageData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuSubsideManageIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            StuSubsideManageEntity entity = strEntity.ToObject<StuSubsideManageEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = LoginUserInfo.Get().userId;
+            stuSubsideManageIBLL.SaveEntity(keyValue,entity);
+
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveCheckForm(string keyValue, string strEntity)
+        {
+            StuSubsideManageEntity entity = strEntity.ToObject<StuSubsideManageEntity>();
+            entity.CheckTime = DateTime.Now;
+            entity.CheckUserId = LoginUserInfo.Get().userId;
+            stuSubsideManageIBLL.SaveEntity(keyValue, entity);
+
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,75 @@
+@{
+    ViewBag.Title = "收文报告";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" hidden="hidden">
+        <div class="lr-form-item-title">标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题</div>
+        <div id="DisTitle" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">来文单位<font face="宋体">*</font></div>
+        <input id="DisFrom" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">字<font face="宋体">*</font></div>
+        <input id="DisWork" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">号<font face="宋体">*</font></div>
+        <input id="DisMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    @*<div class="col-xs-4 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">份数<font face="宋体">*</font></div>
+            <input id="Copies" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        </div>*@
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">年<font face="宋体">*</font></div>
+        <input id="DisYear" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">月<font face="宋体">*</font></div>
+        <input id="DisMonth" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">日<font face="宋体">*</font></div>
+        <input id="DisDay" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件</div>
+        <div id="AttachmentName"></div>
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">事&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由</div>
+        <div id="Reasons" class="form-control" style="height:100px;" readonly="readonly"></div>
+    </div>*@
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch" hidden="hidden">
+        <div class="lr-form-item-title">收文单位</div>
+        <div id="DisOffice" readonly="readonly"></div>
+    </div>
+    <div class="lr-form-wrap" id="form">
+        <div class="col-xs-12 lr-form-item" data-table="Dispatch" style="display: none; ">
+            <div class="lr-form-item-title">呈送时间</div>
+            <input id="RenderDate" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+        </div>
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">呈送意见</div>
+            <textarea id="Render" class="form-control" style="height:100px;"></textarea>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">呈送时间</div>
+            <input id="RenderDate" type="text" autocomplete="off" class="form-control lr-input-wdatepicker"
+                   onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RenderDate').trigger('change'); } })"
+                   isvalid="yes" checkexpession="NotNull" />
+        </div>*@
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch" style="display: none; ">
+        <div class="lr-form-item-title">流程</div>
+        <input id="FlowNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch" style="display: none; ">
+        <div class="lr-form-item-title">关联流程</div>
+        <input id="processId" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Dispatch/Form.js")

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

@@ -0,0 +1,123 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-01 11:49
+ * 描  述：收文报告
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var DisOffice = request('DisOffice');
+var WorkName = request('WorkName');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            var NowYear = new Date();
+            $('#DisYear').val(NowYear.getFullYear()); 
+            $('#AttachmentName').lrUploader();
+            $('#DisOffice').lrDataItemSelect({ code: 'DisOffice' });
+            if (DisOffice == "1") {
+                $('#DisOffice').lrselectSet("1");
+            } else {
+                $('#DisOffice').lrselectSet("2");
+            }
+            $('#DisTitle').lrDataItemSelect({ code: 'Dispatch' });
+            if (WorkName == "1") {
+                $('#DisTitle').lrselectSet("1");
+            } else {
+                $('#DisTitle').lrselectSet("2");
+            }
+            $('#RenderDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); 
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                    
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Dispatch' && data[id]) {
+                            keyValue = data[id].Id;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.FlowNo = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,75 @@
+@{
+    ViewBag.Title = "收文报告";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" hidden="hidden">
+        <div class="lr-form-item-title">标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题</div>
+        <div id="DisTitle" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">来文单位<font face="宋体">*</font></div>
+        <input id="DisFrom" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">字<font face="宋体">*</font></div>
+        <input id="DisWork" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">号<font face="宋体">*</font></div>
+        <input id="DisMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    @*<div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">份数<font face="宋体">*</font></div>
+        <input id="Copies" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>*@
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">年<font face="宋体">*</font></div>
+        <input id="DisYear" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">月<font face="宋体">*</font></div>
+        <input id="DisMonth" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">日<font face="宋体">*</font></div>
+        <input id="DisDay" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">事&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由</div>
+        <textarea id="Reasons" class="form-control" style="height:100px;"></textarea>
+    </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件</div>
+        <div id="AttachmentName"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" hidden="hidden">
+        <div class="lr-form-item-title">收文单位</div>
+        <div id="DisOffice" readonly="readonly"></div>
+    </div>
+    <div class="lr-form-wrap" id="form">
+        <div class="col-xs-12 lr-form-item" data-table="Dispatch" style="display: none; ">
+            <div class="lr-form-item-title">呈送时间</div>
+            <input id="RenderDate" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+        </div>
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">呈送意见</div>
+            <textarea id="Render" class="form-control" style="height:100px;"></textarea>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+            <div class="lr-form-item-title">呈送时间</div>
+            <input id="RenderDate" type="text" autocomplete="off" class="form-control lr-input-wdatepicker"
+                   onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#RenderDate').trigger('change'); } })"
+                   isvalid="yes" checkexpession="NotNull" />
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" style="display: none; ">
+        <div class="lr-form-item-title">流程</div>
+        <input id="FlowNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" style="display: none; ">
+        <div class="lr-form-item-title">关联流程</div>
+        <input id="processId" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Dispatch/FormView.js")

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

@@ -0,0 +1,126 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-01 11:49
+ * 描  述：收文报告
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var DisOffice = request('DisOffice');
+var WorkName = request('WorkName');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#AttachmentName').lrUploader();
+            $('#DisOffice').lrDataItemSelect({ code: 'DisOffice' });
+            if (DisOffice == "1") {
+                $('#DisOffice').lrselectSet("1");
+            } else {
+                $('#DisOffice').lrselectSet("2");
+            }
+            $('#DisTitle').lrDataItemSelect({ code: 'Dispatch' });
+            if (WorkName == "1") {
+                $('#DisTitle').lrselectSet("1");
+            } else {
+                $('#DisTitle').lrselectSet("2");
+            }
+            $('#RenderDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); 
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Dispatch' && data[id]) {
+                            //keyValue = data[id].Id;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.FlowNo = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        if (!!callBack) {
+            var res = {
+                code: 200
+            }
+            callBack(res, i);
+        }
+        //$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        //    // 保存成功后才回调
+        //    if (!!callBack) {
+        //        callBack(res, i);
+        //    }
+        //});
+    };
+    page.init();
+}

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

@@ -0,0 +1,44 @@
+@{
+    ViewBag.Title = "收文报告";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">标题</div>
+                                    <input id="DisTitle" type="text" class="form-control" />
+                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">收文单位</div>
+                                    <input id="DisOffice" type="text" class="form-control" />
+                                </div>*@
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp; 提交</a>
+                        <a id="lr_read" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查阅</a>
+                        <a id="lr_setread" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;设置传阅</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Dispatch/Index.js")

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

@@ -0,0 +1,263 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-01 11:49
+ * 描  述：收文报告
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?WorkName=' + 1 + '&DisOffice=' + 1,
+                    width: 800,
+                    height: 380,
+                    callBack: function (id) {
+                        var res = false;
+                        // 验证数据
+                        res = top[id].validForm();
+
+                        // 保存数据
+                        if (res) {
+                            res = top[id].save('', function () {
+                                page.search();
+                            });
+                        }
+                        return res;
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo != 0) {
+                        learun.alert.warning("当前项目已提交不能编辑！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue + '&WorkName=' + 1 + '&DisOffice=' + 1,
+                        width: 800,
+                        height: 380,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo != 0) {
+                        learun.alert.warning("当前项目已提交不能删除！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/DeleteForm', { keyValue: keyValue }, function () {
+                            });
+                        }
+                    });
+                }
+            });
+            //提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo != 0) {
+                        learun.alert.warning("当前项目已提交,请耐心等待审批!");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/ModifyStatus', { keyValue: keyValue, pastatus: 1, processId: processId }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo < 2) {
+                        learun.alert.warning("当前项目未审核通过,不能打印！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'from',
+                        title: '收文通告',
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Print?keyValue=' + keyValue,
+                        width: 1200,
+                        height: 1200,
+                        callBack: null
+                    });
+                }
+            });
+            // 添加传阅人
+            $('#lr_setread').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                var loginInfo = learun.clientdata.get(['userinfo']);
+                console.log(loginInfo);
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '添加传阅人员',
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/SelectForm?objectId=' + keyValue + '&companyId=' + loginInfo.F_CompanyId + '&departmentId=' + loginInfo.F_DepartmentId + '&category=1',
+                        width: 800,
+                        height: 520,
+                        callBack: function (id) {
+                            return top[id].acceptClick();
+                        }
+                    });
+                }
+            });
+            //查阅
+            $('#lr_read').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo != 2) {
+                        learun.alert.warning("当前项目不能查阅！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查阅',
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/ReadForm?keyValue=' + keyValue,
+                        width: 800,
+                        height: 380,
+                        callBack: function (id) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/ReadLD', { keyValue: keyValue }, function (res) {
+                            });
+                        }
+                    });
+
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/Dispatch/GetPageList',
+                headData: 
+                [
+                    { label: "来文单位", name: "DisFrom", width: 400, align: "center" },
+                    { label: "字", name: "DisWork", width: 150, align: "center" },
+                    { label: "号", name: "DisMark", width: 150, align: "center" },
+                    //{ label: "份数", name: "Copies", width: 100, align: "center" },
+                    { label: "年", name: "DisYear", width: 100, align: "center" },
+                    { label: "月", name: "DisMonth", width: 100, align: "center" },
+                    { label: "日", name: "DisDay", width: 100, align: "center" },
+                    { label: "事由", name: "Reasons", width: 500, align: "center" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    console.log(res);
+                                    var bb = '';
+                                    $.each(res.data, function (i, item) {
+                                        bb += item.F_FileName.substring(0, item.F_FileName.indexOf("."))
+                                    })
+                                    //$.each(res.data, function(i, item) {
+                                    //    bb += '<span onclick="downLoad(\'' +
+                                    //        item.F_Id +
+                                    //        '\')" style="color:blue">' +
+                                    //        item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
+                                    //        '</span>,&nbsp;&nbsp;&nbsp;';
+                                    //})
+                                    callback(bb);
+                                }
+                            });
+                        }},
+                    {
+                        label: "审批状态", name: "FlowNo", width: 100, align: "center",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-warning\">草稿</span>';
+                            } if (cellvalue == 1) {
+                                return '<span class=\"label label-warning\">审批中</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-success\">审批通过</span>';
+                            }
+                        }
+                    }
+                ],
+                mainId: 'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.WorkName = 1;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+    };
+    refreshGirdData = function (res, postData) {
+        if (res.code == 200) {
+            // 发起流程
+            var postData = {
+                schemeCode: 'Dispatch',// 本地
+                //schemeCode: 'DBSW',//线上
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+            page.search();
+        }
+    };
+    page.init();
+}
+function downLoad(fileId, fileTwo) {
+    console.log(222);
+    if (fileTwo) {
+
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml

@@ -0,0 +1,44 @@
+@{
+    ViewBag.Title = "收文报告";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">标题</div>
+                                    <input id="DisTitle" type="text" class="form-control" />
+                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">收文</div>
+                                    <input id="DisOffice" type="text" class="form-control" />
+                                </div>*@
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp; 提交</a>
+                        <a id="lr_read" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查阅</a>
+                        <a id="lr_setread" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;设置传阅</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js

@@ -0,0 +1,262 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-01 11:49
+ * 描  述：收文报告
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?WorkName=' + 2 + '&DisOffice=' + 2,
+                    width: 800,
+                    height: 380,
+                    callBack: function (id) {
+                        var res = false;
+                        // 验证数据
+                        res = top[id].validForm();
+
+                        // 保存数据
+                        if (res) {
+
+                            res = top[id].save('', function () {
+                                page.search();
+                            });
+                        }
+                        return res;
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo != 0) {
+                        learun.alert.warning("当前项目已提交不能编辑！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue,
+                        width: 800,
+                        height: 380,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo != 0) {
+                        learun.alert.warning("当前项目已提交不能删除！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/DeleteForm', { keyValue: keyValue }, function () {
+                            });
+                        }
+                    });
+                }
+            });
+            //提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo != 0) {
+                        learun.alert.warning("当前项目已提交,请耐心等待审批!");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/ModifyStatus', { keyValue: keyValue, pastatus: 1, processId: processId }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo < 2) {
+                        learun.alert.warning("当前项目未审核通过,不能打印！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'from',
+                        title: '收文通告',
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Print?keyValue=' + keyValue,
+                        width: 1200,
+                        height: 1200,
+                        callBack: null
+                    });
+                }
+            });
+            //查阅
+            $('#lr_read').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo != 2) {
+                        learun.alert.warning("当前项目不能查阅！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查阅',
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/ReadForm?keyValue=' + keyValue,
+                        width: 800,
+                        height: 380,
+                        callBack: function (id) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/ReadLD', { keyValue: keyValue }, function (res) {
+                            });
+                        }
+                    });
+
+                }
+            });
+            // 添加传阅人
+            $('#lr_setread').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                var loginInfo = learun.clientdata.get(['userinfo']);
+                console.log(loginInfo);
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '添加传阅人员',
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/SelectForm?objectId=' + keyValue + '&companyId=' + loginInfo.F_CompanyId + '&departmentId=' + loginInfo.F_DepartmentId + '&category=1',
+                        width: 800,
+                        height: 520,
+                        callBack: function (id) {
+                            return top[id].acceptClick();
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/Dispatch/GetPageList',
+                headData: 
+                [
+                    { label: "来文单位", name: "DisFrom", width: 400, align: "center" },
+                    { label: "字", name: "DisWork", width: 150, align: "center" },
+                    { label: "号", name: "DisMark", width: 150, align: "center" },
+                    //{ label: "份数", name: "Copies", width: 100, align: "center" },
+                    { label: "年", name: "DisYear", width: 100, align: "center" },
+                    { label: "月", name: "DisMonth", width: 100, align: "center" },
+                    { label: "日", name: "DisDay", width: 100, align: "center" },
+                    { label: "事由", name: "Reasons", width: 500, align: "center" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    console.log(res);
+                                    var bb = '';
+                                    $.each(res.data, function (i, item) {
+                                        bb += item.F_FileName.substring(0, item.F_FileName.indexOf("."))
+                                    })
+                                    callback(bb);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "审批状态", name: "FlowNo", width: 100, align: "center",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-warning\">草稿</span>';
+                            } if (cellvalue == 1) {
+                                return '<span class=\"label label-warning\">审批中</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-success\">审批通过</span>';
+                            }
+                        }
+                    }
+                ],
+                mainId: 'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.WorkName = 2;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        downLoad: function (fileId) {
+            console.log(111);
+            top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (res.code == 200) {
+            // 发起流程
+            var postData = {
+                schemeCode: 'Dispatch',// 本地
+                //schemeCode: 'XBSW',// 线上
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+            page.search();
+        }
+    };
+    page.init();
+}
+function downLoad(fileId, fileTwo) {
+    console.log(222);
+    if (fileTwo) {
+
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml

@@ -0,0 +1,346 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>收文通告</title>
+    <style>
+        /*.btn {
+            width: 100px;
+            height: 34px;
+            line-height: 34px;
+            text-align: center;
+            margin: 30px auto;
+            border: 1px solid #ccc;
+            cursor: pointer;
+            border-radius: 4px;
+        }*/
+        .lr-query-btn {
+            position: absolute;
+            width: 122px;
+            height: 40px;
+            line-height: 40px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+            text-align: center;
+            color: #fff;
+            background-color: #039cfd;
+            border-color: #039cfd;
+            right: 80px;
+            top: 40px;
+            font-size: 18px;
+        }
+
+        .table {
+            width: 90%;
+            margin: 30px auto;
+        }
+
+        * {
+            padding: 0;
+            margin: 0;
+            font-weight: bold;
+        }
+
+        i,
+        em {
+            font-style: normal
+        }
+
+        .box {
+            border-left: 2px dotted red;
+            width: 1100px;
+            margin-left: 30px;
+            position: relative;
+            /* float: right; */
+        }
+
+        .zdx {
+            position: absolute;
+            width: 20px;
+            background: #fff;
+            top: 40%;
+            left: -20px;
+            padding: 10px;
+        }
+
+            .zdx span {
+                display: inline-block;
+                margin-top: 10px;
+            }
+
+        h5 {
+            font-size: 28px;
+            margin-top: 40px;
+            margin-bottom: 50px;
+            text-align: center;
+            color: red;
+        }
+
+        span {
+            color: red;
+        }
+
+        .heder {
+            height: 180px;
+            width: 90%;
+            margin: 0 auto;
+            border-top: 2px solid red;
+            border-bottom: 2px solid red;
+        }
+
+        .hederL {
+            float: left;
+        }
+
+        .hederR {
+            float: right;
+            width: 40%;
+            border-left: 2px solid red;
+            height: 180px;
+            padding-left: 50px;
+            word-wrap: break-word;
+            word-break: break-all;
+        }
+
+            .hederR p {
+                margin-top: 10px;
+            }
+
+            .hederR h6 {
+                color: red;
+                font-size: 16px;
+            }
+
+            .hederR p:nth-child(2) {
+                margin-top: 30px;
+            }
+
+            .hederR span, em {
+                padding: 10px 12px;
+            }
+
+            .hederR span {
+                display: inline-block;
+            }
+
+        .sy {
+            width: 90%;
+            margin: 0 auto;
+            height: 200px;
+            border-bottom: 2px solid red;
+        }
+
+            .sy span em {
+                display: inline-block;
+                padding: 10px 20px;
+            }
+
+        .yj {
+            width: 90%;
+            margin: 0 auto;
+            height: 270px;
+            border-bottom: 2px solid red;
+        }
+
+            .yj div {
+                height: 232px;
+            }
+
+                .yj div span {
+                    display: inline-block;
+                    padding: 10px 20px;
+                }
+
+            .yj p {
+                float: right;
+            }
+
+                .yj p span {
+                    display: inline-block;
+                    padding: 10px 20px;
+                }
+
+        .ps {
+            height: 500px;
+            width: 90%;
+            margin: 0 auto;
+        }
+
+            .ps div {
+                height: 480px;
+                border-bottom: 2px solid red;
+            }
+
+                .ps div span {
+                    display: block;
+                    padding: 10px 20px;
+                    min-height: 235px;
+                }
+
+            .ps p {
+                float: right;
+            }
+
+                .ps p span {
+                    display: inline-block;
+                    padding: 10px 20px;
+                    margin-bottom: 40px;
+                }
+
+        .ulzp {
+            text-indent: 32px;
+            font-size: 14px;
+            line-height: 30px;
+            position: relative;
+        }
+
+            .ulzp ul {
+                width: 50%;
+                float: left;
+            }
+
+            .ulzp li {
+                float: left;
+                padding: 0;
+                margin: 0;
+                list-style: none;
+            }
+
+            .ulzp span {
+                display: inline-block;
+                width: 80px;
+                height: 24px;
+                border-bottom: 1px solid #000;
+                vertical-align: bottom;
+                position: relative;
+                top: -5px;
+                text-indent: 0;
+                text-align: center;
+            }
+    </style>
+</head>
+
+<body>
+    <div id="content" class="content">
+        <div class="box">
+            <p class="zdx">
+                <span>装</span>
+
+                <span>订</span>
+
+                <span>线</span>
+            </p>
+            <h5>@Model.DisTitle</h5>
+            <div class="heder">
+                <div class="hederL"></div>
+                <div class="hederR">
+                    <p><em>@Model.DisFrom</em><h6> 来 文 单 位 </h6></p>
+                    <p>
+                        @*<em>@Model.Copies</em>
+                        <span> 份 数 </span>*@
+                        <em>@Model.DisWork</em>
+                        <span>字</span>
+                        <em>@Model.DisMark</em>
+                        <span>号</span>
+                    </p>
+                    <p>
+                        <em>@Model.DisYear</em>
+                        <span>年</span>
+                        <em>@Model.DisMonth</em>
+                        <span>月</span>
+                        <em>@Model.DisDay</em>
+                        <span>日</span>
+                    </p>
+                </div>
+            </div>
+            <div class="sy">
+                <span>
+                    <em>  事  </em><em>  由：  </em>
+                    <em style="color: #000000">
+                        @Model.Reasons
+                    </em>
+                </span>
+            </div>
+            @*<div class="sy">
+                <span>
+                    <em>  附  </em><em>  件：  </em><em style="color: #000000">@Model.AttachmentName</em>
+                </span>
+            </div>*@
+            <div class="yj">
+                <div>
+                    <span>呈送意见：<em style="color: #000000">@Model.Render</em></span>
+                </div>
+                <p>
+                    <span>
+                        <em style="color: #000000">
+                            @Model.RenderDate.ToShortDateString().ToString().Replace("/", "-")
+                        </em>
+                    </span>
+                </p>
+            </div>
+            <div class="ps">
+                <div>
+                    <span>
+                        批    <em> 示：</em>
+                        <em style="color: #000000">
+                            @foreach (var item in ViewBag.aaList)
+                            {
+                                <em style="display: block; height: 30px; line-height: 30px; margin-left: 60px;">@item</em>
+                            }
+                        </em>
+                    </span>
+                    <div class="ulzp" style="height: 200px; border-bottom:none;">
+                        <ul>
+                            <li>(签字):</li>
+                            <li> <img id="signImg" hidden="hidden"></li>
+                        </ul>
+                        <ul>
+                            <li>(签章):</li>
+                            <li><img id="stampImg" hidden="hidden"></li>
+                        </ul>
+                    </div>
+                </div>
+                <p>
+                    <em>@Model.DisOffice</em><span> 收 文 单 位 </span>
+                    <em>@Model.DisWork</em><span>字</span>
+                    <em>@Model.DisMark</em><span>号</span>
+                    <em>@Model.DisYear</em><span>年</span>
+                    <em>@Model.DisMonth</em><span>月</span>
+                    <em>@Model.DisDay</em><span>日</span>
+                </p>
+            </div>
+        </div>
+    </div>
+    <div class="lr-query-btn" id="lr_print">打印</div>
+    @*<input  class="lr-query-btn" id="dy" />*@
+    <script src="~/Content/jquery/jquery-1.10.2.min.js"></script>
+    <script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script>
+    <script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script>
+    <script>
+        //盖章图片
+        var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=@ViewBag.StampImg';
+        var signUrl = '/LR_SystemModule/Img/GetImg?keyValue=@ViewBag.SignImg';
+        $('#signImg').attr('src', signUrl);
+        $('#stampImg').attr('src', stampUrl);
+
+        var signImg = new Image();
+        var stampImg = new Image();
+        signImg.src = $('#signImg')[0].src;
+        stampImg.src = $('#stampImg')[0].src;
+        signImg.onload=function() {
+            $('#signImg').show();
+        }
+        stampImg.onload=function() {
+            $('#stampImg').show();
+        }
+        $('#lr_print').on('click', function () {
+            $('#content').jqprint();
+        });
+    </script>
+</body>
+
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadForm.cshtml

@@ -0,0 +1,65 @@
+@{
+    ViewBag.Title = "收文报告";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch" hidden="hidden">
+        <div class="lr-form-item-title">标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题</div>
+        <div id="DisTitle" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">来文单位<font face="宋体">*</font></div>
+        <input id="DisFrom" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">字<font face="宋体">*</font></div>
+        <input id="DisWork" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">号<font face="宋体">*</font></div>
+        <input id="DisMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    @*<div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">份数<font face="宋体">*</font></div>
+        <input id="Copies" type="text" class="form-control" isvalid="yes" checkexpession="Num" readonly="readonly" />
+    </div>*@
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">年<font face="宋体">*</font></div>
+        <input id="DisYear" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">月<font face="宋体">*</font></div>
+        <input id="DisMonth" type="text" class="form-control" isvalid="yes" checkexpession="Num" readonly="readonly" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">日<font face="宋体">*</font></div>
+        <input id="DisDay" type="text" class="form-control" isvalid="yes" checkexpession="Num" readonly="readonly" />
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">事&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;由</div>
+        <textarea id="Reasons" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="Dispatch">
+        <div class="lr-form-item-title">附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件</div>
+        <div id="AttachmentName"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="Dispatch" hidden="hidden">
+        <div class="lr-form-item-title">收文单位</div>
+        <div id="DisOffice" readonly="readonly"></div>
+    </div>
+    <div class="lr-form-wrap" id="form">
+        <div class="col-xs-12 lr-form-item" data-table="Dispatch" style="display: none; ">
+            <div class="lr-form-item-title">呈送时间</div>
+            <input id="RenderDate" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+        </div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch" style="display: none; ">
+        <div class="lr-form-item-title">流程</div>
+        <input id="FlowNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Dispatch" style="display: none; ">
+        <div class="lr-form-item-title">关联流程</div>
+        <input id="processId" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Dispatch/ReadForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadForm.js

@@ -0,0 +1,122 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-01 11:49
+ * 描  述：收文报告
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var DisOffice = request('DisOffice');
+var WorkName = request('WorkName');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#WorkName').lrDataItemSelect({ code: 'Dispatch' }); 
+            $('#AttachmentName').lrUploader();
+            $('#DisOffice').lrDataItemSelect({ code: 'DisOffice' });
+            if (DisOffice == "1") {
+                $('#DisOffice').lrselectSet("1");
+            } else {
+                $('#DisOffice').lrselectSet("2");
+            }
+            $('#DisTitle').lrDataItemSelect({ code: 'Dispatch' });
+            if (WorkName == "1") {
+                $('#DisTitle').lrselectSet("1");
+            } else {
+                $('#DisTitle').lrselectSet("2");
+            }
+            $('#RenderDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); 
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                    $("#lrUploader_uploadBtn_AttachmentName").hide();
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Dispatch' && data[id]) {
+                            keyValue = data[id].Id;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.FlowNo = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.cshtml

@@ -0,0 +1,38 @@
+@{
+    ViewBag.Title = "收文报告";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<script>
+    var realname = "@ViewBag.realname";
+    var userId = "@ViewBag.userId";
+</script>
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">来源</div>
+                                    <div id="WorkName"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_read" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查阅</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js

@@ -0,0 +1,153 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-01 11:49
+ * 描  述：收文报告
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 100, 400);
+            $('#WorkName').lrDataItemSelect({ code: 'Dispatch' }); 
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //查阅
+            $('#lr_read').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                var reader = $('#gridtable').jfGridValue('Reader');
+                if (learun.checkrow(keyValue)) {
+                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
+                    if (FlowNo != 2) {
+                        learun.alert.warning("当前项目不能查阅！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查阅',
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/ReadForm?keyValue=' + keyValue +'&reader='+reader,
+                        width: 800,
+                        height: 380,
+                        callBack: function (id) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/Read', { keyValue: keyValue ,reader: reader }, function (res) {
+                            });
+                        }
+                    });
+                    
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/Dispatch/GetPageList',
+                headData: [
+                    {
+                        label: "来源",name: "WorkName",width: 300,align: "center",
+                        formatterAsync: function(callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem',
+                                {
+                                    key: value,
+                                    code: 'Dispatch',
+                                    callback: function(_data) {
+                                        callback(_data.text);
+                                    }
+                                });
+                        }
+                    },
+                    { label: "来文单位", name: "DisFrom", width: 300, align: "center" },
+                    { label: "字", name: "DisWork", width: 100, align: "center" },
+                    { label: "号", name: "DisMark", width: 100, align: "center" },
+                    //{ label: "份数", name: "Copies", width: 100, align: "center" },
+                    { label: "年", name: "DisYear", width: 100, align: "center" },
+                    { label: "月", name: "DisMonth", width: 100, align: "center" },
+                    { label: "日", name: "DisDay", width: 100, align: "center" },
+                    { label: "事由", name: "Reasons", width: 400, align: "center" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    console.log(res);
+                                    var bb = '';
+                                    $.each(res.data, function (i, item) {
+                                        bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) 
+                                    })
+                                    callback(bb);
+                                }
+                            });
+                        }},
+                    { label: "传阅人员", name: "Reader", width: 100, align: "center",hidden:true},
+                    //{ label: "呈送意见", name: "Render", width: 200, align: "center" },
+                    //{ label: "呈送时间", name: "RenderDate", width: 100, align: "center" },
+                    //{
+                    
+                    {
+                        label: "审批状态", name: "FlowNo", width: 100, align: "center",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-warning\">草稿</span>';
+                            } if (cellvalue == 1) {
+                                return '<span class=\"label label-warning\">审批中</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-success\">审批通过</span>';
+                            }
+                        }
+                    }
+                ],
+                mainId: 'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.userId = userId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        downLoad: function (fileId) {
+            console.log(111);
+            top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (res.code == 200) {
+            // 发起流程
+            var postData = {
+                //schemeCode: 'Dispatch',// 本地
+                schemeCode: 'DBSW',//线上
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+            page.search();
+        }
+    };
+    page.init();
+}
+function downLoad(fileId, fileTwo) {
+    console.log(222);
+    if (fileTwo) {
+
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/SelectForm.cshtml

@@ -0,0 +1,26 @@
+@{
+    ViewBag.Title = "成员添加";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+@Html.AppendCssFile("/Areas/EducationalAdministration/Views/Dispatch/SelectForm.css")
+<div class="form-warp">
+    <div class="form-warp-left">
+        <div id="company_select" class="company-select"></div>
+        <div id="department_tree" class="department-tree"></div>
+    </div>
+    <div class="form-warp-main">
+        <div class="user-search">
+            <input id="txt_keyword" type="text" class="form-control" placeholder="请输入要查询关键字">
+            <span class="input-query" title="Search"><i class="fa fa-search"></i></span>
+            <div class="user-selected-btn" id="user_selected_btn">已选人员</div>
+        </div>
+        <div class="user-list" id="user_list_warp"><div id="user_list"></div></div>
+    </div>
+    <div class="form-warp-right" id="form_warp_right">
+        <div class="form-warp-right-title">已选人员<span class="form-warp-right-close" id="user_selected_btn_close" title="关闭"></span></div>
+        <div class="selected-user-list-warp" id="selected_user_list_warp">
+            <div id="selected_user_list"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Dispatch/SelectForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/SelectForm.css

@@ -0,0 +1,216 @@
+.form-warp {
+    position:relative;
+    width:100%;
+    height:100%;
+    padding-left:200px;
+}
+.form-warp-left {
+    position:absolute;
+    left:0;
+    top:0;
+    width:200px;
+    height:100%;
+    padding-top:28px;
+}
+.company-select {
+    position:absolute;
+    top:0;
+    left:0;
+    height:28px;
+    width:100%;
+    border:1px solid #ddd;
+    border-top:0px;
+    border-left:0px;
+}
+.learun-select.learun-select-focus {
+    border: 1px solid #ddd;
+    border-top:0px;
+    border-left:0px;
+}
+.learun-select-placeholder {
+    padding-left:15px;
+}
+.learun-select-option {
+    border:0px;
+    border-bottom:1px solid #ddd;
+}
+
+
+.department-tree {
+    position:relative;
+    height:100%;
+    width:100%;
+    border-right:1px solid #ddd;
+}
+.form-warp-main {
+    position:relative;
+    height:100%;
+    width:100%;
+    padding-top:28px;
+
+}
+.user-search {
+    position:absolute;
+    top:0;
+    left:0;
+    width:100%;
+    height:28px;
+    border-bottom:1px solid #ddd;
+}
+.user-list {
+    position:relative;
+    height:100%;
+    width:100%;
+}
+
+.card-box {
+    position:relative;
+    float: left;
+    width: 185px;
+    height: 60px;
+    border: 1px solid #ccc;
+    background-color: #fff;
+    border-radius: 3px;
+    margin: 10px 0 0 10px;
+    padding-left:65px;
+    padding-top:4px;
+    overflow: hidden;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    -khtml-user-select: none;
+    user-select: none;
+    cursor: pointer;
+}
+.card-box.active {
+    border: 2px solid #ff5d5b;
+    background: url(/Content/images/selected_red.png) right top no-repeat;
+}
+.card-box-img {
+    position: absolute;
+    left:0;
+    top:0;
+    width: 59px;
+    height: 58px;
+    line-height:58px;
+    padding-left:9px;
+    background-color: #ebebeb;
+    border-right: 1px solid #ccc;
+}
+.card-box-img img {
+    border-radius: 45px;
+}
+.card-box-content p {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    margin:0;
+}
+.form-warp-right {
+    position:absolute;
+    top:0;
+    right:-180px;
+    height:100%;
+    width:180px;
+    border-left:1px solid #ddd;
+    padding-top:28px;
+    background-color:#fff;
+    z-index:10;
+}
+.form-warp-right-close {
+    position: absolute;
+    top: 7px;
+    right: 4px;
+    width: 12px;
+    height: 13px;
+    display: block;
+    background: url(/Content/images/tab_close.png) no-repeat;
+    cursor:pointer;
+}
+.form-warp-right-close:hover {
+    background-position: 0 -12px;
+}
+
+.form-warp-right-title {
+    position:absolute;
+    top:0;
+    left:0;
+    height:28px;
+    line-height:27px;
+    padding-left:10px;
+    width:100%;
+    border-bottom:1px solid #ddd;
+    padding-right:80px;
+}
+.selected-user-list-warp {
+    position:relative;
+    height:100%;
+    width:100%;
+}
+
+.user-selected-box {
+     position:relative;
+     width:160px;
+     height:44px;
+     border:1px solid #ccc;
+     border-radius:4px;
+     margin:auto;
+     margin-top:10px;
+     padding:5px 0 0 10px;
+     
+}
+.user-selected-box p { 
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    margin:0;
+}
+
+.user-reomve {
+    position: absolute;
+    top: 2px;
+    right: 2px;
+    width: 12px;
+    height: 13px;
+    display: block;
+    background: url(/Content/images/tab_close.png) no-repeat;
+    cursor:pointer;
+}
+.user-reomve:hover {
+    background-position: 0 -12px;
+}
+
+
+.user-selected-btn {
+    position:absolute;
+    top:0;
+    right:0;
+    height:100%;
+    width:80px;
+    line-height:27px;
+    text-align:center;
+    border-left:1px solid #ddd;
+    cursor:pointer;
+
+    background-color:#eee;
+    color:#666;
+}
+.user-selected-btn:hover {
+    color:#333;
+}
+
+.form-control {
+    border:0px;
+    height:100%;
+
+}
+.input-query {
+    position: absolute;
+    right: 86px;
+    top: 2px;
+    color: #ccc;
+    font-size: 16px;
+    cursor: pointer;
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/SelectForm.js

@@ -0,0 +1,247 @@
+/*
+ * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：陈彬彬
+ * 日 期：2017.04.18
+ * 描 述：成员添加
+ */
+var objectId = request('objectId');
+//var category = request('category');
+
+var companyId = request('companyId');
+var departmentId = request('departmentId');
+
+var acceptClick;
+var bootstrap = function ($, learun) {
+    "use strict";
+
+
+    var userlist = {};
+    var userlistselected = [];
+    var userlistselectedobj = {};
+
+    // 渲染用户列表
+    function renderUserlist(list) {
+        var $warp = $('<div></div>');
+        for (var i = 0, l = list.length; i < l; i++) {
+            var item = list[i];
+            var active = "";
+            var imgName = "UserCard02.png";
+            if (item.F_Gender == 0) {
+                imgName = "UserCard01.png";
+            }
+            if (userlistselected.indexOf(item.F_UserId) != -1) {
+                active = "active";
+            }
+            var _cardbox = "";
+            _cardbox += '<div class="card-box ' + active + '" data-value="' + item.F_UserId + '" >';
+            _cardbox += '    <div class="card-box-img">';
+            _cardbox += '        <img src="' + top.$.rootUrl + '/Content/images/' + imgName + '" />';
+            _cardbox += '    </div>';
+            _cardbox += '    <div class="card-box-content">';
+            _cardbox += '        <p>账户：' + item.F_Account + '</p>';
+            _cardbox += '        <p>姓名：' + item.F_RealName + '</p>';
+            _cardbox += '        <p>部门：<span data-id="' + item.F_DepartmentId + '"></span></p>';
+            _cardbox += '    </div>';
+            _cardbox += '</div>';
+            var $cardbox = $(_cardbox);
+            $cardbox[0].userinfo = item;
+            $warp.append($cardbox);
+            learun.clientdata.getAsync('department', {
+                key: item.F_DepartmentId,
+                callback: function (_data, op) {
+                    $warp.find('[data-id="' + op.key + '"]').text(_data.name);
+                }
+            });
+        }
+        $warp.find('.card-box').on('click', function () {
+            var $this = $(this);
+            var userid = $this.attr('data-value');
+            if ($this.hasClass('active')) {
+                $this.removeClass('active');
+                removeUser(userid);
+                userlistselected.splice(userlistselected.indexOf(userid), 1);
+
+            }
+            else {
+                $this.addClass('active');
+                userlistselectedobj[userid] = $this[0].userinfo;
+                userlistselected.push(userid);
+                addUser($this[0].userinfo);
+            }
+        });
+
+        $('#user_list').html($warp);
+    };
+
+    function addUser(useritem) {
+        var $warp = $('#selected_user_list');
+        var _html = '<div class="user-selected-box" data-value="' + useritem.F_UserId + '" >';
+        _html += '<p><span data-id="' + useritem.F_CompanyId + '"></span></p>';
+        _html += '<p><span data-id="' + useritem.F_DepartmentId + '"></span>【' + useritem.F_RealName + '】</p>';
+        _html += '<span class="user-reomve" title="移除选中人员"></span>';
+        _html += '</div>';
+        $warp.append(_html);
+        learun.clientdata.getAsync('department', {
+            key: useritem.F_DepartmentId,
+            callback: function (_data, op) {
+                $warp.find('[data-id="' + op.key + '"]').text(_data.name);
+            }
+        });
+        learun.clientdata.getAsync('company', {
+            key: useritem.F_CompanyId,
+            callback: function (_data, op) {
+                $warp.find('[data-id="' + op.key + '"]').text(_data.name);
+            }
+        });
+    };
+    function removeUser(userid) {
+        var $warp = $('#selected_user_list');
+        $warp.find('[data-value="' + userid + '"]').remove();
+    };
+
+    var page = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            // 部门
+            $('#department_tree').lrtree({
+                nodeClick: function (item) {
+                    departmentId = item.id;
+                    if (!!userlist[item.id]) {
+                        renderUserlist(userlist[item.id]);
+                    }
+                    else {
+                        learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/User/GetList', { companyId: companyId, departmentId: departmentId }, function (data) {
+                            userlist[item.id] = data || [];
+                            renderUserlist(userlist[item.id]);
+                        });
+                    }
+                }
+            });
+            // 公司
+            $('#company_select').lrCompanySelect({ isLocal: true }).bind('change', function () {
+                companyId = $(this).lrselectGet();
+                $('#department_tree').lrtreeSet('refresh', {
+                    url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                    // 访问数据接口参数
+                    param: { companyId: companyId },
+                });
+            });
+            // 已选人员按钮
+            $('#user_selected_btn').on('click', function () {
+                $('#form_warp_right').animate({ right: '0px' }, 300);
+            });
+            $('#user_selected_btn_close').on('click', function () {
+                $('#form_warp_right').animate({ right: '-180px' }, 300);
+            });
+            // 搜索
+            $("#txt_keyword").keydown(function (event) {
+                if (event.keyCode == 13) {
+                    var keyword = $(this).val();
+                    if (keyword != "") {
+                        learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/User/GetList', { companyId: companyId, keyword: keyword }, function (data) {
+                            renderUserlist(data || []);
+                        });
+                    }
+                    else {
+                        var data = userlist[departmentId] || [];
+                        renderUserlist(data);
+                    }
+                }
+            });
+            // 搜索
+            $(".input-query").click(function () {
+
+                var keyword = $("#txt_keyword").val();
+                if (keyword != "") {
+                    learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/User/GetList', { companyId: companyId, keyword: keyword }, function (data) {
+                        renderUserlist(data || []);
+                    });
+                }
+                else {
+                    var data = userlist[departmentId] || [];
+                    renderUserlist(data);
+                }
+            })
+            // 选中人员按钮点击事件
+            $('#selected_user_list').on('click', function (e) {
+                console.log(11);
+                var et = e.target || e.srcElement;
+                var $et = $(et);
+                if ($et.hasClass('user-reomve')) {
+                    var userid = $et.parent().attr('data-value');
+                    removeUser(userid);
+                    userlistselected.splice(userlistselected.indexOf(userid), 1);
+                    $('#user_list').find('[data-value="' + userid + '"]').removeClass('active');
+                }
+            });
+
+            // 滚动条
+            $('#user_list_warp').lrscroll();
+            $('#selected_user_list_warp').lrscroll();
+        },
+        initData: function () {
+            if (!!companyId) {
+                $('#company_select').lrselectSet(companyId);
+            }
+            if (!!departmentId) {
+                $('#department_tree').lrtreeSet('setValue', departmentId);
+            }
+
+            $.lrSetForm(top.$.rootUrl + '/LR_AuthorizeModule/UserRelation/GetUserIdList?objectId=' + objectId, function (data) {
+                if (data.userIds == "") {
+                    return false;
+                }
+                var $warp = $('#selected_user_list');
+                $.each(data.userInfoList, function (id, item) {
+                    if (item) {
+                        userlistselectedobj[item.F_UserId] = item;
+                    }
+                });
+                var userList = data.userIds.split(',');
+                for (var i = 0, l = userList.length; i < l; i++) {
+                    var userId = userList[i];
+                    var item = userlistselectedobj[userId];
+                    if (!!item) {
+                        if (userlistselected.indexOf(userId) == -1) {
+                            userlistselected.push(userId);
+                        }
+
+                        var _html = '<div class="user-selected-box" data-value="' + item.F_UserId + '" >';
+                        _html += '<p><span data-id="' + item.F_CompanyId + '"></span></p>';
+                        _html += '<p><span data-id="' + item.F_DepartmentId + '"></span>【' + item.F_RealName + '】</p>';
+                        _html += '<span class="user-reomve" title="移除选中人员"></span>';
+                        _html += '</div>';
+                        $warp.append($(_html));
+                        learun.clientdata.getAsync('department', {
+                            key: item.F_DepartmentId,
+                            callback: function (_data, op) {
+                                $warp.find('[data-id="' + op.key + '"]').text(_data.name);
+                            }
+                        });
+                        learun.clientdata.getAsync('company', {
+                            key: item.F_CompanyId,
+                            callback: function (_data, op) {
+                                $warp.find('[data-id="' + op.key + '"]').text(_data.name);
+                            }
+                        });
+                        $('#user_list').find('[data-value="' + item.F_UserId + '"]').addClass('active');
+                    }
+                }
+            });
+        }
+    };
+    // 保存数据
+    acceptClick = function () {
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Dispatch/SetRead', {
+            objectId: objectId,
+            //category: category,
+            userIds: String(userlistselected)
+        }, function (res) { });
+        return true;
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml

@@ -23,7 +23,7 @@
 
     <div class="header">
         <div class="fromSec">
-            <a href="#">数字化智慧校园</a> <span class="headerLine">|</span> <span>教职工信息注册</span>
+            <a href="/Home/Index">数字化智慧校园</a> <span class="headerLine">|</span> <span>教职工信息注册</span>
         </div>
     </div>
     <div class="warpper" id="app">
@@ -36,7 +36,7 @@
                     <div class="chickForm_sec1">
                         <div class="chickInput">
                                 <span class="chickInputLable"><span>*</span> 职工编号</span>
-                                <input type="text" id="EmpNo" name="EmpNo" lay-verify="required" placeholder="请输入职工编号" class="layui-input">
+                                <input value="@ViewBag.EmpNo" type="text" id="EmpNo" name="EmpNo" lay-verify="required" placeholder="请输入职工编号" class="layui-input">
                             </div>
 
                         <div class="chickInput">
@@ -262,7 +262,7 @@
                         var companys = $.parseJSON(msg).data.data;
                         var str = '<option value="">请选择</option>';
                         $.each(companys, function (i, item) {
-                            str += '<option value="' + item.f_departmentid + '">' + item.f_fullname + '</option>'
+                            str += '<option value="' + item.id + '">' + item.name + '</option>'
                         })
                         $("#F_DepartmentId").html(str);
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LoginUserBind/BindAccountIndex.js

@@ -39,6 +39,24 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/LoginUserBind/GetPageList',
                 headData: [
                     { label: "绑定账号", name: "BindUserAccount", width: 150, align: "left" },
+                    { label: "名称", name: "F_RealName", width: 150, align: "left" },
+                    {
+                        label: '角色', name: 'F_UserId', width: 250, align: 'left',
+                        formatterAsync: function (callback, value, row) {
+                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetRoleList?objectId=' + value, function (res) {
+                                if (res.code == learun.httpCode.success) {
+                                    var str = "";
+                                    for (var i = 0; i < res.data.roleInfoList.length; i++) {
+                                        str += res.data.roleInfoList[i].F_FullName;
+                                        if (i != res.data.roleInfoList.length - 1) {
+                                            str += ',';
+                                        }
+                                    }
+                                    callback(str);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'Id',
                 isPage: true,

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

@@ -88,7 +88,7 @@
         <input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">开户银行位置</div>
+        <div class="lr-form-item-title">开户网点</div>
         <input id="BankLocation" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">

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

@@ -354,7 +354,7 @@ var bootstrap = function ($, learun) {
                     },
                     { label: '开户银行', name: 'DepositBank', width: 100, align: "left" },
                     { label: '银行卡账号', name: 'BankCard', width: 150, align: "left" },
-                    { label: '开户银行位置', name: 'BankLocation', width: 200, align: "left" },
+                    { label: '开户网点', name: 'BankLocation', width: 200, align: "left" },
                 ],
                 mainId: 'StuId',
                 isPage: true,

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

@@ -138,7 +138,7 @@
         <input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" /> 
     </div> 
     <div class="col-xs-6 lr-form-item"  data-table="StuInfoFresh" > 
-        <div class="lr-form-item-title">开户银行位置</div> 
+        <div class="lr-form-item-title">开户网点</div> 
         <input id="BankLocation" type="text" class="form-control"  /> 
     </div> 
 

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

@@ -323,7 +323,7 @@ var bootstrap = function ($, learun) {
                     { label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" },
                     { label: '开户银行', name: 'DepositBank', width: 100, align: "left" },
                     { label: '银行卡账号', name: 'BankCard', width: 150, align: "left" },
-                    { label: '开户银行位置', name: 'BankLocation', width: 200, align: "left" },
+                    { label: '开户网点', name: 'BankLocation', width: 200, align: "left" },
                 ],
                 mainId: 'ID',
                 isPage: true,

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

@@ -0,0 +1,47 @@
+@{
+    ViewBag.Title = "学生学期注册";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">主键<font face="宋体">*</font></div>
+        <input id="StuId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">系<font face="宋体">*</font></div>
+        <input id="DeptNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <input id="MajorNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <input id="ClassNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <input id="AcademicYearNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <input id="Semester" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">注册状态<font face="宋体">*</font></div>
+        <input id="Status" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">注册时间<font face="宋体">*</font></div>
+        <input id="Time" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoSemster/Form.js")

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

@@ -0,0 +1,38 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-09 11:43
+ * 描  述：学生学期注册
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoSemster/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "学生学期注册";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout" id="lr_layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_zhuce" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;注册</a>
+                        <a id="lr_cancelZhuce" 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>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoSemster/Index.js")

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

@@ -0,0 +1,97 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-09 11:43
+ * 描  述：学生学期注册
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //注册
+            $('#lr_zhuce').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('Status');
+                    if (CheckStatus == 1) {
+                        learun.alert.warning("当前项目已注册！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认注册该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoSemster/DoZhuce', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //取消注册
+            $('#lr_cancelZhuce').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('Status');
+                    if (CheckStatus != 1) {
+                        learun.alert.warning("当前项目未注册，无法取消！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认取消注册该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoSemster/DoZhuce', { keyValue: keyValue, status: "0" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoSemster/GetPageList',
+                headData: [
+                    { label: '学号', name: 'StuNo', width: 100, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    { label: '系', name: 'DeptNo', width: 100, align: "left" },
+                    { label: '专业', name: 'MajorNo', width: 100, align: "left" },
+                    { label: '班级', name: 'ClassNo', width: 100, align: "left" },
+                    { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
+                    { label: '学期', name: 'Semester', width: 100, align: "left" },
+                    {
+                        label: '注册状态', name: 'Status', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已注册</span>" : "<span class=\"label label-danger\">未注册</span>";
+                        }
+                    },
+                    { label: '注册时间', name: 'Time', width: 100, align: "left" },
+                ],
+                mainId: 'StuId',
+                isPage: true,
+                sidx: 'Time desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -0,0 +1,23 @@
+@{
+    ViewBag.Title = "学生奖学金管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="StuScholarshipManage" >
+        <div class="lr-form-item-title">奖学金类型<font face="宋体">*</font></div>
+        <div id="ScholarshipType" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuScholarshipManage" >
+        <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+        <div id="StuId" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuScholarshipManage" >
+        <div class="lr-form-item-title">获得时间</div>
+        <input id="Time" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Time').trigger('change'); } })"   />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuScholarshipManage" >
+        <div class="lr-form-item-title">描述</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScholarshipManage/Form.js")

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

@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-28 17:00
+ * 描  述：学生奖学金管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#ScholarshipType').lrDataItemSelect({ code: 'ScholarshipType' });
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuScholarshipManage/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuScholarshipManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,42 @@
+@{
+                /**/
+
+                ViewBag.Title = "学生奖学金管理";
+                Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">奖学金类型</div>
+                                    <div id="ScholarshipType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学生</div>
+                                    <div id="StuId"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScholarshipManage/Index.js")

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

@@ -0,0 +1,106 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-28 17:00
+ * 描  述：学生奖学金管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#ScholarshipType').lrDataItemSelect({ code: 'ScholarshipType' });
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuScholarshipManage/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuScholarshipManage/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuScholarshipManage/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScholarshipManage/GetPageList',
+                headData: [
+                    { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "学生学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "班级", name: "ClassName", width: 100, align: "left" },
+                    {
+                        label: "奖学金类型", name: "ScholarshipType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ScholarshipType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "获得时间", name: "Time", width: 130, align: "left" },
+                    { label: "描述", name: "Remark", width: 100, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSubsideManage/CheckForm.cshtml

@@ -0,0 +1,35 @@
+@{
+    ViewBag.Title = "助学金管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">助学金类型<font face="宋体">*</font></div>
+        <div id="SubsideType" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+        <div id="StuId" isvalid="yes" checkexpession="NotNull"  readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">申请材料</div>
+        <div id="ApplyFile"  readonly="readonly" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">申请时间</div>
+        <input id="ApplyTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" readonly="readonly" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">审核状态<font face="宋体">*</font></div>
+        <div id="CheckStatus" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">不通过原因</div>
+        <textarea id="CheckReason" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSubsideManage/CheckForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSubsideManage/CheckForm.js

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-28 17:40
+ * 描  述：助学金管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#SubsideType').lrDataItemSelect({ code: 'SubsideType' });
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' });
+            $('#ApplyFile').lrUploader();
+            $('#CheckStatus').lrDataItemSelect({ code: 'LeaveCheck' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/SaveCheckForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSubsideManage/CheckIndex.cshtml

@@ -0,0 +1,40 @@
+@{
+    /**/
+
+    ViewBag.Title = "助学金管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">助学金类型</div>
+                                    <div id="SubsideType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学生</div>
+                                    <div id="StuId"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_check" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSubsideManage/CheckIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSubsideManage/CheckIndex.js

@@ -0,0 +1,94 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-28 17:40
+ * 描  述：助学金管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#SubsideType').lrDataItemSelect({ code: 'SubsideType' });
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //   审核
+            $('#lr_check').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'checkform',
+                        title: '审核',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/CheckForm?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/GetPageList',
+                headData: [
+                    { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "学生学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "班级", name: "ClassName", width: 100, align: "left" },
+                    {
+                        label: "助学金类型", name: "SubsideType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'SubsideType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "申请时间", name: "ApplyTime", width: 130, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    {
+                        label: "审核状态", name: "CheckStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'LeaveCheck',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
+                    { label: "不通过原因", name: "CheckReason", width: 100, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "助学金管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">助学金类型<font face="宋体">*</font></div>
+        <div id="SubsideType" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+        <div id="StuId" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">申请材料</div>
+        <div id="ApplyFile"  ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">申请时间</div>
+        <input id="ApplyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ApplyTime').trigger('change'); } })"   />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuSubsideManage" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSubsideManage/Form.js")

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

@@ -0,0 +1,53 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-28 17:40
+ * 描  述：助学金管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#SubsideType').lrDataItemSelect({ code: 'SubsideType' });
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuid',text: 'stuname' });
+            $('#ApplyFile').lrUploader();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,42 @@
+@{
+                /**/
+
+                ViewBag.Title = "助学金管理";
+                Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">助学金类型</div>
+                                    <div id="SubsideType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学生</div>
+                                    <div id="StuId"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSubsideManage/Index.js")

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

@@ -0,0 +1,130 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-28 17:40
+ * 描  述：助学金管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#SubsideType').lrDataItemSelect({ code: 'SubsideType' });
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == 1 || CheckStatus == 2) {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == 1 || CheckStatus == 2) {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuSubsideManage/GetPageList',
+                headData: [
+                    { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "学生学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "班级", name: "ClassName", width: 100, align: "left" },
+                    {
+                        label: "助学金类型", name: "SubsideType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'SubsideType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "申请时间", name: "ApplyTime", width: 130, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    {
+                        label: "审核状态", name: "CheckStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'LeaveCheck',
+                                callback: function (_data) {
+                                    _data.text != null && _data.text != undefined ? callback(_data.text) : callback("待审核");
+                                }
+                            });
+                        }
+                    },
+                    { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
+                    { label: "不通过原因", name: "CheckReason", width: 100, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -3,9 +3,17 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="TeachSwitch" >
-        <div class="lr-form-item-title">功能开启</div>
-        <div id="status"></div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachSwitch">
+        <div class="lr-form-item-title">开关名称<font face="宋体">*</font></div>
+        <input id="type" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachSwitch">
+        <div class="lr-form-item-title">功能开启<font face="宋体">*</font></div>
+        <div id="status" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachSwitch">
+        <div class="lr-form-item-title">链接地址<font face="宋体">*</font></div>
+        <input id="url" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachSwitch/Form.js")

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

@@ -80,6 +80,8 @@ var bootstrap = function ($, learun) {
                                 return '网上办事大厅开关';
                             } else if (val == 'wxloginforpc') {
                                 return '微信快捷登录PC端';
+                            } else {
+                                return val;
                             }
 
                         }
@@ -96,6 +98,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "链接地址", name: "url", width: 200, align: "left" },
                 ],
                 mainId: 'ID',
                 isPage: true

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

@@ -33,15 +33,13 @@
                 </div>
                 <div class="entrTxt">
                     (签字)
-                    <img id="signImg" hidden="hidden">)
+                    <img id="signImg" hidden="hidden">
                     <img id="stampImg" hidden="hidden">
                 </div>
                 <div class="entrTime">
-
                     @ViewBag.OperationYear 年<span></span>@ViewBag.OperationMonth 月<span></span>@ViewBag.OperationDay 日
                 </div>
 
-
             </div>
         </div>
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.cshtml

@@ -199,6 +199,7 @@
                         <a id="lr_node_auditor" class="btn btn-warning"><i class="fa fa-user"></i>&nbsp;添加节点执行人</a>
                         <a id="lr_form_auditor" class="btn btn-success"><i class="fa fa-user"></i>&nbsp;添加表字段</a>
                         <a id="lr_form_schoolmaster" class="btn btn-success"><i class="fa fa-user"></i>&nbsp;添加分管校长</a>
+                        <a id="lr_form_deptmaster" class="btn btn-warning"><i class="fa fa-user"></i>&nbsp;添加部门负责人</a>
                         <a id="lr_delete_auditor" class="btn btn-danger"><i class="fa fa-trash-o"></i>&nbsp;移除</a>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.js

@@ -185,6 +185,9 @@ var bootstrap = function ($, learun) {
                                 case '7':
                                     return '分管校长';
                                     break;
+                                case '8':
+                                    return '部门负责人';
+                                    break;
                             }
                         }
                     },
@@ -350,6 +353,19 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
+            //添加部门负责人
+            $('#lr_form_deptmaster').on('click', function () {
+                learun.layerConfirm('是否确认增加部门负责人？', function (res) {
+                    if (res) {
+                        var data = { auditorId: 'bmfzrid', type: '8', auditorName: '部门负责人' };
+                        if (!isRepeat(data.auditorId)) {
+                            data.id = learun.newGuid();
+                            auditors.push(data);
+                            $('#auditor_girdtable').jfGridSet('refreshdata', auditors);
+                        }
+                    }
+                });
+            });
 
             /*表单添加*/
             $('#workform_girdtable').jfGrid({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/ResourceFileController.cs

@@ -10,6 +10,7 @@ using System.Linq;
 using System.Threading;
 using System.Web;
 using System.Web.Mvc;
+using Quanjiang.DigitalSchool.AsposeHelper;
 
 namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
 {
@@ -463,7 +464,9 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
                 if (!DirFileHelper.IsExistFile(filepath))
                 {
-                    filePreviewIBLL.GetExcelData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
+                    //filePreviewIBLL.GetExcelData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
+                    //liang 2021-6-25 改aspose预览
+                    AsposeCore.GetExcelData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
                 }
             }
             if (data.F_FileType == "docx" || data.F_FileType == "doc")
@@ -471,7 +474,9 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
                 if (!DirFileHelper.IsExistFile(filepath))
                 {
-                    filePreviewIBLL.GetWordData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
+                    //filePreviewIBLL.GetWordData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
+                    //liang 2021-6-25 改aspose预览
+                    AsposeCore.GetWordData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
                 }
             }
             if (data.F_FileType == "ppt" || data.F_FileType == "pptx")
@@ -479,7 +484,9 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
                 if (!DirFileHelper.IsExistFile(filepath))
                 {
-                    filePreviewIBLL.GetPptData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
+                    //filePreviewIBLL.GetPptData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
+                    //liang 2021-6-25 改aspose预览
+                    AsposeCore.GetWordData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
                 }
             }
             //FileDownHelper.DownLoadold(filepath, filename);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Schedule/Form.cshtml

@@ -6,7 +6,7 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-6 lr-form-item" data-table="LR_OA_Schedule">
         <div class="lr-form-item-title">开始日期<font face="宋体">*</font></div>
-        <input id="F_StartDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" isvalid="yes" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy/MM/dd")" />
+        <input id="F_StartDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd' })" isvalid="yes" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy-MM-dd")" />
     </div>
     <div class="col-xs-6 lr-form-item" style="padding-left:60px;" data-table="LR_OA_Schedule">
         <div class="lr-form-item-title" style="width: 60px;">时间</div>
@@ -65,7 +65,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LR_OA_Schedule">
         <div class="lr-form-item-title">结束日期<font face="宋体">*</font></div>
-        <input id="F_EndDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" isvalid="yes" checkexpession="NotNull" />
+        <input id="F_EndDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd' })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" style="padding-left:60px;" data-table="LR_OA_Schedule">
         <div class="lr-form-item-title" style="width: 60px;">时间</div>
@@ -130,7 +130,7 @@
         <div class="lr-form-item-title">日程内容<font face="宋体">*</font></div>
         <textarea id="F_ScheduleContent" class="form-control" style="height:80px;" placeholder="记录你将要做的一件事..."  isvalid="yes" checkexpession="NotNull" ></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="LR_OA_Schedule">
+    @*<div class="col-xs-12 lr-form-item" data-table="LR_OA_Schedule">
         <div class="checkbox">
             <label>
                 <input id="F_IsMailAlert" type="checkbox" checked="checked">
@@ -145,7 +145,7 @@
                 手机提醒
             </label>
         </div>
-    </div>
+    </div>*@
 </div>
 
 @Html.AppendJsFile("/Areas/LR_OAModule/Views/Schedule/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Schedule/Form.js

@@ -48,6 +48,12 @@ var bootstrap = function ($, learun) {
             return false;
         }
         var postData = $('#form').lrGetFormData("");
+
+        var stime = $('#F_StartTime').find('.lr-select-placeholder').html();
+        var etime = $('#F_EndTime').find('.lr-select-placeholder').html();
+        postData.F_StartDate += (" " + stime);
+        postData.F_EndDate += (" " + etime);
+
         $.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Schedule/SaveForm?keyValue=' + keyValue, postData, function (res) {
             learun.frameTab.currentIframe().location.reload();
         });

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

@@ -1,6 +1,7 @@
 using Learun.Application.Base.SystemModule;
 using Learun.Application.OA.File.FilePreview;
 using Learun.Util;
+using Quanjiang.DigitalSchool.AsposeHelper;
 using System.Web;
 using System.Web.Mvc;
 
@@ -195,7 +196,9 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
                 if (!DirFileHelper.IsExistFile(filepath))
                 {
-                    filePreviewIBLL.GetExcelData(data.F_FilePath);
+                    //filePreviewIBLL.GetExcelData(data.F_FilePath);
+                    //liang 2021-6-25 改aspose预览
+                    AsposeCore.GetExcelData(DirFileHelper.GetAbsolutePath(data.F_FilePath));
                 }
             }
             if (data.F_FileType == "docx" || data.F_FileType == "doc")
@@ -203,7 +206,9 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
                 if (!DirFileHelper.IsExistFile(filepath))
                 {
-                    filePreviewIBLL.GetWordData(data.F_FilePath);
+                    //filePreviewIBLL.GetWordData(data.F_FilePath);
+                    //liang 2021-6-25 改aspose预览
+                    AsposeCore.GetWordData(data.F_FilePath);
                 }
             }
             if (data.F_FileType == "ppt" || data.F_FileType == "pptx")
@@ -211,7 +216,9 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
                 if (!DirFileHelper.IsExistFile(filepath))
                 {
-                    filePreviewIBLL.GetPptData(data.F_FilePath);
+                    //filePreviewIBLL.GetPptData(data.F_FilePath);
+                    //liang 2021-6-25 改aspose预览
+                    AsposeCore.GetWordData(data.F_FilePath);
                 }
             }
             Response.ClearContent();

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

@@ -3,6 +3,7 @@ using System.Data;
 using Learun.Application.TwoDevelopment.PersonnelManagement;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System;
 
 namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
 {
@@ -37,6 +38,24 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 表单页-查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面-审核
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult CheckIndex()
+        {
+            return View();
+        }
         #endregion
 
         #region  获取数据
@@ -103,7 +122,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             WorkStudyPositionApplyEntity entity = strEntity.ToObject<WorkStudyPositionApplyEntity>();
-            entity.CheckStatus = false;
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = LoginUserInfo.Get().userId;
             workStudyPositionApplyIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
@@ -115,7 +135,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
-        public ActionResult DoCheck(string keyValue, bool checkStatus)
+        public ActionResult DoCheck(string keyValue, string checkStatus)
         {
             var entity = workStudyPositionApplyIBLL.GetWorkStudyPositionApplyEntity(keyValue);
             if (entity == null)
@@ -123,6 +143,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
                 return Fail("数据不存在！");
             }
             entity.CheckStatus = checkStatus;
+            entity.CheckTime = DateTime.Now;
+            entity.CheckUserId = LoginUserInfo.Get().userId;
             workStudyPositionApplyIBLL.SaveEntity(keyValue, entity);
             return Success("操作成功！");
         }

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

@@ -3,6 +3,7 @@ using System.Data;
 using Learun.Application.TwoDevelopment.PersonnelManagement;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System;
 
 namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
 {
@@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +36,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -61,6 +62,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = workStudyPositionIBLL.GetList("{\"Status\":\"1\"}");
+            return Success(data);
+        }
         /// <summary>
         /// 获取表单数据
         /// <summary>
@@ -69,8 +83,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var WorkStudyPositionData = workStudyPositionIBLL.GetWorkStudyPositionEntity( keyValue );
-            var jsonData = new {
+            var WorkStudyPositionData = workStudyPositionIBLL.GetWorkStudyPositionEntity(keyValue);
+            var jsonData = new
+            {
                 WorkStudyPosition = WorkStudyPositionData,
             };
             return Success(jsonData);
@@ -102,9 +117,24 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             WorkStudyPositionEntity entity = strEntity.ToObject<WorkStudyPositionEntity>();
-            workStudyPositionIBLL.SaveEntity(keyValue,entity);
+            entity.CreateUserId = LoginUserInfo.Get().userId;
+            entity.CreateTime = DateTime.Now;
+            workStudyPositionIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 发布实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoPublish(string keyValue, string status)
+        {
+            workStudyPositionIBLL.DoPublish(keyValue, status);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

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

@@ -3,21 +3,37 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="WorkStudyPosition" >
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPosition">
         <div class="lr-form-item-title">岗位名称<font face="宋体">*</font></div>
         <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="WorkStudyPosition" >
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPosition">
+        <div class="lr-form-item-title">需要人数<font face="宋体">*</font></div>
+        <input id="NeedNum" type="text" class="form-control" isvalid="yes" checkexpession="PositiveInteger" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPosition">
+        <div class="lr-form-item-title">学期</div>
+        <input id="Semester" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPosition">
+        <div class="lr-form-item-title">薪资（元/月）<font face="宋体">*</font></div>
+        <input id="Salary" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPosition">
+        <div class="lr-form-item-title">是否面试<font face="宋体">*</font></div>
+        <div id="IsInterview" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPosition">
         <div class="lr-form-item-title">岗位内容<font face="宋体">*</font></div>
-        <textarea id="Content" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+        <textarea id="Content" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="WorkStudyPosition" >
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPosition">
         <div class="lr-form-item-title">岗位要求</div>
-        <textarea id="Require" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Require" class="form-control" style="height:100px;"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="WorkStudyPosition" >
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPosition">
         <div class="lr-form-item-title">备注</div>
-        <input id="Remark" type="text" class="form-control"  />
+        <input id="Remark" type="text" class="form-control" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/WorkStudyPosition/Form.js")

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

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

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

@@ -2,7 +2,7 @@
     ViewBag.Title = "岗位管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -23,10 +23,14 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_publish" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;发布</a>
+                        <a id="lr_cancelPublish" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;取消发布</a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

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

@@ -22,12 +22,12 @@ var bootstrap = function ($, learun) {
             });
             // 新增
             $('#lr_add').on('click', function () {
-               learun.layerForm({
+                learun.layerForm({
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/Form',
-                    width: 600,
-                    height: 400,
+                    width: 800,
+                    height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -37,12 +37,17 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == 1) {
+                        learun.alert.warning("当前项已发布！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 800,
+                        height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -53,9 +58,50 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
-                   learun.layerConfirm('是否确认删除该项！', function (res) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == 1) {
+                        learun.alert.warning("当前项已发布！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 发布
+            $('#lr_publish').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == 1) {
+                        learun.alert.warning("当前项已发布！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认发布该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/DoPublish', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 取消发布
+            $('#lr_cancelPublish').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 1) {
+                        learun.alert.warning("当前项未发布！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认取消发布该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/DoPublish', { keyValue: keyValue, status: "0" }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -68,19 +114,35 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/GetPageList',
                 headData: [
-                    { label: "岗位名称", name: "Name", width: 100, align: "left"},
-                    { label: "岗位内容", name: "Content", width: 100, align: "left"},
-                    { label: "岗位要求", name: "Require", width: 100, align: "left"},
-                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                    { label: '岗位名称', name: 'Name', width: 100, align: "left" },
+                    { label: '岗位内容', name: 'Content', width: 200, align: "left" },
+                    { label: '岗位要求', name: 'Require', width: 200, align: "left" },
+                    { label: '需要人数', name: 'NeedNum', width: 100, align: "left" },
+                    { label: '已录用人数', name: 'EmployNum', width: 100, align: "left" },
+                    { label: '学期', name: 'Semester', width: 100, align: "left" },
+                    { label: '薪资（元/月）', name: 'Salary', width: 100, align: "left" },
+                    {
+                        label: '是否面试', name: 'IsInterview', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '发布状态', name: 'Status', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == 1 ? "已发布" : "未发布";
+                        }
+                    },
                 ],
-                mainId:'Id',
-                isPage: true
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WorkStudyPositionApply/CheckIndex.cshtml

@@ -0,0 +1,40 @@
+@{
+    ViewBag.Title = "岗位申请";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学生</div>
+                                    <div id="StuId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">岗位名称</div>
+                                    <div id="PositionId"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查看</a>
+                        <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核通过</a>
+                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;审核不通过</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/WorkStudyPositionApply/CheckIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/WorkStudyPositionApply/CheckIndex.js

@@ -0,0 +1,108 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-03-04 16:01
+ * 描  述：岗位申请
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
+            $('#PositionId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/GetList',
+                value: "Id",
+                text: "Name"
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/FormView?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        btn: null
+                    });
+                }
+            });
+            //  审核
+            $('#lr_check').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/DoCheck', { keyValue: keyValue, checkStatus: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  去审核
+            $('#lr_uncheck').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/DoCheck', { keyValue: keyValue, checkStatus: "2" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/GetPageList',
+                headData: [
+                    { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "学生学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "所属专业", name: "MajorName", width: 100, align: "left" },
+                    { label: "所属班级", name: "ClassName", width: 100, align: "left" },
+                    { label: "岗位名称", name: "Name", width: 100, align: "left" },
+                    { label: "薪资(元/月)", name: "Salary", width: 100, align: "left" },
+                    { label: "学期", name: "Semester", width: 100, align: "left" },
+                    { label: "申请时间", name: "ApplyTime", width: 130, align: "left" },
+                    {
+                        label: "申请状态", name: "CheckStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == 1 ? "通过" : cellvalue == 2 ? "未通过" : "待审核";
+                        }
+                    },
+                    { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -3,17 +3,21 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="WorkStudyPositionApply" >
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPositionApply">
         <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
-        <div id="Student" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="StuId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="WorkStudyPositionApply" >
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPositionApply">
         <div class="lr-form-item-title">岗位名称<font face="宋体">*</font></div>
-        <input id="PositionName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div id="PositionId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="WorkStudyPositionApply" >
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPositionApply">
         <div class="lr-form-item-title">申请时间<font face="宋体">*</font></div>
-        <input id="ApplyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#ApplyTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+        <input id="ApplyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#ApplyTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPositionApply">
+        <div class="lr-form-item-title">申请说明</div>
+        <textarea id="ApplyReason" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/WorkStudyPositionApply/Form.js")

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

@@ -15,7 +15,13 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#Student').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuno',text: 'stuname' });
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
+            $('#PositionId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/GetList',
+                value: "Id",
+                text: "Name"
+            });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -0,0 +1,23 @@
+@{
+    ViewBag.Title = "岗位申请";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPositionApply">
+        <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+        <div id="StuId" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPositionApply">
+        <div class="lr-form-item-title">岗位名称<font face="宋体">*</font></div>
+        <div id="PositionId" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPositionApply">
+        <div class="lr-form-item-title">申请时间<font face="宋体">*</font></div>
+        <input id="ApplyTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="WorkStudyPositionApply">
+        <div class="lr-form-item-title">申请说明</div>
+        <textarea id="ApplyReason" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/WorkStudyPositionApply/FormView.js")

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

@@ -0,0 +1,57 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-03-04 16:01
+ * 描  述：岗位申请
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
+            $('#PositionId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/GetList',
+                value: "Id",
+                text: "Name"
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -12,11 +12,11 @@
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学生</div>
-                                    <div id="Student"></div>
+                                    <div id="StuId"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">岗位名称</div>
-                                    <input id="PositionName" type="text" class="form-control" />
+                                    <div id="PositionId"></div>
                                 </div>
                             </div>
                         </div>
@@ -31,10 +31,6 @@
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
-                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;去审核</a>
-                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

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

@@ -16,7 +16,13 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#Student').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' });
+            $('#StuId').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
+            $('#PositionId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPosition/GetList',
+                value: "Id",
+                text: "Name"
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -38,6 +44,11 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == 1 || CheckStatus == 2) {
+                        learun.alert.warning("当前项目已审核！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
@@ -52,84 +63,47 @@ var bootstrap = function ($, learun) {
             });
             // 删除
             $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
-
-            //  审核
-            $('#lr_check').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus == true) {
+                    if (CheckStatus == 1 || CheckStatus == 2) {
                         learun.alert.warning("当前项目已审核！");
                         return false;
                     }
-                    learun.layerConfirm('是否确认审核该项！', function (res) {
-                        if (res) {
-                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/DoCheck', { keyValue: keyValue, checkStatus: true }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
-            //  去审核
-            $('#lr_uncheck').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus != true) {
-                        learun.alert.warning("当前项目未审核！");
-                        return false;
-                    }
-                    learun.layerConfirm('是否确认审核该项！', function (res) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/DoCheck', { keyValue: keyValue, checkStatus: false }, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
                     });
                 }
             });
+            
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/WorkStudyPositionApply/GetPageList',
                 headData: [
-                    {
-                        label: "学生", name: "Student", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
-                                key: value,
-                                keyId: 'stuno',
-                                callback: function (_data) {
-                                    callback(_data['stuname']);
-                                }
-                            });
-                        }
-                    },
-                    { label: "岗位名称", name: "PositionName", width: 100, align: "left" },
+                    { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "学生学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "所属专业", name: "MajorName", width: 100, align: "left" },
+                    { label: "所属班级", name: "ClassName", width: 100, align: "left" },
+                    { label: "岗位名称", name: "Name", width: 100, align: "left" },
+                    { label: "薪资(元/月)", name: "Salary", width: 100, align: "left" },
+                    { label: "学期", name: "Semester", width: 100, align: "left" },
                     { label: "申请时间", name: "ApplyTime", width: 130, align: "left" },
                     {
-                        label: "审核状态", name: "CheckStatus", width: 100, align: "left",
+                        label: "申请状态", name: "CheckStatus", width: 100, align: "left",
                         formatter: function (cellvalue) {
-                            return cellvalue == true ? "已审核" : "未审核";
+                            return cellvalue == 1 ? "通过" : cellvalue == 2 ? "未通过" : "待审核";
                         }
                     },
                 ],
                 mainId: 'Id',
-                isPage: true
+                isPage: true,
+                sidx: 'CreateTime desc'
             });
             page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index2.css

@@ -1,6 +1,6 @@
-.inSec2TabBox {
+/*.inSec2TabBox {
     width: 33.333333%;
-}
+}*/
 .in2Sec3Row {
 	padding: 0 24px 30px;
 	overflow: hidden;

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index2.js

@@ -21,37 +21,58 @@ $(window).load(function() {
     $(".headModeList li").eq(1).addClass("active");
     $(".headModeList li").eq(2).removeClass("active");
     $(".headModeTxt").find('span').html($(".headModeList li").eq(1).find('a').html());
-
-	//右侧菜单显示隐藏
-	$('.index_sec2').on('click', '.inSecLeftCon', function() {
-		var ind = $(this).index();
-		var parents = $(this).parents('.index_sec2');
-		if(ind == 3){
-			parents.find('.inSec2TabBox').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con')
-		}else{
-			parents.find('.inSec2TabBox').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Llist li').removeClass('active').eq(ind).addClass('active').end().end().find('.inSec3WorkBox').css('display', 'none').eq(ind).fadeIn();
-		}
-		
-		parents.addClass('active')
-		$('.indexSec3Box').css('paddingRight', '445px')
-	}).on('click', '.aRight', function() {
-		var parents = $(this).parents('.index_sec2');
-		parents.removeClass('active');
-		$('.indexSec3Box').css('paddingRight', '0')
-	})
-	//右侧tab切换
-	$('.inSec2Tab').on('click', '.inSec2TabBox', function() {
-		var ind = $(this).index();
-		$(this).addClass('active').siblings().removeClass('active');
-		$('.indexSec2Box .inSec2Con').removeClass('active').eq(ind).addClass('active');
-	})
+    
+    //右侧菜单显示隐藏
+    $('.index_sec2').on('click', '.inSecLeftCon', function () {
+        var ind = $(this).index();
+        var parents = $(this).parents('.index_sec2');
+        if (ind == 3) {
+            parents.find('.inSec2TabBox').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con')
+        } else {
+            parents.find('.inSec2TabBox').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Llist li').removeClass('active').eq(ind).addClass('active').end().end().find('.inSec3WorkBox').css('display', 'none').eq(ind).fadeIn();
+        }
+
+        parents.addClass('active')
+        $('.indexSec3Box').css('paddingRight', '445px')
+    }).on('click', '.aRight', function () {
+        var parents = $(this).parents('.index_sec2');
+        parents.removeClass('active');
+        $('.indexSec3Box').css('paddingRight', '0')
+    })
+    //右侧tab切换
+    $('.inSec2Tab').on('click', '.inSec2TabBox', function () {
+        var ind = $(this).index();
+        $(this).addClass('active').siblings().removeClass('active');
+        $('.indexSec2Box .inSec2Con').removeClass('active').eq(ind).addClass('active');
+    })
 	//办公事项
 	$('.inSec3Con').on('click', '.workList li', function() {
 		if ($(this).hasClass('active')) return;
 		var ind = $(this).index();
 		$(this).addClass('active').siblings().removeClass('active').parents('.inSec3Con').find('.inSec3WorkBox').css(
 			'display', 'none').eq(ind).fadeIn();
-	})
+    })
+
+    //任务
+    $('.inSec2Con').on('click', '.inSec2Llist li', function () {
+        if ($(this).hasClass('active')) return;
+        var ind = $(this).index();
+        $(this).addClass('active').siblings().removeClass('active').parents('.inSec2Con').find('.inSec3WorkBox').css(
+            'display', 'none').eq(ind).fadeIn();
+    }).on('click', '.indexSec2Li i', function (e) {
+        //消息移除
+        //阻止默认浏览器动作(W3C)
+        if (e && e.preventDefault) {
+            e.preventDefault();
+        } else { //IE中阻止函数器默认动作的方式
+            window.e.returnValue = false;
+        }
+        e.stopPropagation();
+        var parents = $(this).parents('.indexSec2Li');
+        parents.animate({ opacity: 0.2, left: '80%' }, 300, function () {
+            parents.remove()
+        })
+    })
 
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js

@@ -6,7 +6,7 @@ $(window).load(function () {
     $(".headModeTxt").find('span').html($(".headModeList li").eq(2).find('a').html());
 
 	//学生到课率预警
-	var toClassNum = 20;
+    var toClassNum = $("#StuInfoOfDaoKe").html();
 	var toClassBl = $('.toClassBl')
 	if (toClassNum < 60) {
         toClassBl.addClass('green').height(toClassNum + '%')
@@ -235,7 +235,7 @@ function majorEchart() {
 // 学生逃课预警
 function skipEchart() {
 	// 基于准备好的dom，初始化echarts实例
-	var myChart8 = echarts.init(document.getElementById('skipClass'));
+    var myChart8 = echarts.init(document.getElementById('skipClass'));
 
 	option = {
 		tooltip: {
@@ -289,7 +289,7 @@ function skipEchart() {
 				}
 			},
 			data: [{
-				value: 5,
+                value: 0,
 				name: '',
 				label: {
 					textStyle: {

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

@@ -17,6 +17,7 @@ using Learun.Application.OA;
 using Learun.Application.TwoDevelopment.LR_Desktop;
 using Learun.Application.TwoDevelopment.Permission;
 using Learun.Application.WorkFlow;
+using Learun.Application.OA.Schedule;
 
 namespace Learun.Application.Web.Controllers
 {
@@ -58,6 +59,8 @@ namespace Learun.Application.Web.Controllers
         private Perm_FunctionIBLL perm_FunctionIBLL = new Perm_FunctionBLL();
         private ICache redisCache = CacheFactory.CaChe();
         private Sys_DefaultPwdConfigIBLL sys_DefaultPwdConfigIBLL = new Sys_DefaultPwdConfigBLL();
+        private ScheduleIBLL scheduleIBLL = new ScheduleBLL();
+        private MessageRindIBLL messageRindIBLL = new MessageRindBLL();
         #region  视图功能
 
         public ActionResult ChangePwd()
@@ -506,6 +509,38 @@ namespace Learun.Application.Web.Controllers
             ViewBag.ACIp = ConfigurationManager.AppSettings["ACIp"] ?? "";
             ViewBag.ACIp2 = ConfigurationManager.AppSettings["ACIp2"] ?? "";
 
+            #region 日程提醒
+
+            //判断今天是否有日程提醒
+            var scheduleList = scheduleIBLL.GetListByUserId(userinfo.userId).Where(x => x.F_StartDate <= DateTime.Now && x.F_EndDate >= DateTime.Now);
+            if (scheduleList.Any())
+            {
+                foreach (var item in scheduleList)
+                {
+                    //判断该日程今天是否已提醒过
+                    var st = Convert.ToDateTime(string.Format("{0} {1}", DateTime.Now.ToString("yyyy-MM-dd"), "00:00:00"));
+                    var et = Convert.ToDateTime(string.Format("{0} {1}", DateTime.Now.ToString("yyyy-MM-dd"), "23:59:59"));
+                    var mrlist = messageRindIBLL.GetList("{\"InstanceId\":\"" + item.F_ScheduleId + "\",\"StartTime\":\"" + st + "\",\"EndTime\":\"" + et + "\"}");
+                    if (!mrlist.Any())
+                    {
+                        MessageRemindEntity entity = new MessageRemindEntity();
+                        entity.ReceiptId = item.F_CreateUserId;
+                        entity.ReceiptName = item.F_CreateUserName;
+                        entity.SenderId = item.F_CreateUserId;
+                        entity.SenderName = item.F_CreateUserName;
+                        entity.TheTitle = "日程提醒";
+                        entity.TheContent = item.F_ScheduleContent;
+                        entity.InstanceId = item.F_ScheduleId;
+                        entity.ConnectionUrl = "/LR_OAModule/Schedule/Index?keyValue=";
+                        entity.SendTime = DateTime.Now;
+                        entity.ReadSigns = false;
+                        messageRindIBLL.SaveEntity("", entity);
+                    }
+                }
+            }
+            #endregion
+
+
             switch (learn_UItheme)
             {
                 case "1":

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

@@ -221,11 +221,14 @@ namespace Learun.Application.Web.Controllers
 
             var result = teachSwitchIBLL.FindFirst("js");
             ViewBag.TeachSwitch = result;
-            var result2 = teachSwitchIBLL.FindFirst("fx");
-            ViewBag.FeiXinSwitch = result2;
+            //飞信下载
+            var result2 = teachSwitchIBLL.GetFirst("fx");
+            ViewBag.FeiXinSwitch = result2.status == "1" ? true : false;
+            ViewBag.FeiXinUrl = result2.url;
             //网上办事大厅
-            var result3 = teachSwitchIBLL.FindFirst("ssosystem");
-            ViewBag.SSOSystemSwitch = result3;
+            var result3 = teachSwitchIBLL.GetFirst("ssosystem");
+            ViewBag.SSOSystemSwitch = result3.status == "1" ? true : false;
+            ViewBag.SSOSystemUrl = result3.url;
             //微信快捷登录
             var result4 = teachSwitchIBLL.FindFirst("wxloginforpc");
             ViewBag.WeixinLoginSwitch = result4;

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

@@ -57,6 +57,8 @@ namespace Learun.Application.Web.Controllers
         private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL();
         private StuConsumptionIBLL stuConsumptionIBLL = new StuConsumptionBLL();
         private SSO_Drag_CollectManageIBLL sSO_Drag_CollectManageIBLL = new SSO_Drag_CollectManageBLL();
+        private OpenLessonPlanIBLL openLessonPlanIBLL = new OpenLessonPlanBLL();
+        private StuAttendanceIBLL stuAttendanceIBLL = new StuAttendanceBLL();
 
         #region 统一身份认证2.0
         /// <summary>
@@ -1162,6 +1164,10 @@ namespace Learun.Application.Web.Controllers
                 }
             }
             ViewBag.SearchModule = searchmodulelist;
+            //数据看板
+            //累计登录次数
+            var logData = LogBLL.GetList("{\"F_OperateUserId\":\"" + userInfo.userId + "\",\"F_OperateTypeId\":\"1\"}");
+            ViewBag.LoginTotalNum = logData.Count();
             //校园总览
             //专业
             var majorData = cdMajorIBLL.GetAllList();
@@ -1499,6 +1505,10 @@ namespace Learun.Application.Web.Controllers
                 }
             }
             ViewBag.SearchModule = searchmodulelist;
+            //数据看板
+            //累计登录次数
+            var logData = LogBLL.GetList("{\"F_OperateUserId\":\"" + userInfo.userId + "\",\"F_OperateTypeId\":\"1\"}");
+            ViewBag.LoginTotalNum = logData.Count();
             //校园总览
             //专业
             var majorData = cdMajorIBLL.GetAllList();
@@ -1640,18 +1650,34 @@ namespace Learun.Application.Web.Controllers
             ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor);
             //流程
             var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
-            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
+            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList().OrderBy(x => x.F_Id);
+            var flowListOfCollect = sSO_Drag_CollectManageIBLL.GetList("{\"UserId\":\"" + userInfo.userId + "\",\"ModelCode\":\"three\"}").OrderBy(x => x.SchemeInfoId);
+            foreach (var item in flowList)
+            {
+                item.IsCollect = false;
+                if (flowListOfCollect.Where(x => x.SchemeInfoId == item.F_Id).Any())
+                {
+                    item.IsCollect = true;
+                }
+            }
             var allCount = 0;
+            var allCountOfCollect = 0;
             foreach (var flow in flowType)
             {
-                var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
+                var count = flowList.Count(a => a.F_Category == flow.F_ItemValue);
                 flow.FlowCount = count;
                 allCount += count;
+                var countOfCollect = flowListOfCollect.Count(x => x.F_Category == flow.F_ItemValue);
+                flow.FlowCountOfCollect = countOfCollect;
+                allCountOfCollect += countOfCollect;
 
             }
             ViewBag.AllCount = allCount;
             ViewBag.FlowType = flowType;
             ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
+            //流程-收藏
+            ViewBag.AllCountOfCollect = allCountOfCollect;
+            ViewBag.FlowListOfCollect = JsonConvert.SerializeObject(flowListOfCollect);
             //课程总览
             var lessonInfoData = lessonInfoIBLL.GetAllList();
             ViewBag.LessonTotalNum = lessonInfoData.Count();
@@ -1698,6 +1724,18 @@ namespace Learun.Application.Web.Controllers
                 name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName
             });
             ViewBag.StuScoreByMajorStr = JsonConvert.SerializeObject(stuScoreByMajor);
+            //学生到课率预警（考勤表中：是）
+            var stuSelectLessonListData = openLessonPlanIBLL.GetStuSelectLessonList("{\"AcademicYearNo\":\"" + Common.GetSemesterAndYear().AcademicYearShort + "\",\"Semester\":\"" + Common.GetSemesterAndYear().Semester + "\"}");
+            var stuAttendanceData = stuAttendanceIBLL.GetAllList().Where(x => x.AcademicYearNo == Common.GetSemesterAndYear().AcademicYearShort && x.Semester == Common.GetSemesterAndYear().Semester);
+            var stuDaoKeData = stuAttendanceData.Where(x => x.AttendOrNo == "是");
+            ViewBag.StuDaoKeTotalNum = 0;
+            if (stuSelectLessonListData.Any())
+            {
+                ViewBag.StuDaoKeTotalNum = (stuDaoKeData.Count() / stuSelectLessonListData.Count() * 100).ToDecimal(2);
+            }
+            //学生逃课预警（考勤表中：否-旷课）
+            var stuTaoKeData = stuAttendanceData.Where(x => x.AttendOrNo == "否" && x.Sort == "旷课");
+            ViewBag.StuTaoKeTotalNum = stuTaoKeData.Count();
             //常用服务
             List<ModuleEntity> modulelist = new List<ModuleEntity>();
             List<string> offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList();

Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs

@@ -6,6 +6,7 @@ using System.Web.Routing;
 using Hangfire;
 using Learun.Application.Extention.TaskScheduling;
 using Learun.Application.WorkFlow;
+using Quanjiang.DigitalSchool.AsposeHelper;
 
 namespace Learun.Application.Web
 {
@@ -37,6 +38,8 @@ namespace Learun.Application.Web
             //cache.RemoveAll(6);
             WfJobScheduler.Start();
             QuartzHelper.InitJob();
+            //执行aspose初始化
+            AsposeCore.AsposeCoreInit();
         }
 
         /// <summary>

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

@@ -332,6 +332,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuAttendanceController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGrantController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoBasicChangeController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoSemsterController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuScoreNotPassController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_ReceiveDocumentController.cs" />
     <Compile Include="Areas\EvaluationTeach\EvaluationTeachAreaRegistration.cs" />
@@ -812,6 +813,10 @@
     <Compile Include="Areas\CustomFunction\Controllers\SRProjectTypeController.cs" />
     <Compile Include="Areas\CustomFunction\Controllers\SRProjectPlanController.cs" />
     <Compile Include="Areas\CustomFunction\Controllers\SRProjectWorkController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\DispatchController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuScholarshipManageController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuSubsideManageController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\DispatchAuditController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -936,6 +941,15 @@
     <Content Include="Areas\EducationalAdministration\Views\CertificateResult\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\CertificateResult\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\ClassInfo\FormType.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\ReadIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\SelectForm.css" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\SelectForm.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\ReadForm.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\IndexXF.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\IndexXF.js" />
     <Content Include="Areas\EducationalAdministration\Views\EADateArrange\InitByConditionForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\EmpInfo\FormModify.js" />
     <Content Include="Areas\EducationalAdministration\Views\EmpInfo\FormEdit.js" />
@@ -1001,6 +1015,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\FormDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\SchoolUniform.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\IndexDC.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoSemster\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoSemster\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\CheckForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\CheckIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndexInTeacher.js" />
@@ -1018,6 +1034,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScore\GraduateScoreQueryAllIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndexTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuSubsideManage\CheckForm.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuSubsideManage\CheckIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Form.js" />
@@ -1194,6 +1212,7 @@
     <Content Include="Areas\LR_AuthorizeModule\Views\FilterTime\Form.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\UserRelation\LookForm.css" />
     <Content Include="Areas\LR_AuthorizeModule\Views\UserRelation\LookForm.js" />
+    <Content Include="Areas\LR_AuthorizeModule\Views\UserRelation\SelectForm.cshtml" />
     <Content Include="Areas\LR_AuthorizeModule\Views\UserRelation\SelectForm.css" />
     <Content Include="Areas\LR_AuthorizeModule\Views\UserRelation\SelectForm.js" />
     <Content Include="Areas\LR_CodeDemo\Views\GantProject\Form.js" />
@@ -1390,6 +1409,7 @@
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
     <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\LeagueMember\ModifyForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.js" />
@@ -1404,6 +1424,8 @@
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForStudent.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForTeacher.js" />
+    <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.js" />
+    <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\CheckIndex.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\AnswerIndex.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\AnswerQuery.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\Form.js" />
@@ -4176,7 +4198,6 @@
     <Content Include="Areas\LR_SystemModule\Views\DataSource\SelectForm.cshtml" />
     <Content Include="Views\Home\AdminDesktopTemp.cshtml" />
     <Content Include="Areas\LR_AuthorizeModule\Views\UserRelation\LookForm.cshtml" />
-    <Content Include="Areas\LR_AuthorizeModule\Views\UserRelation\SelectForm.cshtml" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.cshtml" />
     <Content Include="Areas\LR_CodeGeneratorModule\Views\TemplatePC\Index.cshtml" />
     <Content Include="Areas\LR_CodeGeneratorModule\Views\TemplateAPP\Index.cshtml" />
@@ -6403,6 +6424,14 @@
     <Content Include="Areas\CustomFunction\Views\SRProjectWork\Index.js" />
     <Content Include="Areas\CustomFunction\Views\SRProjectWork\Form.cshtml" />
     <Content Include="Areas\CustomFunction\Views\SRProjectWork\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScholarshipManage\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScholarshipManage\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScholarshipManage\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScholarshipManage\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuSubsideManage\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuSubsideManage\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuSubsideManage\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuSubsideManage\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />
@@ -6422,7 +6451,9 @@
     <Content Include="XmlConfig\database.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="XmlConfig\ioc.config" />
+    <Content Include="XmlConfig\ioc.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="XmlConfig\log4net.config" />
     <Content Include="XmlConfig\system.config">
       <SubType>Designer</SubType>
@@ -6558,6 +6589,10 @@
       <Project>{4D841EAD-3FD8-4FAC-BC67-C4CE6C0D1181}</Project>
       <Name>Quanjiang.DigitalScholl.WebLicense</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Quanjiang.DigitalSchool.Aspose\Quanjiang.DigitalSchool.Aspose.csproj">
+      <Project>{767d20c4-b983-4940-bf97-74d5479ca558}</Project>
+      <Name>Quanjiang.DigitalSchool.Aspose</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\EducationalAdministration\Views\web.config" />
@@ -7204,6 +7239,20 @@
     <Content Include="Areas\LR_OrganizationModule\Views\User\FamilyIndex.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\CustomFunction\Views\web.config" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\FormView.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\Print.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoSemster\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoSemster\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\LeagueMember\ModifyForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuSubsideManage\CheckForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuSubsideManage\CheckIndex.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\CheckIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\ReadForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\SelectForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Dispatch\ReadIndex.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\Form.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormClaim.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormView.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml

@@ -67,13 +67,13 @@
             }
             @if (ViewBag.FeixinSwitch)
             {
-                <a href="/feixin.exe" class="down">
+                <a href="@ViewBag.FeiXinUrl" class="down">
                     <img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
                 </a>
             }
             @if (ViewBag.SSOSystemSwitch)
             {
-                <a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
+                <a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
             }
             <img src="~/Content/images/logins/login2.png" />
             <!--登录框 正常登录-->

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive.cshtml

@@ -21,13 +21,13 @@
         <div class="loginCon">
             @if (ViewBag.FeixinSwitch)
             {
-                <a href="/feixin.exe" class="down">
+                <a href="@ViewBag.FeixinUrl" class="down">
                     <img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
                 </a>
             }
             @if (ViewBag.SSOSystemSwitch)
             {
-                <a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
+                <a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
             }
             @if (ViewBag.WeixinLoginSwitch)
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour.cshtml

@@ -74,11 +74,11 @@
                 <div style="text-align: right">
                     @if (ViewBag.SSOSystemSwitch)
                     {
-                        <a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
+                        <a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
                     }
                     @if (ViewBag.FeixinSwitch)
                     {
-                        <a href="/feixin.exe" class="down">
+                        <a href="@ViewBag.FeixinUrl" class="down">
                             <img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
                         </a>
                     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne.cshtml

@@ -21,13 +21,13 @@
     <div class="loginBox commonClear">
         @if (ViewBag.FeixinSwitch)
         {
-            <a href="/feixin.exe" class="down">
+            <a href="@ViewBag.FeixinUrl" class="down">
                 <img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
             </a>
         }
         @if (ViewBag.SSOSystemSwitch)
         {
-            <a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
+            <a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
         }
         <div class="loginL">
             <div class="loginLimg">

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSeven.cshtml

@@ -61,11 +61,11 @@
                                 <!-- <input type="button" class="btn btn-white btn-outline btn-lg btn-rounded progress-login" value="教师注册" style="cursor:pointer"> -->
                                 @if (ViewBag.SSOSystemSwitch)
                                 {
-                                    <a href="/SSOSystem/Index"><span class="bbh_bs">网上办大事大厅</span></a>
+                                    <a href="@ViewBag.SSOSystemUrl"><span class="bbh_bs">网上办大事大厅</span></a>
                                 }
                                 @if (ViewBag.FeixinSwitch)
                                 {
-                                    <a href="/feixin.exe"><span class="bbh_bs bbh_sdow"><img src="~/Content/images/Login/login8-5.png" />飞星下载</span></a>
+                                    <a href="@ViewBag.FeixinUrl"><span class="bbh_bs bbh_sdow"><img src="~/Content/images/Login/login8-5.png" />飞星下载</span></a>
                                 }
                             </div>
                             <div class="bbh">

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix.cshtml

@@ -71,11 +71,11 @@
                             }
                             @if (ViewBag.SSOSystemSwitch)
                             {
-                                <a href="/SSOSystem/Index"><img src="~/Content/images/Login/login8-4.png" alt="" /><span class="bbh_span2">网上办事大厅</span></a>
+                                <a href="@ViewBag.SSOSystemUrl"><img src="~/Content/images/Login/login8-4.png" alt="" /><span class="bbh_span2">网上办事大厅</span></a>
                             }
                             @if (ViewBag.FeixinSwitch)
                             {
-                                <a href="/feixin.exe"><img src="~/Content/images/Login/login8-5.png" alt="" /><span class="bbh_span2">飞星下载</span></a>
+                                <a href="@ViewBag.FeixinUrl"><img src="~/Content/images/Login/login8-5.png" alt="" /><span class="bbh_span2">飞星下载</span></a>
                             }
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree.cshtml

@@ -79,11 +79,11 @@
                     <div style="text-align: right;margin-top: 10px;">
                         @if (ViewBag.SSOSystemSwitch)
                         {
-                            <a href="/SSOSystem/Index" class="down">网上办事大厅</a>
+                            <a href="@ViewBag.SSOSystemUrl" class="down">网上办事大厅</a>
                         }
                         @if (ViewBag.FeixinSwitch)
                         {
-                            <a href="/feixin.exe" class="down">
+                            <a href="@ViewBag.FeixinUrl" class="down">
                                 <img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
                             </a>
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo.cshtml

@@ -73,11 +73,11 @@
                 <div style="text-align: right">
                     @if (ViewBag.SSOSystemSwitch)
                     {
-                        <a href="/SSOSystem/Index" class="down downsso">网上办事大厅</a>
+                        <a href="@ViewBag.SSOSystemUrl" class="down downsso">网上办事大厅</a>
                     }
                     @if (ViewBag.FeixinSwitch)
                     {
-                        <a href="/feixin.exe" class="down">
+                        <a href="@ViewBag.FeixinUrl" class="down">
                             <img src="~/Content/images/LoginPage/download.png" alt="" /> 飞星下载
                         </a>
                     }