Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

.gitignore

@@ -76,3 +76,5 @@ typings/
 unpackage
 Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
 /Learun.Framework.Ultimate V7/Learun.Application.Web/Resource/
+/Learun.Framework.Ultimate V7/Learun.Application.Mobile/platforms/android/assets/www
+/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www.7z

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Ass_InventoryItemList.js

@@ -201,7 +201,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Form/form.js

@@ -72,7 +72,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/Ass_InventoryList.js

@@ -82,7 +82,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

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

@@ -105,7 +105,7 @@
         //                learun.layer.loading(false);
         //            });
         //        }
-        //    }, 'Learun智慧校园提示', ['取消', '确定']);
+        //    }, '智慧校园提示', ['取消', '确定']);
         //},
         //rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

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

@@ -32,7 +32,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun敏捷框架提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑 
             $header.find('.lr-form-header-edit').on('tap', function () {

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

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

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

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

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

@@ -98,7 +98,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

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

@@ -103,7 +103,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

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

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun敏捷框架提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun敏捷框架提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

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

@@ -102,7 +102,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

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

@@ -70,7 +70,7 @@
             //                                } 
             //                            }); 
             //                        } 
-            //                    }, 'Learun敏捷框架提示', ['取消', '确定']); 
+            //                    }, '智慧校园提示', ['取消', '确定']); 
             //                } 
             //            } 
             //        ], 

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

@@ -130,7 +130,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

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

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

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

@@ -85,7 +85,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

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

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,24 @@
+<div class="lr-page lr-StuInfoFreshPayFee-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>
+                        <input id="StuNo" type="text">
+                    </div>
+                    <div class="lr-form-row">
+                        <label>学生姓名</label>
+                        <input id="StuName" type="text">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="lr-page-content" id="lr_StuInfoFreshPayFee_list"></div>
+    
+</div>

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

@@ -0,0 +1,135 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-26 14:43
+ * 描  述：新生缴费管理
+ */
+(function () {
+    var begin = '';
+    var end = '';
+    var multipleData = null;
+    var page = {
+        grid: null,
+        init: function ($page) {
+            begin = '';
+            end = '';
+            multipleData = null;
+            page.grid = $page.find('#lr_StuInfoFreshPayFee_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 || {};
+                    multipleData.EmpNo = learun.storage.get('userinfo').baseinfo.account;
+                    page.grid.reload();
+                }
+            });
+            //$multiple.find('#ClassNo').lrpickerex({
+            //    type: 'sourceData',
+            //    code: 'bjsj',
+            //    ivalue:'classno',
+            //    itext:'classname'            
+            //});
+        },
+        lclass: 'lr-list',
+        loadData: function (param, callback, $page) {// 列表加载后台数据
+            var empno = {
+                EmpNo: learun.storage.get('userinfo').baseinfo.account
+            };
+            var _postParam = {
+                pagination: {
+                    rows: param.rows,
+                    page: param.page,
+                    sidx: 'ClassNo,StuNo',
+                    sord: 'ASC'
+                },
+                queryJson: JSON.stringify(empno)
+            };
+            if (param.multipleData) {
+                _postParam.queryJson = JSON.stringify(multipleData);
+            }
+            if (param.begin && param.end) {
+                _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end });
+            }
+            learun.httpget(config.webapi + 'StuInfoFresh/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.StuNo }));
+            _$item.append($('<p class="lr-ellipsis"><span>姓名:</span></p>').dataFormatter({ value: _item.StuName }));
+            _$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.PayFeeStatus,
+                type: 'dataItem',
+                code: 'PayStatus'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>线上缴费时间:</span></p>').dataFormatter({
+                value: _item.PayFeeDate,
+                type: 'datetime',
+                dateformat: 'yyyy-MM-dd hh:mm:ss'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>贷款回执码:</span></p>').dataFormatter({ value: _item.StudentLoan }));
+            _$item.append($('<p class="lr-ellipsis"><span>助学贷款状态:</span></p>').dataFormatter({ value: _item.StudentLoanStatus == "1" ? "已审核" : "未审核" }));
+            _$item.append($('<p class="lr-ellipsis"><span>现场缴费状态:</span></p>').dataFormatter({
+                value: _item.OnsitePayFeeStatus,
+                type: 'dataItem',
+                code: 'OnsitePayStatus'
+            }));
+
+            return '';
+        },
+        rowClick: function (item, $item, $page) {// 列表行点击触发方法
+            learun.nav.go({ path: 'EducationalAdministration/StuInfoFresh/PayFee/form', title: '缴费详情', type: 'right', param: { keyValue: item.ID } });
+        },
+        //btnClick: function (item, $item, $page) {// 左滑按钮点击事件
+        //    learun.layer.confirm('确定要删除该笔数据吗？', function (_index) {
+        //        if (_index === '1') {
+        //            learun.layer.loading(true, '正在删除该笔数据');
+        //            learun.httppost(config.webapi + 'learun/PersonnelManagement/ClassWork/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/StuInfoFresh/PayFee/form/form.css

@@ -0,0 +1,10 @@
+.lr-form-container .lr-form-row {
+    padding-left: 100px;
+}
+
+.lr-form-row label {
+    width: 100px;
+}
+#StudentLoan[readonly='readonly']{
+    background-color:#eee;
+}

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

@@ -0,0 +1,14 @@
+<div class="lr-form-container">
+    <div class="lr-form-row  " data-table="StuInfoFresh">
+        <label>线上缴费状态</label>
+        <div id="PayFeeStatus"></div>
+    </div>
+    <div class="lr-form-row  " data-table="StuInfoFresh">
+        <label>贷款回执码</label>
+        <input id="StudentLoan" type="text" />
+    </div>
+    <div class="lr-form-row  " data-table="StuInfoFresh">
+        <label>现场缴费状态</label>
+        <div id="OnsitePayFeeStatus"></div>
+    </div>
+</div>

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

@@ -0,0 +1,156 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-26 14:43
+ * 描  述：新生缴费管理
+ */
+(function () {
+    var keyValue = '';
+    var $header = null;
+    var titleText = '';
+    var page = {
+        isScroll: true,
+        init: function ($page, param) {
+            keyValue = param.keyValue;
+            // 添加头部按钮列表
+            var _html = '\
+                <div class="lr-form-header-cancel" >取消</div>\
+                <div class="lr-form-header-btnlist" >\
+                    <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 () {
+                $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/PersonnelManagement/ClassWork/delete', keyValue, (data) => {
+            //                                learun.layer.loading(false);
+            //                                if (data) {// 删除数据成功
+            //                                    learun.nav.closeCurrent();
+            //                                    var prepage = learun.nav.getpage('PersonnelManagement/ClassWork');
+            //                                    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 + 'StuInfoFresh/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/StuInfoFresh/PayFee');
+                        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 + 'StuInfoFresh/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]);
+                            }
+                            if (data[id].StudentLoanStatus == "1") {
+                                $page.find("#StudentLoan").attr("readonly", "readonly");
+                            } else {
+                                $page.find("#StudentLoan").removeAttr("readonly");
+                            }
+                        }
+                    }
+                    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('#PayFeeStatus').lrpickerex({
+                type: 'dataItem',
+                code: 'PayStatus'
+            }).lrpickerSet(0);
+            $page.find('#OnsitePayFeeStatus').lrpickerex({
+                type: 'dataItem',
+                code: 'OnsitePayStatus'
+            }).lrpickerSet(0);
+        }, destroy: function (pageinfo) {
+            $header = null;
+            keyValue = '';
+        }
+    };
+    return page;
+})();

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

@@ -114,13 +114,13 @@
     cursor: pointer;
 }
 
-#PhotoImg {
+#Img {
     width: 200px;
     height: 200px;
     margin: 30px auto;
 }
 
-    #PhotoImg img {
+    #Img img {
         width: 100%;
         height: 100%;
     }

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

@@ -2,7 +2,7 @@
     <div class="welT">报到二维码</div>
     <div class="welBox">
         <div class="welImgAdd">
-            <div id="PhotoImg"></div>
+            <div id="Img"></div>
         </div>
     </div>
     <div class="welLine"></div>
@@ -40,6 +40,10 @@
             班级
             <span id="ClassNo"></span>
         </div>
+        <div class="welText">
+            默认教室
+            <span id="DefaultClassRoomName"></span>
+        </div>
         <div class="welText">
             班主任编号
             <span id="ClassDiredctorNo"></span>

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

@@ -10,7 +10,7 @@
 
             //数据绑定 
             learun.layer.loading(true, '获取数据中');
-            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
                 if (data) {
                     //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一；
                     var entity = data["StuInfoFreshEntity"];
@@ -28,7 +28,7 @@
                         }, '智慧校园提示', ['确定']);
                         return false;
                     }
-                    if (entity.PayFeeStatus == "未缴费" && (entity.StudentLoan == null || entity.StudentLoan == "" || entity.StudentLoan == undefined) && entity.OnsitePayFeeStatus != "1") {
+                    if (entity.PayFeeStatus != "1" && entity.StudentLoanStatus != "1" && entity.OnsitePayFeeStatus != "1") {
                         learun.layer.loading(false);
                         learun.layer.confirm('新生未缴费，无法报到！', function (_index) {
                             learun.nav.closeCurrent();
@@ -59,7 +59,7 @@
                         }
                     }
                     //二维码
-                    learun.code.encode({ id: 'PhotoImg', text: userinfo.baseinfo.account });
+                    learun.code.encode({ id: 'Img', text: userinfo.baseinfo.account });
 
                     page.bind($page);
 

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

@@ -4,7 +4,7 @@
         <div class="welInput">
             <span>贷款回执码</span>
             <input id="ID" type="hidden"/>
-            <input id="StudentLoan" type="text" placeholder="请填写贷款回执码" />
+            <input id="StudentLoan" type="text" placeholder="请填写贷款回执码" value=""/>
         </div>
     </div>
     <div class="welLine"></div>

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

@@ -8,8 +8,15 @@
                 if (data) {
                     for (var id in data) {
                         if (id == "StuInfoFreshEntity") {
-                            $("#ID").val(data[id].ID);
-                            $("#StudentLoan").val(data[id].StudentLoan);
+                            $page.find("#ID").val(data[id].ID);
+                            $page.find("#StudentLoan").val(data[id].StudentLoan);
+                            if (data[id].StudentLoanStatus == "1") {
+                                learun.layer.loading(false);
+                                learun.layer.confirm('新生助学贷款已审核！', function (_index) {
+                                    learun.nav.closeCurrent();
+                                }, '智慧校园提示', ['确定']);
+                                return false;
+                            }
                         }
                     }
                     page.bind($page);

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

@@ -97,7 +97,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

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

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

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

@@ -124,7 +124,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

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

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun敏捷框架提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑 
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun敏捷框架提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

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

@@ -118,7 +118,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

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

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun敏捷框架提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun敏捷框架提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

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

@@ -167,7 +167,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         //rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

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

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                         //                    }
                         //                });
                         //            }
-                        //        }, 'Learun智慧校园提示', ['取消', '确定']);
+                        //        }, '智慧校园提示', ['取消', '确定']);
                         //    }
                         //}
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LR_OAModule/Notice/Notice.js

@@ -94,7 +94,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.js

@@ -113,7 +113,7 @@
                         learun.layer.loading(false); 
                     }); 
                 } 
-            }, 'Learun智慧校园提示', ['取消', '确定']); 
+            }, '智慧校园提示', ['取消', '确定']); 
         }, 
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     }; 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent(); 
                         } 
                     } 
-                }, 'learun智慧校园提示', ['取消', '确定']); 
+                }, '智慧校园提示', ['取消', '确定']); 
             }); 
             // 编辑 
             $header.find('.lr-form-header-edit').on('tap', function () { 
@@ -70,7 +70,7 @@
                                             } 
                                         }); 
                                     } 
-                                }, 'Learun智慧校园提示', ['取消', '确定']); 
+                                }, '智慧校园提示', ['取消', '确定']); 
                             } 
                         } 
                     ], 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/ActivitySchedule.js

@@ -100,7 +100,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/ClassWork.js

@@ -109,7 +109,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],
@@ -119,7 +119,7 @@
                     if (data) {
                         for (var id in data) {
                             if (data[id].length) {
-                                $page.find('#' + id ).lrgridSet(data[id]);
+                                $page.find('#' + id).lrgridSet(data[id]);
                             }
                             else {
                                 $page.find('[data-table="' + id + '"]').lrformSet(data[id]);
@@ -142,8 +142,9 @@
                 itext: 'classname'
             });
             $page.find('#Date').lrdate({
+                type: 'date'
             });
-        },        destroy: function (pageinfo) {
+        }, destroy: function (pageinfo) {
             $header = null;
             keyValue = '';
         }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/CommunityInfo.js

@@ -99,7 +99,7 @@
         //                learun.layer.loading(false);
         //            });
         //        }
-        //    }, 'Learun智慧校园提示', ['取消', '确定']);
+        //    }, '智慧校园提示', ['取消', '确定']);
         //},
         btnJoinClick: function (item, $item, $page) {// 左滑按钮点击事件
             learun.layer.confirm('确定要申请加入该社团吗？', function (_index) {
@@ -112,7 +112,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         //rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
         rowBtns: ['<a class="lr-btn-join">申请加入</a>'] // 列表行左滑按钮

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityMember/CommunityMember.js

@@ -105,7 +105,7 @@
         //                learun.layer.loading(false);
         //            });
         //        }
-        //    }, 'Learun智慧校园提示', ['取消', '确定']);
+        //    }, '智慧校园提示', ['取消', '确定']);
         //},
         //rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/ContactsDetails.js

@@ -119,7 +119,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/form/form.js

@@ -39,7 +39,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -71,7 +71,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/EmpRepair.js

@@ -102,7 +102,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituation/EpidemicSituation.js

@@ -141,7 +141,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js

@@ -155,7 +155,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/Schedule.js

@@ -105,7 +105,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.css

@@ -63,6 +63,22 @@
         margin-bottom: 0;
     }
 
+    .welInput div {
+        margin-left: 28%;
+        width: 72%;
+        height: 30px;
+        line-height: 28px;
+    }
+
+#WaitInfo .welInput span {
+    width: 30%;
+}
+
+#WaitInfo .welInput div {
+    margin-left: 32%;
+    width: 68%;
+}
+
 .welCon {
     padding: 10px;
     border: 1px solid #efefef;
@@ -114,8 +130,17 @@
     cursor: pointer;
 }
 
+.welBoxPhoto {
+    height: 110px;
+}
+
+    .welBoxPhoto .welImgAdd {
+        height: 100%;
+    }
+
 #PhotoImg {
     width: 110px;
