Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl

.gitignore

@@ -76,3 +76,4 @@ 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/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,134 @@
+/* * 版 本 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.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);
+        //            });
+        //        }
+        //    }, 'Learun智慧校园提示', ['取消', '确定']);
+        //},
+        //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,7 @@
+.lr-form-container .lr-form-row {
+    padding-left: 100px;
+}
+
+.lr-form-row label {
+    width: 100px;
+}

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,151 @@
+/* * 版 本 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();
+                        }
+                    }
+                }, 'learun智慧校园提示', ['取消', '确定']);
+            });
+            // 编辑
+            $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();
+            //                                }
+            //                            });
+            //                        }
+            //                    }, 'Learun智慧校园提示', ['取消', '确定']);
+            //                }
+            //            }
+            //        ],
+            //        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]);
+                            }
+                        }
+                    }
+                    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>

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.StudentLoan == null || entity.StudentLoan == "" || entity.StudentLoan == undefined) && 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,8 @@
                 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);
                         }
                     }
                     page.bind($page);

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

@@ -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/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/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"].StudentLoan == null || data["StuInfoFreshEntity"].StudentLoan == "" || data["StuInfoFreshEntity"].StudentLoan == undefined) {
+                        notCompleteStyle("#StudentLoan", "images/enter2-3.png");
+                    } else {
+                        completeStyle("#StudentLoan", "images/enter1-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/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.Web/Learun.Application.Web.csproj

@@ -984,6 +984,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\IndexParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\IndexDocument.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\SpecifyReceiverForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\FormParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\FormDocumentView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\FormDocument.js" />
@@ -6808,6 +6809,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\LoanForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IssueForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\SpecifyReceiverForm.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

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

@@ -19,11 +19,13 @@ namespace Learun.Application.WebApi.Modules
         {
             Get["/stuInfoFreshEntity"] = GetStuInfoFreshEntity;
             Get["/stuInfoFresh"] = GetStuInfoFresh;
-            Get["/stuInfoFreshEntityByStuNo"] = GetStuInfoFreshEntityByStuNo;
             Get["/saveStuInfoFresh"] = GetSaveStuInfoFresh;
             Get["/saveLoan"] = GetSaveLoan;
             Post["/savePhoto"] = GetSavePhoto;
             Get["/payFeeDetail"] = GetPayFeeDetail;
+            Get["/pageList"] = GetPageList;
+            Get["/form"] = GetForm;
+            Post["/save"] = SaveForm;
 
         }
 
@@ -47,7 +49,7 @@ namespace Learun.Application.WebApi.Modules
             var StuInfoFreshFamilyList = new List<StuInfoFreshFamilyEntity>();
             var StuInfoFreshEmergePeopleList = new List<StuInfoFreshEmergePeopleEntity>();
 
-            var StuInfoFreshEntity = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(userInfo.account);
+            var StuInfoFreshEntity = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(GetReqData());
             if (StuInfoFreshEntity != null)
             {
                 //处理数据源
@@ -73,41 +75,38 @@ namespace Learun.Application.WebApi.Modules
                         StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile;
                     }
                 }
-                if (StuInfoFreshEntity.PayFeeStatus == "1")
+
+                //获取头像地址
+                if (StuInfoFreshEntity.IsPhoto == true && !string.IsNullOrEmpty(StuInfoFreshEntity.Photo))
                 {
-                    StuInfoFreshEntity.PayFeeStatus = "已缴费";
+                    var annexesFileEntity = annexesFileIBLL.GetEntity(StuInfoFreshEntity.Photo);
+                    if (annexesFileEntity != null)
+                    {
+                        url = annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource"));
+                    }
                 }
-                else
+                StuInfoFreshEntity.DormitoryName = accdormitoryIBLL.GetDormitoryInfoByPlanStuNo(StuInfoFreshEntity.ID);
+                if (StuInfoFreshEntity.IsPoor != "1")
                 {
-                    StuInfoFreshEntity.PayFeeStatus = "未缴费";
+                    StuInfoFreshEntity.IsPoor = "0";
                 }
-                if (StuInfoFreshEntity.CollectFileStatus == "1")
+                if (StuInfoFreshEntity.GetKeyStatus != "1")
                 {
-                    StuInfoFreshEntity.CollectFileStatus = "已提交";
+                    StuInfoFreshEntity.GetKeyStatus = "0";
                 }
-                else
+                if (StuInfoFreshEntity.GetCardStatus != "1")
                 {
-                    StuInfoFreshEntity.CollectFileStatus = "未提交";
+                    StuInfoFreshEntity.GetCardStatus = "0";
                 }
-                if (StuInfoFreshEntity.GetKeyStatus == "1")
+                if (StuInfoFreshEntity.OtherPayFeeStatus != "1")
                 {
-                    StuInfoFreshEntity.GetKeyStatus = "已领取";
+                    StuInfoFreshEntity.OtherPayFeeStatus = "0";
                 }
-                else
+                if (StuInfoFreshEntity.CollectFileStatus != "1")
                 {
-                    StuInfoFreshEntity.GetKeyStatus = "未领取";
+                    StuInfoFreshEntity.CollectFileStatus = "0";
                 }
 
-                //获取头像地址
-                if (StuInfoFreshEntity.IsPhoto == true && !string.IsNullOrEmpty(StuInfoFreshEntity.Photo))
-                {
-                    var annexesFileEntity = annexesFileIBLL.GetEntity(StuInfoFreshEntity.Photo);
-                    if (annexesFileEntity != null)
-                    {
-                        url = annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource"));
-                    }
-                }
-                StuInfoFreshEntity.DormitoryName = accdormitoryIBLL.GetDormitoryInfoByPlanStuNo(StuInfoFreshEntity.ID);
 
                 //是否完善信息
                 StuInfoFreshFamilyList = stuInfoFreshIBLL.GetStuInfoFreshFamilyList(StuInfoFreshEntity.ID).ToList();
@@ -143,87 +142,9 @@ namespace Learun.Application.WebApi.Modules
 
             return Success(result);
         }
-
-        private Response GetStuInfoFreshEntityByStuNo(dynamic _)
-        {
-            var url = Config.GetValue("defaultheadimg");
-            var StuInfoFreshFamilyList = new List<StuInfoFreshFamilyEntity>();
-            var StuInfoFreshEmergePeopleList = new List<StuInfoFreshEmergePeopleEntity>();
-
-            var StuInfoFreshEntity = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(GetReqData());
-            if (StuInfoFreshEntity != null)
-            {
-                //处理数据源
-                StuInfoFreshEntity.MajorNo = cdMajorIBLL.GetCdMajorEntityByMajorNo(StuInfoFreshEntity.MajorNo).MajorName;
-                StuInfoFreshEntity.DeptNo = cdDeptIBLL.GetCdDeptEntityByNo(StuInfoFreshEntity.DeptNo).DeptName;
-
-                var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(StuInfoFreshEntity.ClassNo);
-                if (classInfoEntity != null)
-                {
-                    StuInfoFreshEntity.ClassNo = classInfoEntity.ClassName;
-                    StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo;
-                    var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
-                    if (empInfoEntity != null)
-                    {
-                        StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName;
-                        StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile;
-                    }
-                }
-                if (StuInfoFreshEntity.PayFeeStatus == "1")
-                {
-                    StuInfoFreshEntity.PayFeeStatus = "已缴费";
-                }
-                else
-                {
-                    StuInfoFreshEntity.PayFeeStatus = "未缴费";
-                }
-                if (StuInfoFreshEntity.CollectFileStatus == "1")
-                {
-                    StuInfoFreshEntity.CollectFileStatus = "已提交";
-                }
-                else
-                {
-                    StuInfoFreshEntity.CollectFileStatus = "未提交";
-                }
-                if (StuInfoFreshEntity.GetKeyStatus == "1")
-                {
-                    StuInfoFreshEntity.GetKeyStatus = "已领取";
-                }
-                else
-                {
-                    StuInfoFreshEntity.GetKeyStatus = "未领取";
-                }
-
-                //获取头像地址
-                if (StuInfoFreshEntity.IsPhoto == true && !string.IsNullOrEmpty(StuInfoFreshEntity.Photo))
-                {
-                    var annexesFileEntity = annexesFileIBLL.GetEntity(StuInfoFreshEntity.Photo);
-                    if (annexesFileEntity != null)
-                    {
-                        url = annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource"));
-                    }
-                }
-                StuInfoFreshEntity.DormitoryName = accdormitoryIBLL.GetDormitoryInfoByPlanStuNo(StuInfoFreshEntity.ID);
-
-                //是否完善信息
-                StuInfoFreshFamilyList = stuInfoFreshIBLL.GetStuInfoFreshFamilyList(StuInfoFreshEntity.ID).ToList();
-                StuInfoFreshEmergePeopleList = stuInfoFreshIBLL.GetStuInfoFreshEmergePeopleList(StuInfoFreshEntity.ID).ToList();
-                StuInfoFreshEntity.ClassTutorNo = StuInfoFreshFamilyList.Any() ? "已完善" : "未完善";
-
-            }
-
-            var result = new
-            {
-                StuInfoFreshEntity = StuInfoFreshEntity,
-                StuInfoFreshFamilyList = StuInfoFreshFamilyList,
-                StuInfoFreshEmergePeopleList = StuInfoFreshEmergePeopleList,
-                Url = url
-            };
-
-            return Success(result);
-        }
+        
         /// <summary>
-        /// 保存个人信息
+        /// 保存完善个人信息
         /// </summary>
         /// <param name="_"></param>
         /// <returns></returns>
@@ -251,7 +172,7 @@ namespace Learun.Application.WebApi.Modules
             return Success("保存成功");
         }
         /// <summary>
-        /// 保存个人信息
+        /// 保存贷款回执码
         /// </summary>
         /// <param name="_"></param>
         /// <returns></returns>
@@ -350,6 +271,65 @@ namespace Learun.Application.WebApi.Modules
             return Success(result);
         }
 
+        /// <summary>
+        /// 根据班级查询新生列表
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetPageList(dynamic _)
+        {
+            ReqPageParam parameter = this.GetReqData<ReqPageParam>();
+            var data = stuInfoFreshIBLL.GetPageList(parameter.pagination, parameter.queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = parameter.pagination.total,
+                page = parameter.pagination.page,
+                records = parameter.pagination.records
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetForm(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntity(keyValue);
+            var jsonData = new
+            {
+                StuInfoFresh = StuInfoFreshData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response SaveForm(dynamic _)
+        {
+            ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
+            StuInfoFreshEntity entity = parameter.strEntity.ToObject<StuInfoFreshEntity>();
+
+            stuInfoFreshIBLL.SaveEntity(parameter.keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        #region  私有类
+
+        /// <summary>
+        /// 表单实体类
+        /// <summary>
+        private class ReqFormEntity
+        {
+            public string keyValue { get; set; }
+            public string strEntity { get; set; }
+        }
+        #endregion
 
         /// <summary>
         /// 个人信息

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -219,6 +219,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     strSql.Append(" and t.StuNo = @StuNo ");
                     dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
                 }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    strSql.Append(" and t.StuName like @StuName ");
+                    dp.Add("StuName", '%' + queryParam["StuName"].ToString() + '%', DbType.String);
+                }
                 //分配班级
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
@@ -328,6 +333,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         strSql.Append(" AND (t.DormitoryNo IS NOT NULL AND t.DormitoryNo<>'')");
                     }
                 }
+                //班主任/辅导员
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    strSql.Append(" and (c.ClassDiredctorNo = @EmpNo or c.ClassTutorNo = @EmpNo) ");
+                    dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String);
+                }
 
                 return this.BaseRepository("CollegeMIS").FindList<StuInfoFreshEntity>(strSql.ToString(), dp, pagination);
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs

@@ -32,12 +32,8 @@ namespace Learun.Application.WorkFlow
                 if (nwfTaskLogEntity != null)
                 {
                     entity.SpecifyReceiver = nwfTaskLogEntity.F_Des;
+                    asset.SaveEntity(entity.SFileId, entity);
                 }
-                else
-                {
-                    entity.SpecifyReceiver = "测试信息";
-                }
-                asset.SaveEntity(entity.SFileId, entity);
             }
             else
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Common/TimeOutCheckTool.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Learun.Util.Common
+{
+    public class TimeOutCheckTool
+    {
+        public T TimeoutCheck<T>(int ms, Func<T> func)
+        {
+            var wait = new ManualResetEvent(false);
+            bool RunOK = false;
+            var task = Task.Run<T>(() =>
+            {
+                var result = func.Invoke();
+                RunOK = true;
+                wait.Set();
+                return result;
+            });
+            wait.WaitOne(ms);
+            if (RunOK)
+            {
+                return task.Result;
+            }
+            else
+            {
+                return default(T);
+            }
+        }
+
+        public T TimeoutCheckTwo<T>(int ms, Func<T> func)
+        {
+            var wait = new ManualResetEvent(false);
+            bool RunOK = false;
+            var task = Task.Run<T>(() =>
+            {
+                var result = func.Invoke();
+                RunOK = true;
+                wait.Set();
+                return result;
+            });
+            wait.WaitOne(ms);
+            if (RunOK)
+            {
+                return task.Result;
+            }
+            else
+            {
+                return true;
+            }
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Common/Timeout.cs

@@ -19,7 +19,6 @@ namespace Learun.Util.Common
 
         public Timeout()
         {
-            //  初始状态为 停止
             this.mTimeoutObject = new ManualResetEvent(true);
         }
         ///<summary>
@@ -33,7 +32,7 @@ namespace Learun.Util.Common
                 return false;
             }
             this.mTimeoutObject.Reset();
-            this.mBoTimeout = true; //标记
+            this.mBoTimeout = true; 
             this.Do.BeginInvoke(DoAsyncCallBack, null);
             // 等待 信号Set
             if (!this.mTimeoutObject.WaitOne(timeSpan, false))

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Learun.Util.csproj

@@ -89,6 +89,7 @@
     <Compile Include="Attributes\EnumAttribute.cs" />
     <Compile Include="Common\CommonHelper.cs" />
     <Compile Include="Common\Timeout.cs" />
+    <Compile Include="Common\TimeOutCheckTool.cs" />
     <Compile Include="Config\Config.cs" />
     <Compile Include="DataBase\DataConvert.cs" />
     <Compile Include="DataBase\FieldTypeHepler.cs" />

Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json

@@ -119,7 +119,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxa68adccec10b45dd",
+        "appid" : "wxbc18c9bf92c86d28",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

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

@@ -10,7 +10,9 @@
         </view>
 
         <!-- 首页 Logo -->
-        <view mode="aspectFit" class="logo"></view>
+        <view mode="aspectFit" class="logo">
+			<image src="~@/static/logo.png" mode="widthFix" class="logoImg"></image>
+		</view>
 
         <!-- 【仅生产环境】使用账号的原因，无此项则微信审核通不过 -->
         <!-- <view v-if="!DEV" class="intro">
@@ -236,7 +238,7 @@ page {
     margin-bottom: 40rpx;
 
     .logo {
-      background-image: url('~@/static/logo.png');
+      // background-image: url('~@/static/logo.png');
       background-size: contain;
       height: 120rpx;
       width: 120rpx;
@@ -244,7 +246,9 @@ page {
       display: inline-block;
       border-radius: 5px;
     }
-
+	.logoImg {
+		width: 100%;
+	}
     .main-title {
       display: block;
       margin: 20rpx 0;

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.WebLicense/LicenseChecker.cs

@@ -54,14 +54,16 @@ namespace Quanjiang.DigitalScholl.WebLicense
 
 
 
-                Timeout timeout = new Timeout();
-                timeout.Do = GetMAManagementInfo;
-                bool bo = timeout.DoWithTimeout(new TimeSpan(0, 0, 0, 2));
+                //Timeout timeout = new Timeout();
+                //timeout.Do = GetMAManagementInfo;
+                //bool bo = timeout.DoWithTimeout(new TimeSpan(0, 0, 0, 4));
 
+                TimeOutCheckTool tool = new TimeOutCheckTool();
+                var checkResult = tool.TimeoutCheckTwo(4000, () => GetMAManagementInfo());
 
 
                 //var maResult = GetMAManagementInfo();
-                if (!bo)
+                if (!checkResult)
                 {
                     ls.Message = "未授权";
                     return ls;