+    height: 100%;
 }
 
 .btnBox {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.html

@@ -52,9 +52,9 @@
     </div>
     <div class="welLine"></div>
     <div class="welT">采集照片信息</div>
-    <div class="welBox">
+    <div class="welBox welBoxPhoto">
         <input type="hidden" id="Photo" value="" />
-        <input id="files" type="file" accept="image/*">
+        <!--<input id="files" type="file" accept="image/*">-->
         <div class="welImgAdd">
             <img id="PhotoImg" src="" alt="">
         </div>
@@ -64,7 +64,7 @@
     <div class="welBox">
         <div class="welInput">
             <span>籍贯</span>
-            <input id="RegionNo" type="text" placeholder="请填写籍贯" />
+            <input id="RegionNo" type="text" placeholder="请填写籍贯" disabled="disabled" />
         </div>
     </div>
     <div class="welLine"></div>
@@ -72,11 +72,11 @@
     <div class="welBox">
         <div class="welInput">
             <span>家庭住址</span>
-            <input id="FamilyAddress" type="text" placeholder="按XX省XX市XX县XX街道填写" />
+            <input id="FamilyAddress" type="text" placeholder="按XX省XX市XX县XX街道填写" disabled="disabled" />
         </div>
         <div class="welInput">
             <span>联系电话</span>
-            <input id="telephone" type="text" placeholder="请填写联系电话" />
+            <input id="telephone" type="text" placeholder="请填写联系电话" disabled="disabled" />
         </div>
     </div>
     <div class="welLine"></div>
@@ -133,8 +133,37 @@
             <div class="welDel"> <i class="iconfont icon-move"></i> </div>
         </div>
     </div>
+    <div class="welLine"></div>
+
+
+    <div class="welT">待认定信息</div>
+    <div class="welBox" id="WaitInfo">
+        <div class="welInput">
+            <span>是否精准贫困户</span>
+            <div id="IsPoor" class="YesOrNo"></div>
+        </div>
+        <div class="welInput">
+            <span>钥匙发放</span>
+            <div id="GetKeyStatus" class="YesOrNo"></div>
+        </div>
+        <div class="welInput">
+            <span>校园卡发放</span>
+            <div id="GetCardStatus" class="YesOrNo"></div>
+        </div>
+        <div class="welInput">
+            <span>其他费用收取</span>
+            <div id="OtherPayFeeStatus" class="YesOrNo"></div>
+        </div>
+        <div class="welInput">
+            <span>档案收取</span>
+            <div id="CollectFileStatus" class="YesOrNo"></div>
+        </div>
+    </div>
+    <div class="welLine"></div>
+
+
 
     <div class="btnBox">
-        <button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block">保存</button>
+        <button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block">确认报到</button>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.js

@@ -1,12 +1,14 @@
 (function () {
-    var colDataItemArr = ['GenderNo', 'PartyFaceNo'];
-    var colDataItemCode = ['usersex', 'PolityStatus'];
+    var colDataItemArr = ['GenderNo', 'PartyFaceNo', 'IsPoor', 'GetKeyStatus', 'GetCardStatus', 'OtherPayFeeStatus', 'CollectFileStatus'];
+    var colDataItemCode = ['usersex', 'PolityStatus', 'YesOrNoInt', 'YesOrNoInt', 'YesOrNoInt', 'YesOrNoInt', 'YesOrNoInt'];
 
     var page = {
         isScroll: false,
-        init: function ($page,param) {
+        init: function ($page, param) {
+            page.bind2($page);
             //数据绑定 
-            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntityByStuNo", '\''+param.StuNo+'\'', (data) => {
+            learun.layer.loading(true, '获取数据中');
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", param.StuNo, (data) => {
                 if (data) {
                     //基本信息
                     for (var id in data['StuInfoFreshEntity']) {
@@ -27,6 +29,8 @@
 
                             } else if (dom.tagName.toLowerCase() == "input") {
                                 $('#' + id).val(data['StuInfoFreshEntity']['' + id + '']);
+                            } else if (dom.tagName.toLowerCase() == "div") {
+                                $('#' + id).lrpickerSet(data['StuInfoFreshEntity']['' + id + '']);
                             }
                         }
                     }
@@ -38,32 +42,32 @@
                         var html = '<div class="welCon"><form class="welConForm">' +
                             '<div class="welInput">' +
                             '<span>姓名</span>' +
-                            '<input type="text" name="Name" placeholder="请填写姓名" value="' + item.Name + '"/>' +
+                            '<input disabled="disabled" type="text" name="Name" placeholder="请填写姓名" value="' + item.Name + '"/>' +
                             '</div >' +
                             '<div class="welInput">' +
                             '<span>与本人关系</span>' +
-                            //'<input type="text" name="Relation" placeholder="请填写与本人关系" value="' + item.Relation + '"/>' +
-                            '<div name="Relation" value="' + item.Relation + '"></div>' +
+                            '<input disabled="disabled" type="text" name="Relation" placeholder="请填写与本人关系" value="' + item.Relation + '"/>' +
+                            //'<div name="Relation" value="' + item.Relation + '"></div>' +
                             '</div>' +
                             '<div class="welInput">' +
                             '<span>性别</span>' +
-                            //'<input type="text" name="Sex" placeholder="请填写性别" value="' + item.Sex + '"/>' +
-                            '<div name="Sex" value="' + item.Sex + '"></div>' +
+                            '<input disabled="disabled" type="text" name="Sex" placeholder="请填写性别" value="' + item.Sex + '"/>' +
+                            //'<div name="Sex" value="' + item.Sex + '"></div>' +
                             '</div>' +
                             '<div class="welInput">' +
                             '<span>年龄</span>' +
-                            '<input type="text" name="Age" placeholder="请填写年龄" value="' + item.Age + '"/>' +
+                            '<input disabled="disabled" type="text" name="Age" placeholder="请填写年龄" value="' + item.Age + '"/>' +
                             '</div>' +
                             '<div class="welInput">' +
                             '<span>政治面貌</span>' +
-                            //'<input type="text" name="Politicy" placeholder="请填写政治面貌" value="' + item.Politicy + '"/>' +
-                            '<div name="Politicy" value="' + item.Politicy + '"/>' +
+                            '<input disabled="disabled" type="text" name="Politicy" placeholder="请填写政治面貌" value="' + item.Politicy + '"/>' +
+                            //'<div name="Politicy" value="' + item.Politicy + '"/>' +
                             '</div>' +
                             '<div class="welInput">' +
                             '<span>身份证号</span>' +
-                            '<input type="text" name="IdCard" placeholder="请填写身份证号" value="' + item.IdCard + '"/>' +
+                            '<input disabled="disabled" type="text" name="IdCard" placeholder="请填写身份证号" value="' + item.IdCard + '"/>' +
                             '</div>' +
-                            '<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+                            //'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
                             '</form></div> ';
                         $('#StuInfoFreshFamily').append(html);
 
@@ -75,32 +79,32 @@
                         var html = '<div class="welCon"><form class="welConForm">' +
                             '<div class="welInput">' +
                             '<span>姓名</span>' +
-                            '<input type="text" name="Name" placeholder="请填写姓名" value="' + item.Name + '"/>' +
+                            '<input disabled="disabled" type="text" name="Name" placeholder="请填写姓名" value="' + item.Name + '"/>' +
                             '</div >' +
                             '<div class="welInput">' +
                             '<span>与本人关系</span>' +
-                            '<input type="text" name="Relation" placeholder="请填写与本人关系" value="' + item.Relation + '"/>' +
+                            '<input disabled="disabled" disabled="disabled" type="text" name="Relation" placeholder="请填写与本人关系" value="' + item.Relation + '"/>' +
                             '</div>' +
                             '<div class="welInput">' +
                             '<span>手机号码</span>' +
-                            '<input type="text" name="Telephone" placeholder="请填写手机号码" value="' + item.Telephone + '"/>' +
+                            '<input disabled="disabled" type="text" name="Telephone" placeholder="请填写手机号码" value="' + item.Telephone + '"/>' +
                             '</div>' +
                             '<div class="welInput">' +
                             '<span>座机号码</span>' +
-                            '<input type="text" name="Mobile" placeholder="请填写座机号码" value="' + item.Mobile + '"/>' +
+                            '<input disabled="disabled" type="text" name="Mobile" placeholder="请填写座机号码" value="' + item.Mobile + '"/>' +
                             '</div>' +
                             '<div class="welInput">' +
                             '<span>联系地址</span>' +
-                            '<input type="text" name="Address" placeholder="请填写联系地址" value="' + item.Address + '"/>' +
+                            '<input disabled="disabled" type="text" name="Address" placeholder="请填写联系地址" value="' + item.Address + '"/>' +
                             '</div>' +
-                            '<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+                            //'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
                             '</form></div > ';
                         $('#StuInfoFreshEmergePeople').append(html);
 
                     });
 
                     page.bind($page);
-
+                    learun.layer.loading(false);
 
                 }
 
@@ -108,16 +112,25 @@
 
             //保存
             $page.find('#saveBtn').on('tap', function () {
-                var postdata = {
-                    ID: $('#ID').val()
-                };
-                learun.httpget(config.webapi + "/保存地址/", postdata, (data) => {
-                    if (data) {
+                // 获取表单数据
+                if (!$page.find('#WaitInfo').lrformValid()) {
+                    return false;
+                }
+                var _postData = {}
+                _postData.keyValue = $('#ID').val();
+                var data = $page.find('#WaitInfo').lrformGet();
+                data.RegisterStatus = "1";
+                data.ArriveDate = getTime();
+                console.log(data);
+                _postData.strEntity = JSON.stringify(data);
+                learun.layer.loading(true, '正在提交数据');
+                learun.httppost(config.webapi + 'StuInfoFresh/save', _postData, (data) => {
+                    learun.layer.loading(false);
+                    if (data) {// 表单数据保存成功
                         learun.layer.toast('保存成功');
-                        location.reload();
+                        learun.nav.closeCurrent();
                     }
                 });
-
             });
 
 
@@ -125,81 +138,55 @@
         bind: function ($page) {
             //性别
             $.each($page.find('[name="Sex"]'), function (i, item) {
-                $page.find(item).lrpickerex({
+                learun.clientdata.get('dataItem', {
                     code: 'usersex',
-                    type: 'dataItem'
+                    key: $(item).attr('value'),
+                    callback: function (data, op) {
+                        $(item).val(data.text);
+                    }
                 });
-                //赋值
-                $(item).lrpickerSet($(item).attr('value'));
             });
             //政治面貌
             $.each($page.find('[name="Politicy"]'), function (i, item) {
-                $page.find(item).lrpickerex({
+                learun.clientdata.get('dataItem', {
                     code: 'PolityStatus',
-                    type: 'dataItem'
+                    key: $(item).attr('value'),
+                    callback: function (data, op) {
+                        $(item).val(data.text);
+                    }
                 });
-                //赋值
-                $(item).lrpickerSet($(item).attr('value'));
             });
             //与本人关系
             $.each($page.find('#StuInfoFreshFamily').find('[name="Relation"]'), function (i, item) {
-                $page.find(item).lrpickerex({
+                learun.clientdata.get('dataItem', {
                     code: 'FamilyRelation',
-                    type: 'dataItem'
+                    key: $(item).attr('value'),
+                    callback: function (data, op) {
+                        $(item).val(data.text);
+                    }
                 });
-                //赋值
-                $(item).lrpickerSet($(item).attr('value'));
             });
-        }
-    };
-    //数据处理
-    function family() {
-        var list = new Array();
-        $.each($('#StuInfoFreshFamily').children('.welCon'), function (i, item) {
-            var o = $(item).children(".welConForm").serializeObject();
-            o.Sex = $(item).find('[name="Sex"]').lrpickerGet();
-            o.Politicy = $(item).find('[name="Politicy"]').lrpickerGet();
-            o.Relation = $(item).find('[name="Relation"]').lrpickerGet();
-            list.push(o);
-        });
-        return list;
-    }
-    function emergePeople() {
-        var list = new Array();
-        $.each($('#StuInfoFreshEmergePeople').children('.welCon'), function (i, item) {
-            var o = $(item).children(".welConForm").serializeObject();
-            list.push(o);
-        });
-        return list;
-    }
-
-    $.fn.serializeObject = function () {
-        var o = {};
-        var a = this.serializeArray();
-        $.each(a, function () {
-            if (o[this.name]) {
-                if (!o[this.name].push) {
-                    o[this.name] = [o[this.name]];
-                }
-                o[this.name].push(this.value || '');
-            } else {
-                o[this.name] = this.value || '';
-            }
-        });
-        return o;
-    }
-    
+        },
+        //待认定信息
+        bind2: function ($page) {
+            $.each($page.find('#WaitInfo .YesOrNo'), function (i, item) {
+                $(item).lrpickerex({
+                    type: 'dataItem',
+                    code: 'YesOrNoInt'
+                }).lrpickerSet(0);
+            });
 
-    //产生随机数
-    function GenerateRandom() {
-        var retstr = "";
-        var date = new Date();
-        retstr = date.getFullYear().toString() + "-" + date.getMonth().toString() + "-" + date.getDate().toString() + "-" + date.getUTCHours().toString() + "-" + date.getUTCMinutes() + "-" + date.getUTCSeconds().toString();
-        var Num = "";
-        for (var i = 0; i < 6; i++) {
-            Num += Math.floor(Math.random() * 10);
         }
-        return retstr + Num;
+    };
+    function getTime() {
+        var nowDate = new Date();
+        var year = nowDate.getFullYear();
+        var month = nowDate.getMonth() + 1 < 10 ? "0" + (nowDate.getMonth() + 1) : nowDate.getMonth() + 1;
+        var date = nowDate.getDate() < 10 ? "0" + nowDate.getDate() : nowDate.getDate();
+        var hour = nowDate.getHours() < 10 ? "0" + nowDate.getHours() : nowDate.getHours();
+        var minute = nowDate.getMinutes() < 10 ? "0" + nowDate.getMinutes() : nowDate.getMinutes();
+        var second = nowDate.getSeconds() < 10 ? "0" + nowDate.getSeconds() : nowDate.getSeconds();
+        return year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second;
     }
 
     return page;

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

@@ -5,7 +5,6 @@
             var path = config.webapi;
             learun.http.get(path + "Learun/EducationalAdministration/EmpRegister/registerbutton",
                 {}, (res) => {
-                    console.log(res);
                     if (res.info == "True") {
                         var button = $page.find('#RegisterBtn');
                         button.show();
@@ -22,15 +21,20 @@
             $page.find('#loginBtn').on('tap', function () {
                 var account = $('#account').val();
                 var password = $('#password').val();
-
+                var up = true;
                 if (account === "") {
                     learun.layer.warning('用户名不能为空！', function () { }, '提示', '关闭');
                 } else if (password === "") {
                     learun.layer.warning('密码不能为空！', function () { }, '提示', '关闭');
                 } else {
+                    var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+                    if (!reg.test(password)) {
+                        up = false;
+                    }
                     var data = {
                         username: account,
-                        password: $.md5(password)
+                        password: $.md5(password),
+                        up: up
                     };
                     var postdata = {
                         token: '',
@@ -56,6 +60,11 @@
                             learun.storage.set('userinfo', res.data);
                             $('#account').val('');
                             $('#password').val('');
+                            if (res.data.pwd === true) {
+                                learun.storage.set('pwd', true);
+                            } else {
+                                learun.storage.set('pwd', false);
+                            }
                             learun.tab.go('workspace');
                             if (learun.storage.get("Ip") != null && learun.storage.get("ACIp") != "") {
                                 //Ip上网

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.html

@@ -13,8 +13,19 @@
     </div>
 </div>
 
-<div class="lr-list" style="margin-top:15px;">
-    <div class="lr-list-item" style="color:red;text-align:center;" id="savepassword">
+<div class="lr-list" style="margin-top: 15px;">
+    <div id="strongpwd" style="display: none;">
+        您的密码不满足强度要求，请您先修改密码后再执行系统其他操作！
+    </div>
+    <div>
+        新密码必须8-20位同时包含1.[大小写字母]、2[数字]、3[特殊符号!@@#$%^&*]
+    </div>
+    <div class="lr-list-item" style="color: red; text-align: center;" id="savepassword">
         保存
     </div>
+</div>
+<div class="lr-list" style="margin-top:15px;display: none;" id="strongpwdout" >
+    <div class="lr-list-item" style="color:red;text-align:center;" id="outloginbtn">
+        退出
+    </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.js

@@ -1,12 +1,24 @@
 (function () {
+    var userinfo = null;
     var page = {
         isScroll: true,
         init: function ($page) {
+            userinfo = learun.storage.get('userinfo');
+            //主被动修改密码判断
+            if (learun.storage.get('pwd')===true) {
+                $page.find('#strongpwd').css("display", "block");
+                $page.find('#strongpwdout').css("display", "block");
+            }
             $page.find('#savepassword').on('tap', function () {
                 if (!$('#modifypasswordform').lrformValid()) {
                     return false;
                 }
                 var formdata = $('#modifypasswordform').lrformGet();
+                var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+                if (!reg.test(formdata.newpassword)) {
+                    learun.layer.toast('密码不满足强度要求');
+                    return false;
+                }
                 if (formdata.newpassword1 === formdata.newpassword) {
 
                     var req = {
@@ -20,6 +32,7 @@
                         if (data) {// 表单数据保存成功，发起流程
                             learun.layer.toast(info);
                             learun.storage.set('logininfo', null);
+                            learun.storage.set('pwd', false);
                             learun.nav.go({ path: 'login', isBack: false, isHead: false });
                         }
                         return false;
@@ -29,6 +42,25 @@
                     learun.layer.toast('二次输入密码不同');
                 }
             });
+            $page.find('#outloginbtn').on('tap', function () {
+                learun.layer.confirm('确定要退出账号?', function (_index) {
+                    if (_index === '1') {
+                        learun.isOutLogin = true;
+                        if (learun.storage.get("Ip") != null && learun.storage.get("ACIp") != "") {
+                            //Ip上网
+                            sendToAc(learun.storage.get("ACIp"), 'logout', learun.storage.get("Ip"), userinfo.baseinfo.account, '');
+                        }
+                        if (learun.storage.get("Ip") != null && learun.storage.get("ACIp2") != "") {
+                            //Ip上网
+                            sendToAc(learun.storage.get("ACIp2"), 'logout', learun.storage.get("Ip"), userinfo.baseinfo.account, '');
+                        }
+                        learun.storage.set('logininfo', null);
+                        learun.nav.go({ path: 'login', isBack: false, isHead: false });
+                        
+                    }
+
+                }, '', ['取消', '退出']);
+            });
         }
     };
     return page;

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

@@ -3,9 +3,11 @@
     var page = {
         isScroll: false,
         init: function ($page) {
+            // 获�登录者信�
+            var userinfo = learun.storage.get('userinfo');
 
-            //Êý¾Ý°ó¶¨ 
-            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+            //数�绑定 
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
                 if (data) {
                     var entity = data['StuInfoFreshEntity'];
                     if (entity != null) {
@@ -16,16 +18,16 @@
                         $('#ClassNo').html(entity.ClassNo);
                         $('#ClassTutorName').html(entity.ClassTutorName);
                         $('#ClassTutorMobile').html(entity.ClassTutorMobile);
-                        $('#PayFeeStatus').html(entity.PayFeeStatus);
-                        $('#CollectFileStatus').html(entity.CollectFileStatus);
-                        $('#GetKeyStatus').html(entity.GetKeyStatus);
+                        $('#PayFeeStatus').html(entity.PayFeeStatus == "1" ? "已缴费" : "未缴费");
+                        $('#CollectFileStatus').html(entity.CollectFileStatus == "1" ? "已�交" : "未�交");
+                        $('#GetKeyStatus').html(entity.GetKeyStatus == "1" ? "已领�" : "未领�");
                         $('#IsCompleteInfo').html(entity.IsCompleteInfo);
                         $('#Dormitory').html(entity.DormitoryName);
                     }
                 }
 
             });
-            
+
         },
         bind: function ($page) {
 

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

@@ -1,61 +1,61 @@
 <div class="enSecBox">
-	<!-- 已完成 类名 sSec1Type1 图片   enter1-1 enter1-2 enter1-3 enter1-4 enter1-5-->
-	<!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
-	<!-- 可以点击类名  sSec1Tap -->
-	<div class="ensHeader">
-		<div class="ensTime">2020</div>
-		<div class="ensHeadT">新生入校流程</div>
-	</div>
-	<div class="ensSec1">
-		<div class="eSec1Box">
-			<div class="eSec1Top">step<span>1</span></div>
-			<div class="sSec1Con sSec1Type1" id="IsCompleteInfo">
-				<img src="images/enter1-1.png" alt="">
-				<div class="sSec1Txt">
-					完善学生信息
-				</div>
-				<div class="sSec1State">已完成</div>
-			</div>
-		</div>
-		<div class="eSec1Box">
-			<img src="images/enter1-6.png" alt="" class="sSecDown">
-			<div class="eSec1Top">step<span>2</span></div>
-			<div class="sSec1Con sSec1Type2" id="PayFeeStatus">
-				<img src="images/enter1-2.png" alt="">
-				<div class="sSec1Txt">
-					线上缴费
-					<span>( 已缴费、未缴费 )</span>
-				</div>
-				<div class="sSec1State">未完成</div>
-			</div>
-			<div class="sSec1Con sSec1Type1" id="StudentLoan">
-				<img src="images/enter1-3.png" alt="">
-				<div class="sSec1Txt">
-					助学贷款
-					<span>( 填写贷款回执码 )</span>
-				</div>
-				<div class="sSec1State">已完成</div>
-			</div>
-			<div class="sSec1Con sSec1Type2" id="OnsitePayFeeStatus">
-				<img src="images/enter2-4.png" alt="">
-				<div class="sSec1Txt">
-					现场缴费
-					<span>( 已缴费、缓交、部分缴费、未缴费 )</span>
-				</div>
-				<div class="sSec1State">未完成</div>
-			</div>
-		</div>
-		<div class="eSec1Box">
-			<img src="images/enter1-6.png" alt="" class="sSecDown">
-			<div class="eSec1Top">step<span>3</span></div>
-			<div class="sSec1Con sSec1Type2" id="RegisterStatus">
-				<img src="images/enter2-5.png" alt="">
-				<div class="sSec1Txt">
-					报到注册
-					<span>( 生成报到二维码，并显示报到教室 )</span>
-				</div>
-				<div class="sSec1State">未完成</div>
-			</div>
-		</div>
-	</div>
+    <!-- 已完成 类名 sSec1Type1 图片   enter1-1 enter1-2 enter1-3 enter1-4 enter1-5-->
+    <!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
+    <!-- 可以点击类名  sSec1Tap -->
+    <div class="ensHeader">
+        <div class="ensTime">2020</div>
+        <div class="ensHeadT">新生入校流程</div>
+    </div>
+    <div class="ensSec1">
+        <div class="eSec1Box">
+            <div class="eSec1Top">step<span>1</span></div>
+            <div class="sSec1Con sSec1Type2" id="IsCompleteInfo">
+                <img src="images/enter2-1.png" alt="">
+                <div class="sSec1Txt">
+                    完善学生信息
+                </div>
+                <div class="sSec1State">未完成</div>
+            </div>
+        </div>
+        <div class="eSec1Box">
+            <img src="images/enter1-6.png" alt="" class="sSecDown">
+            <div class="eSec1Top">step<span>2</span></div>
+            <div class="sSec1Con sSec1Type2" id="PayFeeStatus">
+                <img src="images/enter2-2.png" alt="">
+                <div class="sSec1Txt">
+                    线上缴费
+                    <span>( 已缴费、未缴费 )</span>
+                </div>
+                <div class="sSec1State">未完成</div>
+            </div>
+            <div class="sSec1Con sSec1Type2" id="StudentLoan">
+                <img src="images/enter2-3.png" alt="">
+                <div class="sSec1Txt">
+                    助学贷款
+                    <span>( 填写贷款回执码 )</span>
+                </div>
+                <div class="sSec1State">未完成</div>
+            </div>
+            <div class="sSec1Con sSec1Type2" id="OnsitePayFeeStatus">
+                <img src="images/enter2-4.png" alt="">
+                <div class="sSec1Txt">
+                    现场缴费
+                    <span>( 已缴费、缓交、部分缴费、未缴费 )</span>
+                </div>
+                <div class="sSec1State">未完成</div>
+            </div>
+        </div>
+        <div class="eSec1Box">
+            <img src="images/enter1-6.png" alt="" class="sSecDown">
+            <div class="eSec1Top">step<span>3</span></div>
+            <div class="sSec1Con sSec1Type2" id="RegisterStatus">
+                <img src="images/enter2-5.png" alt="">
+                <div class="sSec1Txt">
+                    报到注册
+                    <span>( 生成报到二维码，并显示报到教室 )</span>
+                </div>
+                <div class="sSec1State">未完成</div>
+            </div>
+        </div>
+    </div>
 </div>

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

@@ -7,57 +7,53 @@
     var page = {
         isScroll: false,
         init: function ($page) {
-            //Êý¾Ý°ó¶¨ 
-            learun.layer.loading(true, '»ñÈ¡Êý¾ÝÖÐ');
-            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
-                if (data) {
-                    for (var id in data) {
-                        if (id == "StuInfoFreshEntity") {
-                            //todo:ÂÒÂë
-                            console.log(data[id].IsCompleteInfo == "ÒÑÍêÉÆ");//false
-
-                            if (data[id].IsCompleteInfo == "ÒÑÍêÉÆ") {
-                                completeStyle("#IsCompleteInfo", "images/enter1-1.png");
-                            } else {
-                                notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png");
-                            }
-                            if (data[id].PayFeeStatus == "ÒѽɷÑ") {
-                                completeStyle("#PayFeeStatus", "images/enter1-2.png");
-                            } else {
-                                notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
-                            }
-                            if (data[id].StudentLoan == null || data[id].StudentLoan == "" || data[id].StudentLoan == undefined) {
-                                notCompleteStyle("#StudentLoan", "images/enter2-3.png");
-                            } else {
-                                completeStyle("#StudentLoan", "images/enter1-3.png");
-                            }
-                            if (data[id].OnsitePayFeeStatus == "1") {
-                                completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
-                            } else {
-                                notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
-                            }
-                            if (data[id].RegisterStatus == "1") {
-                                completeStyle("#RegisterStatus", "images/enter1-5.png");
-                            } else {
-                                notCompleteStyle("#RegisterStatus", "images/enter2-5.png");
-                            }
+            // 获�登录者信�
+            var userinfo = learun.storage.get('userinfo');
 
-                        }
+            //数�绑定 
+            learun.layer.loading(true, '获�数�中');
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
+                if (data) {
+                    if (data["StuInfoFreshFamilyList"].length && data["StuInfoFreshFamilyList"].length > 0) {
+                        completeStyle("#IsCompleteInfo", "images/enter1-1.png");
+                    } else {
+                        notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png");
+                    }
+                    if (data["StuInfoFreshEntity"].PayFeeStatus == "1") {
+                        completeStyle("#PayFeeStatus", "images/enter1-2.png");
+                    } else {
+                        notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
                     }
+                    if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") {
+                        completeStyle("#StudentLoan", "images/enter1-3.png");
+                    } else {
+                        notCompleteStyle("#StudentLoan", "images/enter2-3.png");
+                    }
+                    if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
+                        completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
+                    } else {
+                        notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
+                    }
+                    if (data["StuInfoFreshEntity"].RegisterStatus == "1") {
+                        completeStyle("#RegisterStatus", "images/enter1-5.png");
+                    } else {
+                        notCompleteStyle("#RegisterStatus", "images/enter2-5.png");
+                    }
+
                     page.bind($page);
                     learun.layer.loading(false);
                 }
             });
 
-            //µã»÷²½Öè
+            //点击步骤
             $page.on('tap', '#IsCompleteInfo', function () {
-                learun.nav.go({ path: 'welcome', title: 'ÍêÉÆÐÂÉúÐÅÏ¢', isBack: true, isHead: true, param: {}, type: 'right' });
+                learun.nav.go({ path: 'welcome', title: '完善新生信�', isBack: true, isHead: true, param: {}, type: 'right' });
             });
             $page.on('tap', '#RegisterStatus', function () {
-                learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: 'Éú³É±¨µ½¶þάÂë', isBack: true, isHead: true, param: {}, type: 'right' });
+                learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生�报到二维�', isBack: true, isHead: true, param: {}, type: 'right' });
             });
             $page.on('tap', '#StudentLoan', function () {
-                learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/StudentLoan', title: 'Ìîд´û¿î»ØÖ´Âë', isBack: true, isHead: true, param: {}, type: 'right' });
+                learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/StudentLoan', title: '填写贷款回执�', isBack: true, isHead: true, param: {}, type: 'right' });
             });
 
         },
@@ -65,16 +61,16 @@
 
         }
     };
-    //ÒÑÍê³ÉÑùʽ
+    //已完�样�
     var completeStyle = function (box, img) {
         $(box).removeClass("sSec1Type2").addClass("sSec1Type1");
-        $(box).find(".sSec1State").html("ÒÑÍê³É");
+        $(box).find(".sSec1State").html('已完�');
         $(box).find('img').attr("src", img);
     };
-    //ÒÑÍê³ÉÑùʽ
+    //未完�样�
     var notCompleteStyle = function (box, img) {
         $(box).removeClass("sSec1Type1").addClass("sSec1Type2");
-        $(box).find(".sSec1State").html("δÍê³É");
+        $(box).find(".sSec1State").html('未完�');
         $(box).find('img').attr("src", img);
 
     };

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

@@ -23,6 +23,7 @@
         isScroll: false,
         init: function ($page) {
             //获取学年学期列表
+            learun.layer.loading(true, '获取数据中');
             learun.httpget(config.webapi + "scoreSearch/academicAndSemesterList", {}, (data) => {
                 if (data == null || data.length <= 0) {
                     $('.studSeeSec2 .studSeeSec2Top').hide();
@@ -41,6 +42,8 @@
                         studentSeeAjax(res.value)
                     }
                 });
+
+                learun.layer.loading(false);
             });
 
         }

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

@@ -71,7 +71,7 @@
             //                                } 
             //                            }); 
             //                        } 
-            //                    }, 'Learun敏捷框架提示', ['取消', '确定']); 
+            //                    }, '智慧校园提示', ['取消', '确定']); 
             //                } 
             //            } 
             //        ], 

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

@@ -113,9 +113,12 @@
     margin: 10px auto;
     cursor: pointer;
 }
-
+.welImgAdd{
+    min-height:110px;
+}
 #PhotoImg {
     width: 110px;
+    height:110px;
 }
 
 .btnBox{

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

@@ -5,6 +5,8 @@
     var page = {
         isScroll: false,
         init: function ($page) {
+            // 获取登录者信息
+            var userinfo = learun.storage.get('userinfo');
 
             //增加联系人
             $page.find('.welT i').on('tap', function () {
@@ -90,8 +92,10 @@
             inputNode.on('change', function () {
                 previewFile();
             });
+
             //数据绑定 
-            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+            learun.layer.loading(true, '获取数据中');
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
                 if (data) {
                     //基本信息
                     for (var id in data['StuInfoFreshEntity']) {
@@ -185,7 +189,7 @@
                     });
 
                     page.bind($page);
-
+                    learun.layer.loading(false);
 
                 }
 
@@ -202,7 +206,9 @@
                     StuInfoFreshFamilyEntities: family(),
                     StuInfoFreshEmergePeopleEntities: emergePeople()
                 };
+                learun.layer.loading(true, '正在提交数据');
                 learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (data) => {
+                    learun.layer.loading(false);
                     if (data) {
                         learun.layer.toast('保存成功');
                         location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.26696.2.2019-09-23.15-42-49.7910

@@ -1,414 +0,0 @@
-<script type="text/javascript">
-    (function ($, learun) {
-        learun.nav.data["workspace"].jsObj = (function () {
-
-            var custmerform = {};
-            var $scroll = '';
-
-            // 统计数据
-            function target(data, $desktop) {
-                if (data.length > 0) {
-                    var _html = '\
-            <div class="lr-black-panel">\
-                <div class="lr-title">统计数据</div>\
-                <div class="lr-content lr-flex-content">\
-                </div>\
-            </div>';
-                    $desktop.append(_html);
-                    var $content = $desktop.find('.lr-flex-content');
-                    $.each(data, function (_index, _item) {
-                        var _itemHtml = '\
-                    <div class="targetItem">\
-                        <div class="name">'+ _item.F_Name + '</div>\
-                        <div class="number" data-number="'+ _item.F_Id + '" ></div>\
-                    </div>';
-                        $content.append(_itemHtml);
-                        // 获取后台数据
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'Target', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                $('[data-number="' + data.Id + '"]').text(data.value);
-                            }
-                        });
-
-                    });
-
-                }
-            }
-            // 列表数据
-            function list(data, $desktop) {
-                if (data.length > 0) {
-                    $.each(data, function (_index, _item) {
-                        var _html = '\
-                <div class="lr-black-panel">\
-                    <div class="lr-title">'+ _item.F_Name + '</div>\
-                    <div class="lr-content" data-desktop="'+ _item.F_Id + '" ></div>\
-                </div>';
-                        $desktop.append(_html);
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                var $list = $('[data-desktop="' + data.Id + '"]');
-                                $.each(data.value, function (_j, _jitem) {
-                                    var _itemHtml = '\
-                                <div class="lr-list-item lr-dtlist-item">\
-                                    <div class="lr-ellipsis">'+ _jitem.f_title + '</div>\
-                                    <div class="date">'+ learun.date.format(_jitem.f_time, 'yyyy-MM-dd') + '</div>\
-                                </div>';
-                                    var _$itemHtml = $(_itemHtml);
-                                    _$itemHtml[0].item = _jitem;
-                                    $list.append(_$itemHtml);
-                                });
-                                $list.find('.lr-dtlist-item').on('tap', function () {
-                                    var item = $(this)[0].item;
-                                    learun.nav.go({ path: 'workspace/listdetaile', title: '详情', param: item, type: 'right' });
-                                });
-
-                                $list = null;
-                            }
-                        });
-                    });
-                }
-            }
-            var chartMap = {};
-            // 图表数据
-            function chart(data, $desktop) {
-
-                if (data.length > 0) {
-                    chartMap = {};
-                    $.each(data, function (_index, _item) {
-                        var _html = '\
-                <div class="lr-black-panel">\
-                    <div class="lr-title">'+ _item.F_Name + '</div>\
-                    <div class="lr-content lr-chart-content">\
-                        <div class="lr-chart-container" id="'+ _item.F_Id + '"  data-desktop="' + _item.F_Type + '" ></div>\
-                    </div>\
-                </div>';
-
-                        $desktop.append(_html);
-                        chartMap[_item.F_Id] = echarts.init(document.getElementById(_item.F_Id));
-
-                        // 获取后台数据
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'chart', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                var type = $('#' + data.Id).attr('data-desktop');
-                                var legendData = [];
-                                var valueData = [];
-                                $.each(data.value, function (_index, _item) {
-                                    legendData.push(_item.name);
-                                    valueData.push(_item.value);
-                                });
-
-                                var option = {};
-                                switch (type) {
-                                    case '0'://饼图
-                                        option.tooltip = {
-                                            trigger: 'item',
-                                            formatter: "{a} <br/>{b}: {c} ({d}%)"
-                                        };
-
-                                        option.legend = {
-                                            orient: 'vertical',
-                                            left: 'left',
-                                            data: legendData
-                                        };
-                                        option.series = [{
-                                            name: '占比',
-                                            type: 'pie',
-                                            radius: ['50%', '70%'],
-                                            avoidLabelOverlap: false,
-                                            label: {
-                                                normal: {
-                                                    show: false,
-                                                    position: 'center'
-                                                },
-                                                emphasis: {
-                                                    show: true,
-                                                    textStyle: {
-                                                        fontSize: '30',
-                                                        fontWeight: 'bold'
-                                                    }
-                                                }
-                                            },
-                                            labelLine: {
-                                                normal: {
-                                                    show: false
-                                                }
-                                            },
-                                            data: data.value
-                                        }];
-                                        option.color = ['#df4d4b', '#304552', '#52bbc8', 'rgb(224,134,105)', '#8dd5b4', '#5eb57d', '#d78d2f'];
-                                        break;
-                                    case '1'://折线图
-                                    case '2'://柱状图
-                                        option = {
-                                            grid: {
-                                                top: '20px',
-                                                bottom: '10px',
-                                                left: '15px',
-                                                right: '15px',
-                                                containLabel: true
-                                            },
-                                            xAxis: {
-                                                type: 'category',
-                                                data: legendData
-                                            },
-                                            yAxis: {
-                                                type: 'value'
-                                            },
-                                            series: [{
-                                                data: valueData,
-                                                type: type === '1' ? 'line' : 'bar'
-                                            }]
-                                        };
-                                        break;
-                                }
-                                chartMap[data.Id].setOption(option);
-                            }
-                        });
-                    });
-                }
-            }
-
-            function refreshDeskTop(self) {
-                learun.clientdata.get('desktop', {
-                    callback: function (data) {
-                        var $desktop = $('#lr_desktop_msg_content');
-                        $desktop.html('');
-                        var logininfo = learun.storage.get('userinfo');
-                        if (logininfo.baseinfo.Description == "系统管理员") {
-                            target(data.target || [], $desktop);
-                            chart(data.chart || [], $desktop);
-                        }
-                        list(data.list || [], $desktop);
-
-                        if (self) {
-                            self.refresh(true);
-                            self.endPulldownToRefresh();
-                        }
-                    }
-                });
-            }
-
-            var page = {
-                init: function ($page) {
-                    var _html = '';
-                    //          _html += '<div class="scanner">';
-                    //          _html += '<i class="iconfont icon-scan"></i>';
-                    //          _html += '</div>';
-
-                    _html += '\
-                <div class="searchBox">\
-                    <i class="iconfont icon-search"></i>\
-                    <div class="search" >搜索应用</div>\
-                </div>';
-
-
-                    _html += '<div class="message">';
-                    _html += '<i class="iconfont icon-mail"></i>';
-                    _html += '<span class="red"></span>';
-                    _html += '</div>';
-                    $page.parent().find('.f-page-header').addClass('lr-workspace-header').html(_html).css("paddingLeft", "14px");
-                    // 点击搜索框
-                    $page.parent().find('.searchBox').on('tap', function () {
-                        learun.nav.go({ path: 'workspace/search', title: '', isBack: true, isHead: true });
-                    });
-                    // 点击消息图标
-                    $page.parent().find('.message').on('tap', function () {
-                        learun.nav.go({ path: 'message', title: '消息', isBack: true, isHead: true, type: 'right' });
-                    });
-                    // 注册扫描
-                    $page.parent().find('.scanner').on('tap', function () {
-                        learun.code.scan(function (res) {
-                            if (res.status === 'success') {
-                                learun.layer.toast(res.msg);
-                            }
-                            else {
-                                learun.layer.toast('扫描失败:' + res.msg);
-                            }
-                        });
-                    });
-                    // 图片加载
-                    learun.httpget(config.webapi + "learun/adms/desktop/imgid", null, function (data) {
-                        if (data) {
-                            var _list = [];
-                            $.each(data, function (_index, _item) {
-                                _list.push(config.webapi + "learun/adms/desktop/img?data=" + _item);
-                            });
-                            $page.find('.banner').slider({ data: _list, indicator: true, interval: 10000 });
-                        }
-                    });
-
-                    // 基础数据初始化
-                    learun.clientdata.init();
-                    refreshDeskTop();
-
-                    $scroll = $page.find('#lr_desktop_msg').pullRefresh({
-                        down: {
-                            height: 30,
-                            contentinit: '下拉可以刷新',
-                            contentdown: '下拉可以刷新',
-                            contentover: '松开立即刷新',
-                            contentrefresh: '正在刷新...',
-                            callback: function () {
-                                refreshDeskTop(this);
-                            }
-                        }
-                    });
-
-                    // 加载功能列表
-                    learun.clientdata.get('module', {
-                        callback: function (data) {
-                            learun.myModule.get(data, function (myModules) {
-                                var mylen = parseInt((myModules.length + 1) / 4) + ((myModules.length + 1) % 4 > 0 ? 1 : 0);
-                                switch (mylen) {
-                                    case 1:
-                                        $page.find('.lr-workspace-page').css('padding-top', '210px');
-                                        break;
-                                    case 2:
-                                        $page.find('.lr-workspace-page').css('padding-top', '290px');
-                                        break;
-                                    case 3:
-                                        $page.find('.lr-workspace-page').css('padding-top', '370px');
-                                        break;
-                                }
-
-                                var map = {};
-                                $.each(data, function (_index, _item) {
-                                    map[_item.F_Id] = _item;
-                                });
-                                var $appbox = $page.find('.appbox');
-                                var $last = null;
-                                $.each(myModules, function (_index, _id) {
-                                    var item = map[_id];
-                                    if (item) {
-                                        var _html = '\
-                                        <div class="appitem appitem2" data-value="'+ item.F_Id + '">\
-                                            <div><i class="'+ item.F_Icon + '"></i></div>\
-                                            <span>'+ item.F_Name + '</span>\
-                                        </div>';
-                                        var _$html = $(_html);
-                                        _$html[0].item = item;
-                                        if ($last === null) {
-                                            $appbox.prepend(_$html);
-                                        }
-                                        else {
-                                            $last.after(_$html);
-                                        }
-                                        $last = _$html;
-
-                                    }
-                                });
-                                $last = null;
-                            });
-                        }
-                    });
-                    // 注册更多功能按钮
-                    $page.find('#lr_more_app').on('tap', function () {
-                        learun.nav.go({ path: 'workspace/modulelist', title: "", type: 'right' });
-                    });
-                    // 点击功能按钮
-                    $page.delegate('.appitem2', 'tap', function () {
-                        var $this = $(this);
-                        var item = $this[0].item;
-                        if (item.F_IsSystem === 1) {// 代码开发功能
-                            learun.nav.go({ path: item.F_Url, title: item.F_Name, isBack: true, isHead: true, type: 'right' });
-                        }
-                        else {// 自定义表单开发功能
-                            learun.nav.go({ path: 'custmerform', title: item.F_Name, param: { formSchemeId: item.F_FormId, girdScheme: item.F_Scheme }, isBack: true, isHead: true, type: 'right' });
-                        }
-                        return false;
-                    });
-                },
-                reload: function ($page, pageinfo) {
-                    if (learun.isOutLogin) {// 如果是重新登录的情况刷新下桌面数据
-                        learun.isOutLogin = false;
-                        refreshDeskTop();
-                        learun.clientdata.clear('module');
-                        learun.myModule.states = -1;
-                        // 图片加载
-                        learun.httpget(config.webapi + "learun/adms/desktop/imgid", null, function (data) {
-                            if (data) {
-                                var _list = [];
-                                $.each(data, function (_index, _item) {
-                                    _list.push(config.webapi + "learun/adms/desktop/img?data=" + _item);
-                                });
-                                $page.find('.banner').after('<div class="banner"></div>').remove();
-                                $page.find('.banner').slider({ data: _list, indicator: true, interval: 10000 });
-                            }
-                        });
-                    }
-                    // 加载功能列表
-                    learun.clientdata.get('module', {
-                        callback: function (data) {
-                            learun.myModule.get(data, function (myModules) {
-                                var mylen = parseInt((myModules.length + 1) / 4) + ((myModules.length + 1) % 4 > 0 ? 1 : 0);
-                                switch (mylen) {
-                                    case 1:
-                                        $page.find('.lr-workspace-page').css('padding-top', '210px');
-                                        break;
-                                    case 2:
-                                        $page.find('.lr-workspace-page').css('padding-top', '290px');
-                                        break;
-                                    case 3:
-                                        $page.find('.lr-workspace-page').css('padding-top', '370px');
-                                        break;
-                                }
-
-                                var map = {};
-                                $.each(data, function (_index, _item) {
-                                    map[_item.F_Id] = _item;
-                                });
-                                var $appbox = $page.find('.appbox');
-                                var $last = null;
-                                $appbox.find(".appitem2").remove();
-                                $.each(myModules, function (_index, _id) {
-                                    var item = map[_id];
-                                    if (item) {
-                                        var _html = '\
-                                        <div class="appitem appitem2" data-value="'+ item.F_Id + '">\
-                                            <div><i class="'+ item.F_Icon + '"></i></div>\
-                                            <span>'+ item.F_Name + '</span>\
-                                        </div>';
-                                        var _$html = $(_html);
-                                        _$html[0].item = item;
-                                        if ($last === null) {
-                                            $appbox.prepend(_$html);
-                                        }
-                                        else {
-                                            $last.after(_$html);
-                                        }
-                                        $last = _$html;
-
-                                    }
-                                });
-                                $last = null;
-                            });
-                        }
-                    });
-                    $.each(chartMap, function (id, obj) {
-                        obj.resize();
-                    });
-                }
-            };
-            return page;
-        })();
-    })(window.jQuery, window.lrmui);</script>
-<div class="lr-workspace-page">
-    <div class="head">
-        <div class="banner"></div>
-        <!--<div class="news222">
-            <span class="left"><img src="images/notification.png" alt=""></span>
-            <span class="middle">年中全新升级，数字化智慧校园</span>
-            <span class="right">更多</span>
-        </div>-->
-    </div>
-    <div class="appbox">
-        <div class="appitem" id="lr_more_app">
-            <div style="background-color:#CCC"><i class="iconfont icon-cascades"></i></div>
-            <span>更多</span>
-        </div>
-    </div>
-    <div class="lr-desktop-msg" id="lr_desktop_msg">
-        <div id="lr_desktop_msg_content" style="padding-top:10px;">
-        </div>
-    </div>
-</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.49721.13.2020-01-09.14-19-29.6038

@@ -1,465 +0,0 @@
-<script type="text/javascript">
-    (function ($, learun) {
-        learun.nav.data["workspace"].jsObj = (function () {
-
-            var custmerform = {};
-            var $scroll = '';
-
-            // 统计数据
-            function target(data, $desktop) {
-                if (data.length > 0) {
-                    var _html = '\
-            <div class="lr-black-panel">\
-                <div class="lr-title">统计数据</div>\
-                <div class="lr-content lr-flex-content">\
-                </div>\
-            </div>';
-                    $desktop.append(_html);
-                    var $content = $desktop.find('.lr-flex-content');
-                    $.each(data, function (_index, _item) {
-                        var _itemHtml = '\
-                    <div class="targetItem">\
-                        <div class="name">'+ _item.F_Name + '</div>\
-                        <div class="number" data-number="'+ _item.F_Id + '" ></div>\
-                    </div>';
-                        $content.append(_itemHtml);
-                        // 获取后台数据
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'Target', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                $('[data-number="' + data.Id + '"]').text(data.value);
-                            }
-                        });
-
-                    });
-
-                }
-            }
-            // 列表数据
-            function list(data, $desktop) {
-                if (data.length > 0) {
-                    $.each(data, function (_index, _item) {
-                        var _html = '\
-                <div class="lr-black-panel">\
-                    <div class="lr-title">'+ _item.F_Name + '</div>\
-                    <div class="lr-content" data-desktop="'+ _item.F_Id + '" ></div>\
-                </div>';
-                        $desktop.append(_html);
-
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                var $list = $('[data-desktop="' + data.Id + '"]');
-                                //待办
-                                if (_item.F_Name == '待办事项') {
-                                    $list.prev().on('tap',
-                                        function () {
-                                            learun.nav.go({
-                                                path: 'nworkflow/myflow',
-                                                title: '待办事项',
-                                                param: '',
-                                                type: 'right'
-                                            });
-                                        });
-                                }
-                                else {
-                                    $list.prev().on('tap',
-                                        function () {
-                                            learun.nav.go({
-                                                path: 'LR_OAModule/Notice',
-                                                title: '查看详情',
-                                                param: (_item.F_Url.indexOf('=') != -1 ? _item.F_Url.substr(_item.F_Url.indexOf('=')+ 1):''),
-                                                type: 'right'
-                                            });
-                                        });
-                                }
-                                $.each(data.value, function (_j, _jitem) {
-                                    var _itemHtml = '\
-                                <div class="lr-list-item lr-dtlist-item">\
-                                    <div class="lr-ellipsis">'+ _jitem.f_title + '</div>\
-                                    <div class="date">'+ learun.date.format(_jitem.f_time, 'yyyy-MM-dd') + '</div>\
-                                </div>';
-                                    var _$itemHtml = $(_itemHtml);
-                                    _$itemHtml[0].item = _jitem;
-                                    $list.append(_$itemHtml);
-                                });
-                                $list.find('.lr-dtlist-item').on('tap', function () {
-                                    var item = $(this)[0].item;
-                                    if (item.f_processname == undefined || item.f_processname == null || item.f_processname == '')
-                                        learun.nav.go({ path: 'workspace/listdetaile', title: '详情', param: item, type: 'right' });
-                                    else
-                                        learun.nav.go({ path: 'nworkflow/audit', title: item.f_processname, type: 'right', param: { processId: item.f_processid, taskId: item.f_id } });
-                                });
-
-                                $list = null;
-                            }
-                        });
-                    });
-                }
-            }
-            var chartMap = {};
-            // 图表数据
-            function chart(data, $desktop) {
-
-                if (data.length > 0) {
-                    chartMap = {};
-                    $.each(data, function (_index, _item) {
-                        var _html = '\
-                <div class="lr-black-panel">\
-                    <div class="lr-title">'+ _item.F_Name + '</div>\
-                    <div class="lr-content lr-chart-content">\
-                        <div class="lr-chart-container" id="'+ _item.F_Id + '"  data-desktop="' + _item.F_Type + '" ></div>\
-                    </div>\
-                </div>';
-
-                        $desktop.append(_html);
-                        chartMap[_item.F_Id] = echarts.init(document.getElementById(_item.F_Id));
-
-                        // 获取后台数据
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'chart', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                var type = $('#' + data.Id).attr('data-desktop');
-                                var legendData = [];
-                                var valueData = [];
-                                $.each(data.value, function (_index, _item) {
-                                    legendData.push(_item.name);
-                                    valueData.push(_item.value);
-                                });
-
-                                var option = {};
-                                switch (type) {
-                                    case '0'://饼图
-                                        option.tooltip = {
-                                            trigger: 'item',
-                                            formatter: "{a} <br/>{b}: {c} ({d}%)"
-                                        };
-
-                                        option.legend = {
-                                            orient: 'vertical',
-                                            left: 'left',
-                                            data: legendData
-                                        };
-                                        option.series = [{
-                                            name: '占比',
-                                            type: 'pie',
-                                            radius: ['50%', '70%'],
-                                            avoidLabelOverlap: false,
-                                            label: {
-                                                normal: {
-                                                    show: false,
-                                                    position: 'center'
-                                                },
-                                                emphasis: {
-                                                    show: true,
-                                                    textStyle: {
-                                                        fontSize: '30',
-                                                        fontWeight: 'bold'
-                                                    }
-                                                }
-                                            },
-                                            labelLine: {
-                                                normal: {
-                                                    show: false
-                                                }
-                                            },
-                                            data: data.value
-                                        }];
-                                        option.color = ['#df4d4b', '#304552', '#52bbc8', 'rgb(224,134,105)', '#8dd5b4', '#5eb57d', '#d78d2f'];
-                                        break;
-                                    case '1'://折线图
-                                    case '2'://柱状图
-                                        option = {
-                                            grid: {
-                                                top: '20px',
-                                                bottom: '10px',
-                                                left: '15px',
-                                                right: '15px',
-                                                containLabel: true
-                                            },
-                                            xAxis: {
-                                                type: 'category',
-                                                data: legendData
-                                            },
-                                            yAxis: {
-                                                type: 'value'
-                                            },
-                                            series: [{
-                                                data: valueData,
-                                                type: type === '1' ? 'line' : 'bar'
-                                            }]
-                                        };
-                                        break;
-                                }
-                                chartMap[data.Id].setOption(option);
-                            }
-                        });
-                    });
-                }
-            }
-
-            function refreshDeskTop(self) {
-                learun.clientdata.get('desktop', {
-                    callback: function (data) {
-                        var $desktop = $('#lr_desktop_msg_content');
-                        $desktop.html('');
-                        var logininfo = learun.storage.get('userinfo');
-                        //if (logininfo.baseinfo.Description != "学生") {
-                        //    target(data.target || [], $desktop);
-                        //    chart(data.chart || [], $desktop);
-                        //}
-                        list(data.list || [], $desktop);
-
-                        if (self) {
-                            self.refresh(true);
-                            self.endPulldownToRefresh();
-                        }
-                    }
-                });
-            }
-
-            var page = {
-                init: function ($page) {
-                    var _html = '';
-                    //          _html += '<div class="scanner">';
-                    //          _html += '<i class="iconfont icon-scan"></i>';
-                    //          _html += '</div>';
-
-                    _html += '\
-                <div class="searchBox">\
-                    <i class="iconfont icon-search"></i>\
-                    <div class="search" >搜索应用</div>\
-                </div>';
-
-
-                    _html += '<div class="message">';
-                    _html += '<i class="iconfont icon-mail"></i>';
-                    _html += '<span class="red"></span>';
-                    _html += '</div>';
-                    $page.parent().find('.f-page-header').addClass('lr-workspace-header').html(_html).css("paddingLeft", "14px");
-                    // 点击搜索框
-                    $page.parent().find('.searchBox').on('tap', function () {
-                        learun.nav.go({ path: 'workspace/search', title: '', isBack: true, isHead: true });
-                    });
-                    // 点击消息图标
-                    $page.parent().find('.message').on('tap', function () {
-                        learun.nav.go({ path: 'message', title: '消息', isBack: true, isHead: true, type: 'right' });
-                    });
-                    // 注册扫描
-                    $page.parent().find('.scanner').on('tap', function () {
-                        learun.code.scan(function (res) {
-                            if (res.status === 'success') {
-                                learun.layer.toast(res.msg);
-                            }
-                            else {
-                                learun.layer.toast('扫描失败:' + res.msg);
-                            }
-                        });
-                    });
-                    // 图片加载
-                    learun.httpget(config.webapi + "learun/adms/desktop/imgid", null, function (data) {
-                        if (data) {
-                            var _list = [];
-                            $.each(data, function (_index, _item) {
-                                _list.push(config.webapi + "learun/adms/desktop/img?data=" + _item);
-                            });
-                            $page.find('.banner').slider({ data: _list, indicator: true, interval: 10000 });
-                        }
-                    });
-
-                    // 基础数据初始化
-                    learun.clientdata.init();
-                    refreshDeskTop();
-
-                    $scroll = $page.find('#lr_desktop_msg').pullRefresh({
-                        down: {
-                            height: 30,
-                            contentinit: '下拉可以刷新',
-                            contentdown: '下拉可以刷新',
-                            contentover: '松开立即刷新',
-                            contentrefresh: '正在刷新...',
-                            callback: function () {
-                                refreshDeskTop(this);
-                            }
-                        }
-                    });
-
-                    // 加载功能列表
-                    learun.clientdata.get('module', {
-                        callback: function (data) {
-                            learun.myModule.get(data, function (myModules) {
-                                var mylen = parseInt((myModules.length + 1) / 4) + ((myModules.length + 1) % 4 > 0 ? 1 : 0);
-                                switch (mylen) {
-                                    case 1:
-                                        $page.find('.lr-workspace-page').css('padding-top', '210px');
-                                        break;
-                                    case 2:
-                                        $page.find('.lr-workspace-page').css('padding-top', '290px');
-                                        break;
-                                    case 3:
-                                        $page.find('.lr-workspace-page').css('padding-top', '370px');
-                                        break;
-                                }
-
-                                var map = {};
-                                $.each(data, function (_index, _item) {
-                                    map[_item.F_Id] = _item;
-                                });
-                                var $appbox = $page.find('.appbox');
-                                var $last = null;
-
-                                $.each(myModules, function (_index, _id) {
-                                    var item = map[_id];
-                                    if (item) {
-
-                                        var Tips = ''; //审批 提示脚标
-                                        if (item.F_Id == '49b3860f-a2ec-4677-b863-fb611604c477') {
-                                            var tipCount = 0;
-                                            learun.httpgetnosy(config.webapi + "learun/adms/desktop/data", { type: 'list', id: '33d50f1a-a64d-4b86-a6d4-2d937226de95' }, function (data) {
-                                                if (data) {
-                                                    tipCount = data.value.length;
-                                                }
-                                            });
-                                            Tips = '<span style="position: absolute;top: -4px;right: -3px;width: 20px;height: 20px;background: #f86c61;border-radius: 50%;line-height: 20px;color: #fff;font-size: 12px;">' + tipCount + '</span>';
-                                        }
-                                        var _html = '\
-                                        <div class="appitem appitem2" data-value="'+ item.F_Id + '">\
-                                            <div style="position:relative;">'+ Tips + '<i class="' + item.F_Icon + '"></i></div>\
-                                            <span>'+ item.F_Name + '</span>\
-                                        </div>';
-                                        var _$html = $(_html);
-                                        _$html[0].item = item;
-                                        if ($last === null) {
-                                            $appbox.prepend(_$html);
-                                        }
-                                        else {
-                                            $last.after(_$html);
-                                        }
-                                        $last = _$html;
-
-                                    }
-                                });
-                                $last = null;
-                            });
-                        }
-                    });
-                    // 注册更多功能按钮
-                    $page.find('#lr_more_app').on('tap', function () {
-                        learun.nav.go({ path: 'workspace/modulelist', title: "", type: 'right' });
-                    });
-                    // 点击功能按钮
-                    $page.delegate('.appitem2', 'tap', function () {
-                        var $this = $(this);
-                        var item = $this[0].item;
-                        if (item.F_IsSystem === 1) {// 代码开发功能
-                            learun.nav.go({ path: item.F_Url, title: item.F_Name, isBack: true, isHead: true, type: 'right' });
-                        }
-                        else {// 自定义表单开发功能
-
-                            learun.nav.go({ path: 'custmerform', title: item.F_Name, param: { formSchemeId: item.F_FormId, girdScheme: item.F_Scheme }, isBack: true, isHead: true, type: 'right' });
-                        }
-                        return false;
-                    });
-                },
-                reload: function ($page, pageinfo) {
-                    if (learun.isOutLogin) {// 如果是重新登录的情况刷新下桌面数据
-                        learun.isOutLogin = false;
-                        refreshDeskTop();
-                        learun.clientdata.clear('module');
-                        learun.myModule.states = -1;
-                        // 图片加载
-                        learun.httpget(config.webapi + "learun/adms/desktop/imgid", null, function (data) {
-                            if (data) {
-                                var _list = [];
-                                $.each(data, function (_index, _item) {
-                                    _list.push(config.webapi + "learun/adms/desktop/img?data=" + _item);
-                                });
-                                $page.find('.banner').after('<div class="banner"></div>').remove();
-                                $page.find('.banner').slider({ data: _list, indicator: true, interval: 10000 });
-                            }
-                        });
-                    }
-                    // 加载功能列表
-                    learun.clientdata.get('module', {
-                        callback: function (data) {
-                            learun.myModule.get(data, function (myModules) {
-                                var mylen = parseInt((myModules.length + 1) / 4) + ((myModules.length + 1) % 4 > 0 ? 1 : 0);
-                                switch (mylen) {
-                                    case 1:
-                                        $page.find('.lr-workspace-page').css('padding-top', '210px');
-                                        break;
-                                    case 2:
-                                        $page.find('.lr-workspace-page').css('padding-top', '290px');
-                                        break;
-                                    case 3:
-                                        $page.find('.lr-workspace-page').css('padding-top', '370px');
-                                        break;
-                                }
-
-                                var map = {};
-                                $.each(data, function (_index, _item) {
-                                    map[_item.F_Id] = _item;
-                                });
-                                var $appbox = $page.find('.appbox');
-                                var $last = null;
-                                $appbox.find(".appitem2").remove();
-                                $.each(myModules, function (_index, _id) {
-                                    var item = map[_id];
-                                    if (item) {
-
-                                        var Tips = ''; //审批 提示脚标
-                                        if (item.F_Id == '49b3860f-a2ec-4677-b863-fb611604c477') {
-                                            var tipCount = 0;
-                                            learun.httpgetnosy(config.webapi + "learun/adms/desktop/data", { type: 'list', id: '33d50f1a-a64d-4b86-a6d4-2d937226de95' }, function (data) {
-                                                if (data) {
-                                                    tipCount = data.value.length;
-                                                }
-                                            });
-                                            Tips = '<span style="position: absolute;top: -4px;right: -3px;width: 20px;height: 20px;background: #f86c61;border-radius: 50%;line-height: 20px;color: #fff;font-size: 12px;">' + tipCount + '</span>';
-                                        }
-                                        var _html = '\
-                                        <div class="appitem appitem2" data-value="'+ item.F_Id + '">\
-                                            <div style="position: relative;">'+ Tips + '<i class="' + item.F_Icon + '"></i></div>\
-                                            <span>'+ item.F_Name + '</span>\
-                                        </div>';
-                                        var _$html = $(_html);
-                                        _$html[0].item = item;
-                                        if ($last === null) {
-                                            $appbox.prepend(_$html);
-                                        }
-                                        else {
-                                            $last.after(_$html);
-                                        }
-                                        $last = _$html;
-
-                                    }
-                                });
-                                $last = null;
-                            });
-                        }
-                    });
-                    $.each(chartMap, function (id, obj) {
-                        obj.resize();
-                    });
-                }
-            };
-            return page;
-        })();
-    })(window.jQuery, window.lrmui);</script>
-<div class="lr-workspace-page">
-    <div class="head">
-        <div class="banner"></div>
-        <!--<div class="news222">
-            <span class="left"><img src="images/notification.png" alt=""></span>
-            <span class="middle">年中全新升级，数字化智慧校园</span>
-            <span class="right">更多</span>
-        </div>-->
-    </div>
-    <div class="appbox">
-        <div class="appitem" id="lr_more_app">
-            <div style="background-color:#CCC"><i class="iconfont icon-cascades"></i></div>
-            <span>更多</span>
-        </div>
-    </div>
-    <div class="lr-desktop-msg" id="lr_desktop_msg">
-        <div id="lr_desktop_msg_content" style="padding-top:10px;">
-        </div>
-    </div>
-</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/_sgbak/workspace.html.49721.13.2020-01-15.16-31-23.1336

@@ -1,465 +0,0 @@
-<script type="text/javascript">
-    (function ($, learun) {
-        learun.nav.data["workspace"].jsObj = (function () {
-
-            var custmerform = {};
-            var $scroll = '';
-
-            // 统计数据
-            function target(data, $desktop) {
-                if (data.length > 0) {
-                    var _html = '\
-            <div class="lr-black-panel">\
-                <div class="lr-title">统计数据</div>\
-                <div class="lr-content lr-flex-content">\
-                </div>\
-            </div>';
-                    $desktop.append(_html);
-                    var $content = $desktop.find('.lr-flex-content');
-                    $.each(data, function (_index, _item) {
-                        var _itemHtml = '\
-                    <div class="targetItem">\
-                        <div class="name">'+ _item.F_Name + '</div>\
-                        <div class="number" data-number="'+ _item.F_Id + '" ></div>\
-                    </div>';
-                        $content.append(_itemHtml);
-                        // 获取后台数据
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'Target', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                $('[data-number="' + data.Id + '"]').text(data.value);
-                            }
-                        });
-
-                    });
-
-                }
-            }
-            // 列表数据
-            function list(data, $desktop) {
-                if (data.length > 0) {
-                    $.each(data, function (_index, _item) {
-                        var _html = '\
-                <div class="lr-black-panel">\
-                    <div class="lr-title">'+ _item.F_Name + '</div>\
-                    <div class="lr-content" data-desktop="'+ _item.F_Id + '" ></div>\
-                </div>';
-                        $desktop.append(_html);
-
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                var $list = $('[data-desktop="' + data.Id + '"]');
-                                //待办
-                                if (_item.F_Name == '待办事项') {
-                                    $list.prev().on('tap',
-                                        function () {
-                                            learun.nav.go({
-                                                path: 'nworkflow/myflow',
-                                                title: '待办事项',
-                                                param: '',
-                                                type: 'right'
-                                            });
-                                        });
-                                }
-                                else {
-                                    $list.prev().on('tap',
-                                        function () {
-                                            learun.nav.go({
-                                                path: 'LR_OAModule/Notice',
-                                                title: '查看详情',
-                                                param: (_item.F_Url.indexOf('=') != -1 ? _item.F_Url.substr(_item.F_Url.indexOf('=')+ 1):''),
-                                                type: 'right'
-                                            });
-                                        });
-                                }
-                                $.each(data.value, function (_j, _jitem) {
-                                    var _itemHtml = '\
-                                <div class="lr-list-item lr-dtlist-item">\
-                                    <div class="lr-ellipsis">'+ _jitem.f_title + '</div>\
-                                    <div class="date">'+ learun.date.format(_jitem.f_time, 'yyyy-MM-dd') + '</div>\
-                                </div>';
-                                    var _$itemHtml = $(_itemHtml);
-                                    _$itemHtml[0].item = _jitem;
-                                    $list.append(_$itemHtml);
-                                });
-                                $list.find('.lr-dtlist-item').on('tap', function () {
-                                    var item = $(this)[0].item;
-                                    if (item.f_processname == undefined || item.f_processname == null || item.f_processname == '')
-                                        learun.nav.go({ path: 'workspace/listdetaile', title: '详情', param: item, type: 'right' });
-                                    else
-                                        learun.nav.go({ path: 'nworkflow/audit', title: item.f_processname, type: 'right', param: { processId: item.f_processid, taskId: item.f_id } });
-                                });
-
-                                $list = null;
-                            }
-                        });
-                    });
-                }
-            }
-            var chartMap = {};
-            // 图表数据
-            function chart(data, $desktop) {
-
-                if (data.length > 0) {
-                    chartMap = {};
-                    $.each(data, function (_index, _item) {
-                        var _html = '\
-                <div class="lr-black-panel">\
-                    <div class="lr-title">'+ _item.F_Name + '</div>\
-                    <div class="lr-content lr-chart-content">\
-                        <div class="lr-chart-container" id="'+ _item.F_Id + '"  data-desktop="' + _item.F_Type + '" ></div>\
-                    </div>\
-                </div>';
-
-                        $desktop.append(_html);
-                        chartMap[_item.F_Id] = echarts.init(document.getElementById(_item.F_Id));
-
-                        // 获取后台数据
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'chart', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                var type = $('#' + data.Id).attr('data-desktop');
-                                var legendData = [];
-                                var valueData = [];
-                                $.each(data.value, function (_index, _item) {
-                                    legendData.push(_item.name);
-                                    valueData.push(_item.value);
-                                });
-
-                                var option = {};
-                                switch (type) {
-                                    case '0'://饼图
-                                        option.tooltip = {
-                                            trigger: 'item',
-                                            formatter: "{a} <br/>{b}: {c} ({d}%)"
-                                        };
-
-                                        option.legend = {
-                                            orient: 'vertical',
-                                            left: 'left',
-                                            data: legendData
-                                        };
-                                        option.series = [{
-                                            name: '占比',
-                                            type: 'pie',
-                                            radius: ['50%', '70%'],
-                                            avoidLabelOverlap: false,
-                                            label: {
-                                                normal: {
-                                                    show: false,
-                                                    position: 'center'
-                                                },
-                                                emphasis: {
-                                                    show: true,
-                                                    textStyle: {
-                                                        fontSize: '30',
-                                                        fontWeight: 'bold'
-                                                    }
-                                                }
-                                            },
-                                            labelLine: {
-                                                normal: {
-                                                    show: false
-                                                }
-                                            },
-                                            data: data.value
-                                        }];
-                                        option.color = ['#df4d4b', '#304552', '#52bbc8', 'rgb(224,134,105)', '#8dd5b4', '#5eb57d', '#d78d2f'];
-                                        break;
-                                    case '1'://折线图
-                                    case '2'://柱状图
-                                        option = {
-                                            grid: {
-                                                top: '20px',
-                                                bottom: '10px',
-                                                left: '15px',
-                                                right: '15px',
-                                                containLabel: true
-                                            },
-                                            xAxis: {
-                                                type: 'category',
-                                                data: legendData
-                                            },
-                                            yAxis: {
-                                                type: 'value'
-                                            },
-                                            series: [{
-                                                data: valueData,
-                                                type: type === '1' ? 'line' : 'bar'
-                                            }]
-                                        };
-                                        break;
-                                }
-                                chartMap[data.Id].setOption(option);
-                            }
-                        });
-                    });
-                }
-            }
-
-            function refreshDeskTop(self) {
-                learun.clientdata.get('desktop', {
-                    callback: function (data) {
-                        var $desktop = $('#lr_desktop_msg_content');
-                        $desktop.html('');
-                        var logininfo = learun.storage.get('userinfo');
-                        //if (logininfo.baseinfo.Description != "学生") {
-                        //    target(data.target || [], $desktop);
-                        //    chart(data.chart || [], $desktop);
-                        //}
-                        list(data.list || [], $desktop);
-
-                        if (self) {
-                            self.refresh(true);
-                            self.endPulldownToRefresh();
-                        }
-                    }
-                });
-            }
-
-            var page = {
-                init: function ($page) {
-                    var _html = '';
-                    //          _html += '<div class="scanner">';
-                    //          _html += '<i class="iconfont icon-scan"></i>';
-                    //          _html += '</div>';
-
-                    _html += '\
-                <div class="searchBox">\
-                    <i class="iconfont icon-search"></i>\
-                    <div class="search" >搜索应用</div>\
-                </div>';
-
-
-                    _html += '<div class="message">';
-                    _html += '<i class="iconfont icon-mail"></i>';
-                    _html += '<span class="red"></span>';
-                    _html += '</div>';
-                    $page.parent().find('.f-page-header').addClass('lr-workspace-header').html(_html).css("paddingLeft", "14px");
-                    // 点击搜索框
-                    $page.parent().find('.searchBox').on('tap', function () {
-                        learun.nav.go({ path: 'workspace/search', title: '', isBack: true, isHead: true });
-                    });
-                    // 点击消息图标
-                    $page.parent().find('.message').on('tap', function () {
-                        learun.nav.go({ path: 'message', title: '消息', isBack: true, isHead: true, type: 'right' });
-                    });
-                    // 注册扫描
-                    $page.parent().find('.scanner').on('tap', function () {
-                        learun.code.scan(function (res) {
-                            if (res.status === 'success') {
-                                learun.layer.toast(res.msg);
-                            }
-                            else {
-                                learun.layer.toast('扫描失败:' + res.msg);
-                            }
-                        });
-                    });
-                    // 图片加载
-                    learun.httpget(config.webapi + "learun/adms/desktop/imgid", null, function (data) {
-                        if (data) {
-                            var _list = [];
-                            $.each(data, function (_index, _item) {
-                                _list.push(config.webapi + "learun/adms/desktop/img?data=" + _item);
-                            });
-                            $page.find('.banner').slider({ data: _list, indicator: true, interval: 10000 });
-                        }
-                    });
-
-                    // 基础数据初始化
-                    learun.clientdata.init();
-                    refreshDeskTop();
-
-                    $scroll = $page.find('#lr_desktop_msg').pullRefresh({
-                        down: {
-                            height: 30,
-                            contentinit: '下拉可以刷新',
-                            contentdown: '下拉可以刷新',
-                            contentover: '松开立即刷新',
-                            contentrefresh: '正在刷新...',
-                            callback: function () {
-                                refreshDeskTop(this);
-                            }
-                        }
-                    });
-
-                    // 加载功能列表
-                    learun.clientdata.get('module', {
-                        callback: function (data) {
-                            learun.myModule.get(data, function (myModules) {
-                                var mylen = parseInt((myModules.length + 1) / 4) + ((myModules.length + 1) % 4 > 0 ? 1 : 0);
-                                switch (mylen) {
-                                    case 1:
-                                        $page.find('.lr-workspace-page').css('padding-top', '210px');
-                                        break;
-                                    case 2:
-                                        $page.find('.lr-workspace-page').css('padding-top', '290px');
-                                        break;
-                                    case 3:
-                                        $page.find('.lr-workspace-page').css('padding-top', '370px');
-                                        break;
-                                }
-
-                                var map = {};
-                                $.each(data, function (_index, _item) {
-                                    map[_item.F_Id] = _item;
-                                });
-                                var $appbox = $page.find('.appbox');
-                                var $last = null;
-
-                                $.each(myModules, function (_index, _id) {
-                                    var item = map[_id];
-                                    if (item) {
-
-                                        var Tips = ''; //审批 提示脚标
-                                        if (item.F_Id == '49b3860f-a2ec-4677-b863-fb611604c477') {
-                                            var tipCount = 0;
-                                            learun.httpgetnosy(config.webapi + "learun/adms/desktop/data", { type: 'list', id: '33d50f1a-a64d-4b86-a6d4-2d937226de95' }, function (data) {
-                                                if (data) {
-                                                    tipCount = data.value.length;
-                                                }
-                                            });
-                                            Tips = '<span style="position: absolute;top: -4px;right: -3px;width: 20px;height: 20px;background: #f86c61;border-radius: 50%;line-height: 20px;color: #fff;font-size: 12px;">' + tipCount + '</span>';
-                                        }
-                                        var _html = '\
-                                        <div class="appitem appitem2" data-value="'+ item.F_Id + '">\
-                                            <div style="position:relative;">'+ Tips + '<i class="' + item.F_Icon + '"></i></div>\
-                                            <span>'+ item.F_Name + '</span>\
-                                        </div>';
-                                        var _$html = $(_html);
-                                        _$html[0].item = item;
-                                        if ($last === null) {
-                                            $appbox.prepend(_$html);
-                                        }
-                                        else {
-                                            $last.after(_$html);
-                                        }
-                                        $last = _$html;
-
-                                    }
-                                });
-                                $last = null;
-                            });
-                        }
-                    });
-                    // 注册更多功能按钮
-                    $page.find('#lr_more_app').on('tap', function () {
-                        learun.nav.go({ path: 'workspace/modulelist', title: "", type: 'right' });
-                    });
-                    // 点击功能按钮
-                    $page.delegate('.appitem2', 'tap', function () {
-                        var $this = $(this);
-                        var item = $this[0].item;
-                        if (item.F_IsSystem === 1) {// 代码开发功能
-                            learun.nav.go({ path: item.F_Url, title: item.F_Name, isBack: true, isHead: true, type: 'right' });
-                        }
-                        else {// 自定义表单开发功能
-
-                            learun.nav.go({ path: 'custmerform', title: item.F_Name, param: { formSchemeId: item.F_FormId, girdScheme: item.F_Scheme }, isBack: true, isHead: true, type: 'right' });
-                        }
-                        return false;
-                    });
-                },
-                reload: function ($page, pageinfo) {
-                    if (learun.isOutLogin) {// 如果是重新登录的情况刷新下桌面数据
-                        learun.isOutLogin = false;
-                        refreshDeskTop();
-                        learun.clientdata.clear('module');
-                        learun.myModule.states = -1;
-                        // 图片加载
-                        learun.httpget(config.webapi + "learun/adms/desktop/imgid", null, function (data) {
-                            if (data) {
-                                var _list = [];
-                                $.each(data, function (_index, _item) {
-                                    _list.push(config.webapi + "learun/adms/desktop/img?data=" + _item);
-                                });
-                                $page.find('.banner').after('<div class="banner"></div>').remove();
-                                $page.find('.banner').slider({ data: _list, indicator: true, interval: 10000 });
-                            }
-                        });
-                    }
-                    // 加载功能列表
-                    learun.clientdata.get('module', {
-                        callback: function (data) {
-                            learun.myModule.get(data, function (myModules) {
-                                var mylen = parseInt((myModules.length + 1) / 4) + ((myModules.length + 1) % 4 > 0 ? 1 : 0);
-                                switch (mylen) {
-                                    case 1:
-                                        $page.find('.lr-workspace-page').css('padding-top', '210px');
-                                        break;
-                                    case 2:
-                                        $page.find('.lr-workspace-page').css('padding-top', '290px');
-                                        break;
-                                    case 3:
-                                        $page.find('.lr-workspace-page').css('padding-top', '370px');
-                                        break;
-                                }
-
-                                var map = {};
-                                $.each(data, function (_index, _item) {
-                                    map[_item.F_Id] = _item;
-                                });
-                                var $appbox = $page.find('.appbox');
-                                var $last = null;
-                                $appbox.find(".appitem2").remove();
-                                $.each(myModules, function (_index, _id) {
-                                    var item = map[_id];
-                                    if (item) {
-
-                                        var Tips = ''; //审批 提示脚标
-                                        if (item.F_Id == '49b3860f-a2ec-4677-b863-fb611604c477') {
-                                            var tipCount = 0;
-                                            learun.httpgetnosy(config.webapi + "learun/adms/desktop/data", { type: 'list', id: '33d50f1a-a64d-4b86-a6d4-2d937226de95' }, function (data) {
-                                                if (data) {
-                                                    tipCount = data.value.length;
-                                                }
-                                            });
-                                            Tips = '<span style="position: absolute;top: -4px;right: -3px;width: 20px;height: 20px;background: #f86c61;border-radius: 50%;line-height: 20px;color: #fff;font-size: 12px;">' + tipCount + '</span>';
-                                        }
-                                        var _html = '\
-                                        <div class="appitem appitem2" data-value="'+ item.F_Id + '">\
-                                            <div style="position: relative;">'+ Tips + '<i class="' + item.F_Icon + '"></i></div>\
-                                            <span>'+ item.F_Name + '</span>\
-                                        </div>';
-                                        var _$html = $(_html);
-                                        _$html[0].item = item;
-                                        if ($last === null) {
-                                            $appbox.prepend(_$html);
-                                        }
-                                        else {
-                                            $last.after(_$html);
-                                        }
-                                        $last = _$html;
-
-                                    }
-                                });
-                                $last = null;
-                            });
-                        }
-                    });
-                    $.each(chartMap, function (id, obj) {
-                        obj.resize();
-                    });
-                }
-            };
-            return page;
-        })();
-    })(window.jQuery, window.lrmui);</script>
-<div class="lr-workspace-page">
-    <div class="head">
-        <div class="banner"></div>
-        <!--<div class="news222">
-            <span class="left"><img src="images/notification.png" alt=""></span>
-            <span class="middle">年中全新升级，数字化智慧校园</span>
-            <span class="right">更多</span>
-        </div>-->
-    </div>
-    <div class="appbox">
-        <div class="appitem" id="lr_more_app">
-            <div style="background-color:#CCC"><i class="iconfont icon-cascades"></i></div>
-            <span>更多</span>
-        </div>
-    </div>
-    <div class="lr-desktop-msg" id="lr_desktop_msg">
-        <div id="lr_desktop_msg_content" style="padding-top:10px;">
-        </div>
-    </div>
-</div>

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

@@ -217,6 +217,10 @@
 
             var page = {
                 init: function ($page) {
+                    //主被动修改密码判断
+                    if (learun.storage.get('pwd') === true) {
+                        learun.nav.go({ path: 'my/modifypassword', isBack: false, isHead: true, title:'修改密码' });
+                    }
                     var _html = '';
                     //          _html += '<div class="scanner">';
                     //          _html += '<i class="iconfont icon-scan"></i>';

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

@@ -6,6 +6,7 @@
 
     var page = {
         init: function ($page) {
+          
             var _html = '';
             _html += '<div class="scanner">';
             _html += '<i class="iconfont icon-scan"></i>';

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/_sgbak/learun-custmerform.js.26692.2.2020-08-04.14-24-39.5824

@@ -1,838 +0,0 @@
-/*
- * 版 本 Learun-ADMS V7.0.0 数字化智慧校园(http://www.learun.cn)
- * Copyright (c) 2013-2017 北京泉江科技有限公司
- * 创建人：数字化智慧校园-前端开发组
- * 日 期：2018.7.12
- * 描 述：数字化智慧校园移动端框架(ADMS) 自定义表单
- */
-
-(function ($, learun, window) {
-    // 加载自定义表单模板
-    learun.custmerform = {
-        loadScheme: function (schemeIds, callback) {// formIds表单主键集合,callback回调函数
-            if (learun.type(schemeIds) === 'string') {
-                schemeIds = [schemeIds];
-            }
-
-            var req = [];
-            var scheme = {};
-            $.each(schemeIds, function (_index, _item) {
-                var formId = 'lrform' + _item;
-                var formScheme = learun.storage.get(formId);// 从缓存中获取表单模板数据
-                if (!formScheme) {
-                    req.push({ id: _item, ver: "" });
-                }
-                else {
-                    scheme[_item] = JSON.parse(formScheme.content);
-                    req.push({ id: _item, ver: formScheme.ver });
-                }
-            });
-            // 加载自定义表单模板
-            learun.httpget(config.webapi + "learun/adms/form/scheme", req, (data) => {
-                if (data) {
-                    $.each(data, function (_index, _item) {
-                        scheme[_index] = JSON.parse(_item.F_Scheme);
-                        var formScheme = { ver: _item.F_Id, content: _item.F_Scheme };
-                        learun.storage.set('lrform' + _index,formScheme);
-                    });
-                }
-                callback(scheme);
-            });
-        }
-    };
-    // 自定义表单初始化
-    $.fn.custmerform = function (formScheme) {
-        var $this = $(this);
-        $this.scroll();
-        var $container = $this.find('.f-scroll');
-
-        $.each(formScheme, function (_id, _scheme) {
-            custmerformRender($container, _scheme.data, _id);
-        });
-        $this = null;
-        $container = null;
-    };
-    // 获取自定义表单数据
-    $.fn.custmerformGet = function () {
-        var res = {};
-        var validateflag = true;
-        $(this).find('.lrcomponts').each(function () {
-            var $this = $(this);
-            var schemeInfoId = $this.attr('data-id');
-            var _componts = $this[0].componts;
-            res[schemeInfoId] = res[schemeInfoId] || {};
-            // 遍历自定义表单控件
-            $.each(_componts, function (_index, _item) {
-                var _fn = componts[_item.type].get;
-                if (_fn) {
-                    var compontData = _fn(_item, $this);
-                    if (compontData.isHad) {
-                        if (_item.verify) {
-                            var checkfn = window.fui.validator['is' + _item.verify];
-                            var r = checkfn(compontData.value);
-                            if (!r.code) {
-                                validateflag = false;
-                                window.fui.dialog({ msg: r.msg });
-                                return false;
-                            }
-                        }
-                        res[schemeInfoId][_item.id] = compontData.value;
-                    }
-                }
-            });
-            $this = null;
-            if (!validateflag) {
-                return false;
-            }
-        });
-        if (!validateflag) {
-            return null;
-        }
-        return res;
-    };
-    // 设置自定义表单数据
-    $.fn.custmerformSet = function (data) {
-        var $this = $(this);
-        function set($this, data) {
-            if ($this.find('.lrcomponts').length > 0) {
-                $this.find('.lrcomponts').each(function () {
-                    var $this = $(this);
-                    var schemeInfoId = $this.attr('data-id');
-                    var _componts = $this[0].componts;
-                    var _data = {};
-                    $.each(data[schemeInfoId] || [], function (_index, _item) {
-                        $.each(_item[0] || [], function (_id, _jitem) {
-                            _data[_index.toLowerCase() + _id] = _jitem;
-                        });
-                    });
-                    // 遍历自定义表单控件
-                    $.each(_componts, function (_index, _item) {
-                        var _fn = componts[_item.type].set;
-                        if (_fn) {
-                            if (_item.table && _item.field) {
-                                _fn(_item, _data[(_item.table + _item.field).toLowerCase()], $this);
-                            }
-                            else if (_item.table){// 表格
-                                _fn(_item, data[schemeInfoId][_item.table], $this);
-                            }
-                        }
-                    });
-                    $this = null;
-                });
-            }
-            else {
-                setTimeout(function () {
-                    set($this, data);
-                }, 100);
-            }
-        }
-        set($this, data);
-    };
-
-    function getFontHtml(verify) {
-        var res = "";
-        switch (verify) {
-            case "NotNull":
-            case "Num":
-            case "Email":
-            case "EnglishStr":
-            case "Phone":
-            case "Fax":
-            case "Mobile":
-            case "MobileOrPhone":
-            case "Uri":
-                res = '<font face="宋体">*</font>';
-                break;
-        }
-        return res;
-    }
-    function loadCheck(data, text, value, compontId) {
-        var $row = $('#' + compontId);
-        if ($row.length === 0) {
-            setTimeout(function () {
-                loadCheck(data, text, value, compontId);
-            }, 100);
-        }
-        else {
-            var $Last = $row;
-            $.each(data, function (_index, _item) {
-                $div = $('<div class="lr-form-row" data-name="' + compontId + '" data-value="' + _item[value] + '" ><label>' + _item[text] + '</label><div class="checkbox" ></div></div>');
-                $Last.after($div);
-                $div.find('.checkbox').lrswitch();
-                $Last = $div;
-                $div = null;
-            });
-            if ($Last) {
-                $Last.after('<div class="lr-form-row lr-form-row-title" style="min-height:6px;" ></div>');
-                $Last = null;
-            }
-        }
-        $row = null;
-    }
-    function organizeRegister1(_compont) {
-        if ($('#' + _compont.relation).length > 0) {
-            $('#' + _compont.relation).on('change', { myId: _compont.id }, function (e) {
-                e = e || window.event;
-                var myId = e.data.myId;
-                var value = $(this).lrselectGet();
-                $('#' + myId).lrselectUpdate({
-                    companyId: value,
-                    needPre: value === '' ? true : false
-                });
-            });
-        }
-        else {
-            setTimeout(function () { organizeRegister1(_compont); }, 100);
-        }
-    }
-    function organizeRegister2(_compont) {
-        if ($('#' + _compont.relation).length > 0) {
-            $('#' + _compont.relation).on('change', { myId: _compont.id }, function (e) {
-                e = e || window.event;
-                var myId = e.data.myId;
-                var value = $(this).lrselectGet();
-                $('#' + myId).lrselectUpdate({
-                    departmentId: value,
-                    needPre: value === '' ? true : false
-                });
-            });
-        }
-        else {
-            setTimeout(function () { organizeRegister2(_compont); }, 100);
-        }
-    }
-
-    function loadGridComponts(compont) {
-    }
-    function loadGridButton(compont) {// 编辑表格增加按钮
-        var $row = $('#' + compont.id);
-        if ($row.length === 0) {
-            setTimeout(function () {
-                loadGridButton(compont);
-            }, 100);
-        }
-        else {
-            var $btn = $('<div class="lr-form-row lr-edit-grid-btn" ><i class="iconfont icon-add1" ></i>增加' + (compont.title || '') + '</div>');
-            $btn[0].compont = compont;
-
-            $btn.on('tap', { compont: compont }, function (e) {
-                e = e || window.event;
-            });
-
-            $row.after($btn);
-        }
-        $row = null;
-    }
-
-    // 渲染自定义表单
-    function custmerformRender($container, scheme, schemeInfoId) {
-        var loaddataComponts = [];
-        $.each(scheme, function (_index, _item) {
-            var $list = $('<div class="lr-form-container lrcomponts" data-id="' + schemeInfoId + '" ></div>');
-            $list[0].componts = _item.componts;
-            $.each(_item.componts, function (_jindex, _jitem) {
-                var $row = $('<div class="lr-form-row"><label>' + _jitem.title + '</label></div>');
-                if (componts[_jitem.type].render($row, _jitem)) {
-                    $list.append($row);
-                    $row.prepend(getFontHtml(_jitem.verify));
-                }
-            });
-            $container.append($list);
-        });
-
-        $container = null;
-    }
-
-    var componts = {
-        label: {
-            render: function ($row, compont) {
-                $row.addClass('lr-form-row-title');
-                return true;
-            }
-        },
-        html: {
-            render: function ($row, compont) {
-                return false;
-            }
-        },
-        text: {
-            render: function ($row, compont) {
-                var $compont = $('<input id="' + compont.id + '" type="text" />');
-                $row.append($compont);
-                $compont.val(compont.dfvalue || '');
-
-                $compont = null;
-                $row = null;
-                if (compont.isHide === '1') {
-                    return false;
-                }
-
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.val();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).val(value || '');
-            }
-        },
-        textarea: {
-            render: function ($row, compont) {
-                $row.addClass('lr-form-row-multi');
-                var $compont = $('<textarea id="' + compont.id + '" ' + 'style="height: ' + compont.height + 'px;" ></textarea>');
-                $compont.text(compont.dfvalue || '');
-                $row.append($compont);
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.val();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).val(value || '');
-            }
-        },
-        texteditor: {
-            render: function ($row, compont) {
-                $row.addClass('lr-form-row-multi');
-                var $compont = $('<textarea id="' + compont.id + '" ' + 'style="height: ' + compont.height + 'px;" ></textarea>');
-                $compont.text(compont.dfvalue || '');
-                $row.append($compont);
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.val();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).val(value || '');
-            }
-        },
-        radio: {
-            render: function ($row, compont) {// 单选改用和下拉一致
-                var $compont = $('<div id="' + compont.id + '" ></div>');
-                $row.append($compont);
-                if (compont.dataSource === '0') {
-                    $compont.lrpickerex({
-                        code: compont.itemCode,
-                        type: 'dataItem'
-                    });
-                } else {
-                    var vlist = compont.dataSourceId.split(',');
-                    $compont.lrpickerex({
-                        code: vlist[0],
-                        type: 'sourceData',
-                        ivalue: vlist[2],
-                        itext: vlist[1]
-                    });
-                }
-
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.lrpickerGet();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).lrpickerSet(value);
-            }
-        },
-        checkbox: {
-            render: function ($row, compont) {
-                var $compont = $('<div id="' + compont.id + '" ></div>');
-                $row.append($compont);
-                if (compont.dataSource === '0') {
-                    $compont.lrcheckboxex({
-                        code: compont.itemCode,
-                        type: 'dataItem'
-                    });
-                } else {
-                    var vlist = compont.dataSourceId.split(',');
-                    $compont.lrcheckboxex({
-                        code: vlist[0],
-                        type: 'sourceData',
-                        ivalue: vlist[2],
-                        itext: vlist[1]
-                    });
-                }
-
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.lrcheckboxGet();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).lrcheckboxSet(value);
-            }
-        },
-        select: {
-            render: function ($row, compont) {//
-                var $compont = $('<div id="' + compont.id + '" ></div>');
-                $row.append($compont);
-                if (compont.dataSource === '0') {
-                    $compont.lrpickerex({
-                        code: compont.itemCode,
-                        type: 'dataItem'
-                    });
-                } else {
-                    var vlist = compont.dataSourceId.split(',');
-                    $compont.lrpickerex({
-                        code: vlist[0],
-                        type: 'sourceData',
-                        ivalue: vlist[2],
-                        itext: vlist[1]
-                    });
-                }
-
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.lrpickerGet();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).lrpickerSet(value);
-            }
-        },
-        datetime: {
-            render: function ($row, compont) {//
-                var $compont = $('<div id="' + compont.id + '" ></div>');
-                $row.append($compont);
-                if (compont.dateformat === '0') {
-                    $compont.lrdate({
-                        type: 'date'
-                    });
-                }
-                else {
-                    $compont.lrdate();
-                }
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.lrdateGet();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                if (compont.dateformat === '0') {
-                    value = learun.date.format(value, 'yyyy-MM-dd');
-                }
-                else {
-                    value = learun.date.format(value, 'yyyy-MM-dd hh:mm');
-                }
-
-                $container.find('#' + compont.id).lrdateSet(value);
-            }
-        },
-        datetimerange: {
-            render: function ($row, compont) {//
-                var $compont = $('<input id="' + compont.id + '" type="text" />');
-                function register(_compont) {
-                    if ($('#' + _compont.startTime).length > 0 && $('#' + _compont.endTime).length > 0) {
-                        $('#' + _compont.startTime).on('change', { myId: _compont.id, end: _compont.endTime }, function (e) {
-                            e = e || window.event;
-                            var end = e.data.end;
-                            var myId = e.data.myId;
-                            var st = $(this).lrdateGet();
-                            var et = $('#' + end).lrdateGet();
-                            if (!!st && !!et) {
-                                var diff = learun.date.parse(st).DateDiff('d', et) + 1;
-                                $('#' + myId).val(diff);
-                            }
-                        });
-                        $('#' + _compont.endTime).on('change', { myId: _compont.id, begin: _compont.startTime }, function (e) {
-                            e = e || window.event;
-                            var begin = e.data.begin;
-                            var myId = e.data.myId;
-
-                            var st = $('#' + begin).lrdateGet();
-                            var et = $(this).lrdateGet();
-                            if (!!st && !!et) {
-                                var diff = learun.date.parse(st).DateDiff('d', et) + 1;
-                                $('#' + myId).val(diff);
-                            }
-                        });
-                    }
-                    else {
-                        setTimeout(function () {
-                            register(_compont);
-                        }, 100);
-                    }
-                }
-                if (!!compont.startTime && compont.endTime) {
-                    register(compont);
-                }
-                $row.append($compont);
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.val();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).val(value);
-            }
-        },
-        encode: {
-            render: function ($row, compont) {
-                var $compont = $('<input id="' + compont.id + '" type="text" readonly  />');
-                compont.isInit = false;
-                learun.getRuleCode(compont.rulecode, function (data) {
-                    if (!compont.isInit) {
-                        compont.isInit = true;
-                        $('#' + compont.id).val(data);
-                    }
-                });
-                $row.append($compont);
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.val();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                compont.isInit = true;
-                $container.find('#' + compont.id).val(value);
-            }
-        },
-        organize: {
-            render: function ($row, compont) {
-                var $compont = $('<div id="' + compont.id + '" ></div>');
-                $row.append($compont);
-                switch (compont.dataType) {
-                    case "company"://公司
-                        $compont.lrselect();
-                        break;
-                    case "department"://部门
-                        $compont.lrselect({
-                            type: 'department',
-                            needPre: compont.relation === '' ? false : true
-                        });
-                        
-                        organizeRegister1(compont);
-                        break;
-                    case "user"://用户
-                        $compont.lrselect({
-                            type: 'user',
-                            needPre: compont.relation === '' ? false : true
-                        });
-                        organizeRegister2(compont);
-                        break;
-                }
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.lrselectGet();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).lrselectSet(value);
-            }
-        },
-        currentInfo: {
-            render: function ($row, compont) {
-                var $compont = $('<input id="' + compont.id + '" readonly type="text"  />');
-                var userinfo = learun.storage.get('userinfo');
-                switch (compont.dataType) {
-                    case 'company':
-                        compont.value = userinfo.baseinfo.companyId;
-                        if (compont.isHide !== '1') {
-                            learun.clientdata.get('company', {
-                                key: compont.value,
-                                compont: compont,
-                                callback: function (item, _op) {
-                                    if (!_op.compont.isEdit) {
-                                        $(_op.compont.id).val(item.name);
-                                    }
-                                }
-                            });
-                        }
-                        break;
-                    case 'department':
-                        compont.value = userinfo.baseinfo.departmentId;
-                        if (compont.isHide !== '1') {
-                            learun.clientdata.get('department', {
-                                key: compont.value,
-                                compont: compont,
-                                callback: function (item, _op) {
-                                    if (!_op.compont.isEdit) {
-                                        $(_op.compont.id).val(item.name);
-                                    }
-                                }
-                            });
-                        }
-                        break;
-                    case 'user':
-                        $compont.val(userinfo.baseinfo.realName);
-                        compont.value = userinfo.baseinfo.userId;
-                        break;
-                    case 'time':
-                        compont.value = learun.date.format(new Date(), 'yyyy-MM-dd hh:mm:ss');
-                        $compont.val(compont.value);
-                        break;
-                    case 'guid':
-                        compont.value = learun.guid();
-                        $compont.val(compont.value);
-                        break;
-                }
-                if (compont.isHide === '1') {
-                    $compont = null;
-                    $row = null;
-                    return false;
-                }
-                else {
-                    $row.append($compont);
-                    $compont = null;
-                    $row = null;
-                }
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = compont.value;
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                if (value) {
-                    var organization = learun.storage.get('organization');
-                    compont.isEdit = true;
-                    switch (compont.dataType) {
-                        case 'company':
-                            compont.value = value;
-                            if (compont.isHide !== '1') {
-                                learun.clientdata.get('company', {
-                                    key: compont.value,
-                                    compont: compont,
-                                    callback: function (item, _op) {
-                                        $container.find('#' + _op.compont.id).val(item.name || '');
-                                    }
-                                });
-                            }
-                            break;
-                        case 'department':
-                            compont.value = value;
-                            if (compont.isHide !== '1') {
-                                learun.clientdata.get('department', {
-                                    key: compont.value,
-                                    compont: compont,
-                                    callback: function (item, _op) {
-                                        $container.find('#' + _op.compont.id).val(item.name || '');
-                                    }
-                                });
-                            }
-                            break;
-                        case 'user':
-                            compont.value = value;
-                            if (compont.isHide !== '1') {
-                                learun.clientdata.get('user', {
-                                    key: compont.value,
-                                    compont: compont,
-                                    callback: function (item, _op) {
-                                        $container.find('#' + _op.compont.id).val(item.name || '');
-                                    }
-                                });
-                            }
-                            break;
-                        case 'time':
-                            compont.value = value;
-                            if (compont.isHide !== '1') {
-                                $container.find('#' + compont.id).val(value);
-                            }
-                            break;
-                        case 'guid':
-                            compont.value = value;
-                            if (compont.isHide !== '1') {
-                                $container.find('#' + compont.id).val(value);
-                            }
-                            break;
-                    }
-                }
-            }
-        },
-        guid: {
-            render: function ($row, compont) {
-                compont.value = learun.guid();
-                $row.remove();
-                return false;
-            },
-            get: function (compont) {
-                var res = {};
-                res.isHad = true;
-                res.value = compont.value;
-                return res;
-            },
-            set: function (compont, value) {
-                compont.value = value;
-            }
-        },
-        upload: {
-            render: function ($row, compont) {
-                $row.addClass('lr-form-row-multi');
-                var $compont = $('<div id="' + compont.id + '" ></div>');
-                $row.append($compont);
-                $compont.lrImagepicker();
-                $compont = null;
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.imagepickerGet();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).imagepickerSet(value);
-            }
-        },
-        girdtable: {
-            render: function ($row, compont) {
-                var gridCompont = [];
-                $.each(compont.fieldsData, function (_index, _item) {
-                    if (_item.field) {
-                        switch (_item.type) {
-                            case 'radio':
-                            case 'select':
-                            case 'checkbox':
-                                if (_item.dataSource === '0') {
-                                    _item.code = _item.itemCode;
-                                    _item.datatype = 'dataItem';
-                                }
-                                else {
-                                    _item.code = _item.dataSourceId;
-                                    _item.ivalue = _item.saveField;
-                                    _item.itext = _item.showField;
-                                    _item.datatype = 'sourceData';
-                                }
-                                break;
-                            case 'layer':
-                                if (_item.dataSource === '0') {
-                                    _item.code = _item.itemCode;
-                                    _item.datatype = 'dataItem';
-                                }
-                                else {
-                                    _item.code = _item.dataSourceId;
-                                    _item.datatype = 'sourceData';
-                                }
-                                break;
-                        }
-
-                      
-                        gridCompont.push(_item);
-                    }
-                });
-                $row.attr('id', compont.id);
-                $row.lrgrid({
-                    title: compont.title,
-                    componts: gridCompont,
-                    isToLowerCase: true
-                });
-                $row = null;
-                return true;
-            },
-            get: function (compont, $container) {
-                var res = {};
-                var $compont = $container.find('#' + compont.id);
-                res.isHad = $compont.length > 0 ? true : false;
-                if (res.isHad) {
-                    res.value = $compont.lrgridGet();
-                }
-                $compont = null;
-                return res;
-            },
-            set: function (compont, value, $container) {
-                $container.find('#' + compont.id).lrgridSet(value);
-            }
-        }
-    };
-
-})(window.jQuery, window.lrmui, window);
-

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/weixinlogin.js

@@ -29,6 +29,7 @@
                         $(".login-content").show();
                         $("#accountopenid").val(res.data.openid);
                         $("#loginBtn").on("click", function () {
+                            var up = true;
                             var account = $('#account').val();
                             var password = $('#password').val();
                             if (account === "") {
@@ -36,10 +37,15 @@
                             } else if (password === "") {
                                 learun.layer.warning('密码不能为空！', function () { }, '提示', '关闭');
                             } else {
+                                var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+                                if (!reg.test(password)) {
+                                    up = false;
+                                }
                                 var data = {
                                     username: account,
                                     password: $.md5(password),
-                                    openid: $("#accountopenid").val()
+                                    openid: $("#accountopenid").val(),
+                                    up: up
                                 };
                                 var postdata = {
                                     token: '',
@@ -55,7 +61,6 @@
                                         return;
                                     }
                                     if (res.code === 200) {
-                                        console.log(res);
                                         var logininfo = {
                                             account: account,
                                             token: res.data.baseinfo.token,
@@ -65,6 +70,12 @@
                                         learun.storage.set('userinfo', res.data);
                                         $('#account').val('');
                                         $('#password').val('');
+                                        if (res.data.pwd === true) {
+                                            learun.storage.set('pwd', true);
+                                            learun.layer.warning("绑定失败！您的密码不满足强度要求，请您先修改密码后再执行系统其他操作");
+                                        } else {
+                                            learun.storage.set('pwd', false);
+                                        }
                                         location.href = "http://" + window.location.host;
                                     } else {
                                         learun.layer.warning(res.info, function () { }, '提示', '关闭');
@@ -74,7 +85,6 @@
                         });
                     }
                 } else {
-                    console.log(res.info);
                     learun.layer.warning(res.info);
                     location.href = "http://" + window.location.host;
                 }

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

@@ -566,6 +566,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuInfoFreshIBLL.IsOtherPayFee(keyValue, status);
             return Success("操作成功");
         }
+
+        /// <summary>
+        ///审核助学贷款
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCheckLoan(string keyValue, string status)
+        {
+            stuInfoFreshIBLL.DoCheckLoan(keyValue, status);
+            return Success("操作成功");
+        }
+
         /// <summary> 
         /// 获取新生缴费明细 
         /// <summary> 

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

@@ -163,7 +163,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
 
-        
+
 
         /// <summary>
         /// 学生成绩录入可去审核页面
@@ -640,9 +640,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 StuId = x.Key.StuId,
                 StuNo = x.Key.StuNo,
                 StuName = x.Key.StuName,
-                FinishSchoolMark=stuData.FirstOrDefault(a=>a.StuNo==x.Key.StuNo)?.FinishSchoolMark,
+                FinishSchoolMark = stuData.FirstOrDefault(a => a.StuNo == x.Key.StuNo)?.FinishSchoolMark,
                 TotalScore = x.Select(y => y.Score).Sum(),
-                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo)
+                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo)
             }).OrderByDescending(x => x.TotalScore);
 
             var result = new List<Dictionary<string, string>>();
@@ -656,7 +656,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 aaa.Add("TotalScore", item.TotalScore.ToString());
                 foreach (var lessonInfoItem in item.LessonInfo)
                 {
-                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString());
+                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat);
                 }
 
                 result.Add(aaa);
@@ -678,8 +678,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 StuNo = x.Key.StuNo,
                 StuName = x.Key.StuName,
                 FinishSchoolMark = stuData.FirstOrDefault(a => a.StuNo == x.Key.StuNo)?.FinishSchoolMark,
-                TotalScore = x.Where(m=>m.LessonSortNo=="1").Select(y => y.Score).Sum(),
-                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo)
+                TotalScore = x.Where(m => m.LessonSortNo == "1").Select(y => y.Score).Sum(),
+                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo)
             }).OrderByDescending(x => x.TotalScore);
 
             var result = new List<Dictionary<string, string>>();
@@ -693,7 +693,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 aaa.Add("TotalScore", item.TotalScore.ToString());
                 foreach (var lessonInfoItem in item.LessonInfo)
                 {
-                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString());
+                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat);
                 }
 
                 result.Add(aaa);
@@ -739,7 +739,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 StuNo = x.Key.StuNo,
                 StuName = x.Key.StuName,
                 TotalScore = x.Select(y => y.Score).Sum(),
-                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo)
+                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo)
             }).OrderByDescending(x => x.TotalScore);
             var result = new List<Dictionary<string, string>>();
             foreach (var item in aa)
@@ -750,7 +750,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 aaa.Add("TotalScore", item.TotalScore.ToString());
                 foreach (var lessonInfoItem in item.LessonInfo)
                 {
-                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString());
+                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat);
                 }
 
                 result.Add(aaa);

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

@@ -47,6 +47,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 指派人列表
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IssueForm()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 阅读详情
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ReadList()
+        {
+            return View();
+        }
         #endregion
 
         #region  获取数据
@@ -118,6 +137,23 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("删除成功！");
         }
         /// <summary>
+        /// 结束下发
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult OverIssue(string keyValue)
+        {
+            var entity = sYS_ReceiveDocumentIBLL.GetSys_ReceiveDocumentEntity(keyValue);
+            if (null != entity)
+            {
+                entity.RSendFlag = "4";
+                sYS_ReceiveDocumentIBLL.SaveEntity(keyValue, entity);
+            }
+            return Success("操作成功！");
+        }
+        /// <summary>
         /// 保存实体数据（新增、修改）
         /// <param name="keyValue">主键</param>
         /// <summary>

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

@@ -62,6 +62,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 主页面【党政公文查阅】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexGWJS()
+        {
+            return View();
+        }
+        /// <summary>
         /// 表单页
         /// <summary>
         /// <returns></returns>
@@ -100,38 +109,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = sys_ReceiveFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 1);
-            var jsonData = new
-            {
-                rows = data,
-                total = paginationobj.total,
-                page = paginationobj.page,
-                records = paginationobj.records
-            };
-            return Success(jsonData);
-        }
-
-        [HttpGet]
-        [AjaxOnly]
-        public ActionResult GetPageListDocument(string pagination, string queryJson)
-        {
-            Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = sys_ReceiveFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 2);
-            var jsonData = new
-            {
-                rows = data,
-                total = paginationobj.total,
-                page = paginationobj.page,
-                records = paginationobj.records
-            };
-            return Success(jsonData);
-        }
-        [HttpGet]
-        [AjaxOnly]
-        public ActionResult GetPageListParty(string pagination, string queryJson)
-        {
-            Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = sys_ReceiveFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 3);
+            var data = sys_ReceiveFileIBLL.GetPageList(paginationobj, queryJson);
             var jsonData = new
             {
                 rows = data,
@@ -236,6 +214,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             sys_ReceiveFileIBLL.Issue(entity);
             return Success("保存成功！");
         }
+
+
+        /// <summary>
+        /// 公文接收 下发指定接收人
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult ReceiveDocumentIssue(string strEntity)
+        {
+            Sys_IssueEntity entity = strEntity.ToObject<Sys_IssueEntity>();
+            sys_ReceiveFileIBLL.ReceiveDocumentIssue(entity);
+            return Success("保存成功！");
+        }
         /// <summary>
         /// 查看实体数据
         /// <param name="keyValue">主键</param>

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

@@ -9,6 +9,7 @@
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
                         <input id="txt_Keyword" type="text" class="form-control" placeholder="考生号/准考证号/姓名/身份证号" />
+                        <input id="Grade" 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>

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

@@ -17,7 +17,8 @@ var bootstrap = function ($, learun) {
             // 查询
             $('#btn_Search').on('click', function () {
                 var keyword = $('#txt_Keyword').val();
-                page.search({ keyword: keyword });
+                var Grade = $('#Grade').val();
+                page.search({ keyword: keyword, Grade: Grade });
             });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -172,6 +173,7 @@ var bootstrap = function ($, learun) {
                     { label: '考生号', name: 'ksh', width: 150, align: "left" },
                     { label: '准考证号', name: 'zkzh', width: 150, align: "left" },
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
+                    { label: '年级', name: 'Grade', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 100, align: "left" },
                     {
                         label: '是否完善信息', name: 'ID', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -26,6 +26,8 @@
                         <a id="lr_pay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;线上缴费</a>
                         <a id="lr_cancelPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消线上缴费</a>
                         <a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;填写贷款回执码</a>
+                        <a id="lr_checkLoan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核助学贷款</a>
+                        <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;去审核助学贷款</a>
                         <a id="lr_onsitePay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;现场缴费</a>
                         <a id="lr_otherPay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;其他费用缴费</a>
                         <a id="lr_cancelOtherPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消其他费用缴费</a>

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

@@ -89,11 +89,15 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 助学贷款
+            // 填写贷款回执码
             $('#lr_loan').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
+                    if (selectedRow.StudentLoanStatus == "1") {
+                        learun.alert.warning("当前新生助学贷款已审核！");
+                        return;
+                    }
                     learun.layerForm({
                         id: 'loanForm',
                         title: '助学贷款',
@@ -106,6 +110,47 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 审核助学贷款
+            $('#lr_checkLoan').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.StudentLoanStatus == "1") {
+                        learun.alert.warning("当前新生助学贷款已审核！");
+                        return;
+                    }
+                    if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) {
+                        learun.alert.warning("贷款回执码为空！");
+                        return;
+                    }
+
+                    learun.layerConfirm('是否确认审核助学贷款！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 去审核助学贷款
+            $('#lr_uncheckLoan').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.StudentLoanStatus != "1") {
+                        learun.alert.warning("当前新生助学贷款未审核！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认去审核助学贷款！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 现场缴费
             $('#lr_onsitePay').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
@@ -176,6 +221,11 @@ var bootstrap = function ($, learun) {
                     },
                     { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
                     { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
+                    {
+                        label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) {
+                            return value == 1 ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-warning\">未审核</span>";
+                        }
+                    },
                     {
                         label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {

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

@@ -19,6 +19,11 @@
         <div class="lr-form-item-title">文件标题</div>
         <input id="RTitle" type="text" class="form-control"  />
     </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_ReceiveDocument" >
+        <div class="lr-form-item-title">文件</div>
+        <div id="RFile"  ></div>
+    </div>
+
     <div class="col-xs-12 lr-form-item"  data-table="Sys_ReceiveDocument" >
         <div class="lr-form-item-title">内容</div>
         <div id="RContent" style="height:200px;"></div>

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

@@ -26,6 +26,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#RFile').lrUploader();
             $('#RReceiveUnit').lrselect({
                 type: 'tree',
                 allowSearch: true,

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

@@ -19,6 +19,10 @@
         <div class="lr-form-item-title">文件标题</div>
         <input id="RTitle" type="text" readonly="readonly" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveDocument">
+        <div class="lr-form-item-title">文件</div>
+        <div id="RFile" readonly="readonly"></div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveDocument">
         <div class="lr-form-item-title">内容</div>
         <div id="RContent" style="height:200px;" readonly="readonlyj"></div>

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

@@ -32,6 +32,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                 param: {}
             });
+            $('#RFile').lrUploader();
             $('#RUrgencyDegree').lrDataItemSelect({ code: 'UrgencyDegree' });
             var RContentUE = UE.getEditor('RContent');
             $('#RContent')[0].ue = RContentUE;

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

@@ -37,6 +37,12 @@
                         <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-plus"></i>&nbsp;提交</a>
                     </div>
+                    <div class=" btn-group btn-group-sm" >
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-search-minus"></i>&nbsp;查看</a>
+                        <a id="lr_IssueSpecifyReceiver" class="btn btn-default"><i class="fa fa-envelope"></i>&nbsp;下发</a>
+                        <a id="lr_OverIssue" class="btn btn-default"><i class="fa fa-minus-square"></i>&nbsp;结束下发</a>
+                        <a id="lr_read" class="btn btn-default"><i class="fa fa-calendar-minus-o"></i>&nbsp;查阅情况</a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

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

@@ -77,6 +77,31 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('RID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/FormView?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('RID');
@@ -115,6 +140,64 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 下发审批指定接收人
+            $('#lr_IssueSpecifyReceiver').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('RID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '下发审批指定接收人',
+                        url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/IssueForm?keyValue=' + keyValue,
+                        width: 800,
+                        height: 200,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            // 结束下发
+            $('#lr_OverIssue').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('RID');
+                if (learun.checkrow(keyValue)) {
+                    var SendFlag = $('#gridtable').jfGridValue('RSendFlag');
+                    if (SendFlag !== 2) {
+                        learun.alert.warning("当前公文未审批通过，请耐心等待审批！");
+                        return;
+                    }
+                    learun.layerConfirm('是否结束下发！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/OverIssue', { keyValue: keyValue, }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+            // 查阅情况
+            $('#lr_read').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('RID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查阅情况',
+                        url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/ReadList?keyValue=' + keyValue,
+                        width: 850,
+                        height: 400,
+                        btn: null
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -146,13 +229,42 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "文件标题", name: "RTitle", width: 100, align: "left" },
+                    {
+                        label: "已接收", name: "ReceiverId", width: 300, align: "left", formatterAsync:
+                            function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('user',
+                                    {
+                                        key: value,
+                                        callback: function (_data) {
+                                            if (_data.length > 0) {
+                                                var text = '';
+                                                $.each(_data,
+                                                    function (i, item) {
+                                                        if (item) {
+                                                            text += item.name + ',';
+                                                        }
+                                                    });
+                                                text = text.substring(0, text.lastIndexOf(','));
+                                                callback(text);
+                                            } else {
+                                                callback(_data.name);
+                                            }
+                                        }
+                                    });
+                            }
+                    },
+                    { label: "审批意见", name: "SpecifyReceiver", width: 300, align: "left" },
                     {
                         label: "状态", name: "RSendFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
-                            if (cellvalue == 1) {
+                            if (cellvalue === "1") {
                                 return '<span class=\"label label-warning\">审批中</span>';
-                            } else if (cellvalue == 2) {
-                                return '<span class=\"label label-success\">已下发</span>';
+                            } else if (cellvalue === "2") {
+                                return '<span class=\"label label-info\">审批通过</span>';
+                            } else if (cellvalue === "3") {
+                                return '<span class=\"label label-danger\" >审批失败</span>';
+                            } else if (cellvalue === "4") {
+                                return '<span class=\"label label-success\" >下发完毕</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "公文发送";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile"   id="ReceiverIddiv">
+        <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
+        <div id="SpecifyReceiver"  isvalid="yes" checkexpession="NotNull"  ></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IssueForm.js

@@ -0,0 +1,62 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-11 10:31
+ * 描  述：公文发送
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var rFileId = request('rFileId');
+var specifyReceiver = request('specifyReceiver');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#SpecifyReceiver').lrUserSelect({ type: '1' });
+        },
+        initData: function () {
+            if (rFileId) {
+                $('#SpecifyReceiver').lrformselectSet(specifyReceiver);
+            }
+        }
+    };
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        formData.RFileId = rFileId;
+        formData.SFileId = keyValue;
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/ReceiveDocumentIssue', postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, formData, i);
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.cshtml

@@ -0,0 +1,29 @@
+@{
+    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">
+                        <input id="Receiver" type="text" class="form-control" placeholder="请输入姓名" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlt">查询</span></a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                        <a id="lr_Issue" 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/Sys_ReceiveDocument/ReadList.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.js

@@ -0,0 +1,136 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-11 10:31
+ * 描  述：公文发送
+ */
+var refreshGirdData;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#Receiver').val();
+                page.search({ Receiver: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+            $('#lr_Issue').on('click',
+                function () {
+                    var keyValue = $('#gridtable').jfGridValue('SFileId');
+                    var rFileId = $('#gridtable').jfGridValue('RFileId');
+                    var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver');
+                    if (learun.checkrow(rFileId)) {
+                        var SendStatus = $('#gridtable').jfGridValue('SendStatus');
+                        if (SendStatus) {
+                            learun.alert.warning("已下发！");
+                            return;
+                        }
+                        learun.layerForm({
+                            id: 'formIssue',
+                            title: '下发',
+                            url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/IssueForm?keyValue=' + keyValue + '&rFileId=' + rFileId + '&specifyReceiver=' + specifyReceiver,
+                            width: 500,
+                            height: 500,
+                            callBack: function (id) {
+                                var res = false;
+                                // 验证数据
+                                res = top[id].validForm();
+                                // 保存数据
+                                if (res) {
+                                    res = top[id].save('', function () {
+                                        page.search();
+                                    });
+                                }
+                                return res;
+                            }
+                        });
+                    }
+
+                });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
+                headData: [
+                    {
+                        label: "接收人", name: "Receiver", width: 150, align: "left"
+                    },
+                    {
+                        label: "查阅时间", name: "ReadTime", width: 150, align: "left"
+                    },
+                    {
+                        label: "指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync:
+                            function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('user',
+                                    {
+                                        key: value,
+                                        callback: function (_data) {
+                                            if (_data.length > 0) {
+                                                var text = '';
+                                                $.each(_data,
+                                                    function (i, item) {
+                                                        if (item) {
+                                                            text += item.name + ',';
+                                                        }
+                                                    });
+                                                text = text.substring(0, text.lastIndexOf(','));
+                                                callback(text);
+                                            } else {
+                                                callback(_data.name);
+                                            }
+                                        }
+                                    });
+                            }
+                    },
+                    {
+                        label: "状态", name: "ReadFlag", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === true) {
+                                return '<span class=\"label label-success\">已读</span>';
+                            } else {
+                                return '<span class=\"label label-warning\">未读</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: "下发状态", name: "SendStatus", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === true) {
+                                return '<span class=\"label label-success\">已下发</span>';
+                            } else {
+                                return '<span class=\"label label-warning\">未下发</span>';
+                            }
+                        }
+                    }
+                ],
+                mainId: 'RFileId',
+                isPage: true,
+                sidx: 'ReadFlag,ReadTime',
+                sord: 'ASC'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SFileId = keyValue;
+            param.STypeId = 4;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Form.cshtml.30961.1.2019-10-25.09-36-12.0372

@@ -1,31 +0,0 @@
-@{
-    ViewBag.Title = "公文收发";
-    Layout = "~/Views/Shared/_Form.cshtml";
-}
-<div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
-        <div class="lr-form-item-title">发送人</div>
-        <input id="Sender" type="text" class="form-control" readonly="readonly" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
-        <div class="lr-form-item-title">主题</div>
-        <input id="Title" type="text" class="form-control" readonly="readonly" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
-        <div class="lr-form-item-title">接收对象</div>
-        <div id="SendType" readonly="readonly"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
-        <div class="lr-form-item-title">发送时间</div>
-        <input id="SendTime" type="text" class="form-control" readonly="readonly" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
-        <div class="lr-form-item-title">附件</div>
-        <div id="Url" style="padding-right:60px;"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveFile">
-        <div class="lr-form-item-title">内容</div>
-        <div id="Contents" style="margin-top:6px;"></div>
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Form.js.30962.1.2019-10-25.09-36-12.0442

@@ -1,59 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
- * 创建人：超级管理员
- * 日  期：2019-04-11 10:08
- * 描  述：公文收发
- */
-var acceptClick;
-var keyValue = request('keyValue');
-var bootstrap = function ($, learun) {
-    "use strict";
-    var selectedRow = learun.frameTab.currentIframe().selectedRow;
-    var page = {
-        init: function () {
-            $('.lr-form-wrap').lrscroll();
-            page.bind();
-            page.initData();
-        },
-        bind: function () {
-            $('#SendType').lrDataItemSelect({ code: 'FileSendType' });
-            if (selectedRow.ReadFlag == true) {//已读
-                $('#Url').lrUploader();
-            } else {//未读
-                $('#Url').lrUploader({ RFileId: selectedRow.RFileId });
-            }
-        },
-        initData: function () {
-            if (!!keyValue) {
-                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/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]);
-                            $('#Contents').html(data[id].Contents);
-                        }
-                    }
-                    $("#lrUploader_uploadBtn_Url").hide();
-                });
-            }
-        }
-    };
-    // 保存数据
-    acceptClick = function (callBack) {
-        if (!$('body').lrValidform()) {
-            return false;
-        }
-        var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
-        };
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack();
-            }
-        });
-    };
-    page.init();
-}

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

@@ -215,6 +215,7 @@ var bootstrap = function ($, learun) {
             param.StartTime = startTime;
             param.EndTime = endTime;
             param.ReceiverId = learun.clientdata.get(['userinfo']).userId;
+            param.STypeId = 1;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexDocument.js

@@ -142,7 +142,7 @@ var bootstrap = function ($, learun) {
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageListDocument',
+                url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
                 headData: [
                     { label: "发送人", name: "Sender", width: 100, align: "left" },
                     { label: "主题", name: "Title", width: 300, align: "left" },
@@ -193,6 +193,7 @@ var bootstrap = function ($, learun) {
             param.StartTime = startTime;
             param.EndTime = endTime;
             param.ReceiverId = learun.clientdata.get(['userinfo']).userId;
+            param.STypeId = 2;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Index.cshtml.30963.1.2019-10-25.09-36-12.0482 → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.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">
@@ -25,8 +25,9 @@
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                    <div class=" btn-group btn-group-sm">
                         <a id="lr_Read"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查阅</a>
+                        <a id="lr_SpecifyReceiver"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;指定接收人</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                 </div>
@@ -35,4 +36,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Index.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/_sgbak/Index.js.30964.1.2019-10-25.09-36-12.0522 → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js

@@ -79,6 +79,22 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 指定接收人
+            $('#lr_SpecifyReceiver').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('RFileId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formSys_ReceiveFile',
+                        title: '指定接收人',
+                        url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/SpecifyReceiverForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('RFileId');
@@ -117,10 +133,10 @@ var bootstrap = function ($, learun) {
                             if (selectedRow.ReadFlag == false) {
                                 //判断附件
                                 //if (selectedRow.Url == null || selectedRow.Url == "") {
-                                    //自动已读
-                                    learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Read', { keyValue: keyValue }, function () {
-                                        refreshGirdData();
-                                    });
+                                //自动已读
+                                learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Read', { keyValue: keyValue }, function () {
+                                    refreshGirdData();
+                                });
                                 //}
                             }
                         },
@@ -135,10 +151,18 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
                 headData: [
-                    { label: "发送人", name: "Sender", width: 100, align: "left" },
+                    {
+                        label: "发送人", name: "SenderId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }},
                     { label: "主题", name: "Title", width: 300, align: "left" },
                     { label: "发送时间", name: "SendTime", width: 130, align: "left" },
                     {
@@ -152,6 +176,30 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync:
+                            function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('user',
+                                    {
+                                        key: value,
+                                        callback: function (_data) {
+                                            if (_data.length > 0) {
+                                                var text = '';
+                                                $.each(_data,
+                                                    function (i, item) {
+                                                        if (item) {
+                                                            text += item.name + ',';
+                                                        }
+                                                    });
+                                                text = text.substring(0, text.lastIndexOf(','));
+                                                callback(text);
+                                            } else {
+                                                callback(_data.name);
+                                            }
+                                        }
+                                    });
+                            }
+                    },
                     {
                         label: "状态", name: "ReadFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
@@ -175,6 +223,7 @@ var bootstrap = function ($, learun) {
             param.StartTime = startTime;
             param.EndTime = endTime;
             param.ReceiverId = learun.clientdata.get(['userinfo']).userId;
+            param.STypeId = 4;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexParty.js

@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageListParty',
+                url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetPageList',
                 headData: [
                     { label: "发送人", name: "Sender", width: 100, align: "left" },
                     { label: "主题", name: "Title", width: 300, align: "left" },
@@ -175,6 +175,7 @@ var bootstrap = function ($, learun) {
             param.StartTime = startTime;
             param.EndTime = endTime;
             param.ReceiverId = learun.clientdata.get(['userinfo']).userId;
+            param.STypeId=3
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -29,10 +29,10 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
-                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp; 查看</a>
-                        <a id="lr_IssueSpecifyReceiver" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;下发审批指定接收人</a>
-                        <a id="lr_OverIssue" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;结束下发</a>
-                        <a id="lr_read" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp; 查阅情况</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-search-minus"></i>&nbsp; 查看</a>
+                        <a id="lr_IssueSpecifyReceiver" class="btn btn-default"><i class="fa fa-envelope"></i>&nbsp;下发审批指定接收人</a>
+                        <a id="lr_OverIssue" class="btn btn-default"><i class="fa fa-minus-square"></i>&nbsp;结束下发</a>
+                        <a id="lr_read" class="btn btn-default"><i class="fa fa-calendar-minus-o"></i>&nbsp; 查阅情况</a>
                     </div>
                 </div>
             </div>