解决冲突

.gitignore

@@ -80,3 +80,6 @@ Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
 /Learun.Framework.Ultimate V7/Learun.Application.Mobile/www.7z
 /Learun.Framework.Ultimate V7/Learun.Application.WebApi/bin.7z
 *.cs~merged
+/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalSerious
+/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalWeak
+/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode

CppProperties.json

@@ -0,0 +1,21 @@
+{
+  "configurations": [
+    {
+      "inheritEnvironments": [
+        "msvc_x64"
+      ],
+      "name": "x64-Debug",
+      "includePath": [
+        "${env.INCLUDE}",
+        "${workspaceRoot}\\**"
+      ],
+      "defines": [
+        "WIN32",
+        "_DEBUG",
+        "UNICODE",
+        "_UNICODE"
+      ],
+      "intelliSenseMode": "windows-msvc-x64"
+    }
+  ]
+}

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

@@ -1,4 +1,4 @@
-<div class="lr-form-container">
+<div class="lr-form-container">
     <!--<div class="lr-form-row  " data-table="StuInfoBasic">
 
         <label>出生日期</label>
@@ -29,6 +29,22 @@
         <label>联系电话</label>
         <input id="mobile" type="text" />
     </div>
+	
+	<div class="lr-form-row  " data-table="StuInfoBasic">
+	
+	    <label>开户银行</label>
+	    <div id="DepositBank"></div>
+	</div>
+	<div class="lr-form-row  " data-table="StuInfoBasic">
+	
+	    <label>银行卡账号</label>
+	    <input id="BankCard" type="text" />
+	</div>
+	<div class="lr-form-row  " data-table="StuInfoBasic">
+	
+	    <label>开户行位置</label>
+	    <input id="BankLocation" type="text" />
+	</div>
     <div class="lr-form-row  " data-table="StuInfoBasic">
 
         <label>邮箱地址</label>

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

@@ -1,193 +1,208 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
  * Copyright (c) 2013-2018 北京泉江科技有限公司  
  * 创建人：超级管理员 
  * 日  期：2020-01-19 10:46 
  * 描  述：学生信息 
  */
-(function () {
-    var keyValue = '';
-    var $header = null;
-    var titleText = '';
-    var page = {
-        isScroll: true,
-        init: function ($page, param) {
+(function() {
+	var keyValue = '';
+	var $header = null;
+	var titleText = '';
+	var page = {
+		isScroll: true,
+		init: function($page, param) {
 
-            var account = learun.storage.get('logininfo').account;
-            $.ajax({
-                type: 'POST',
-                url: config.webapi + '/Statistics/getStuInfo',
-                data: { 'account': account },
-                async: false,
-                success: function (msg) {
-                    if (msg.data) {
-                        keyValue = msg.data.StuId;
-                    } else {
-                        return false;
-                    }
-                }
-            });
-            //keyValue = param.keyValue;
-            // 添加头部按钮列表 
-            var _html = '\
+			var account = learun.storage.get('logininfo').account;
+			$.ajax({
+				type: 'POST',
+				url: config.webapi + '/Statistics/getStuInfo',
+				data: {
+					'account': account
+				},
+				async: false,
+				success: function(msg) {
+					if (msg.data) {
+						keyValue = msg.data.StuId;
+					} else {
+						return false;
+					}
+				}
+			});
+			//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/adms/EducationalAdministration/StuInfoBasic/delete', keyValue, (data) => {
-                                            learun.layer.loading(false);
-                                            if (data) {// 删除数据成功 
-                                                learun.nav.closeCurrent();
-                                                var prepage = learun.nav.getpage('EducationalAdministration/StuInfoBasic');
-                                                prepage.grid.reload();
-                                            }
-                                        });
-                                    }
-                                }, '智慧校园提示', ['取消', '确定']);
-                            }
-                        }
-                    ],
-                    cancel: function () {
-                    }
-                });
-            });
-            // 提交 
-            $header.find('.lr-form-header-submit').on('tap', function () {
-                // 获取表单数据 
-                if (!$page.find('.lr-form-container').lrformValid()) {
-                    return false;
-                }
-                var _postData = {}
-                _postData.keyValue = keyValue;
-                _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
-                learun.layer.loading(true, '正在提交数据');
-                learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/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();
-                        }
-                        learun.nav.closeCurrent();
-                    }
-                });
-            });
+			$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/adms/EducationalAdministration/StuInfoBasic/delete',
+										keyValue, (data) => {
+											learun.layer.loading(
+												false);
+											if (data) { // 删除数据成功 
+												learun.nav
+													.closeCurrent();
+												var prepage = learun
+													.nav.getpage(
+														'EducationalAdministration/StuInfoBasic'
+													);
+												prepage.grid
+													.reload();
+											}
+										});
+								}
+							}, '智慧校园提示', ['取消', '确定']);
+						}
+					}],
+					cancel: function() {}
+				});
+			});
+			// 提交 
+			$header.find('.lr-form-header-submit').on('tap', function() {
+				// 获取表单数据 
+				if (!$page.find('.lr-form-container').lrformValid()) {
+					return false;
+				}
+				var _postData = {}
+				_postData.keyValue = keyValue;
+				_postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
+				learun.layer.loading(true, '正在提交数据');
+				learun.httppost(config.webapi +
+					'learun/adms/EducationalAdministration/StuInfoBasic/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();
+							}
+							learun.nav.closeCurrent();
+						}
+					});
+			});
 
-            page.bind($page, param);
-            if (keyValue) {
+			page.bind($page, param);
+			if (keyValue) {
 
-                // 添加编辑按钮 
-                $page.find('.lr-form-container').setFormRead();
-                $header.find('.lr-form-header-btnlist').show();
-                // 获取表单数据 
-                learun.layer.loading(true, '获取表单数据');
-                learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/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('#Birthday').lrdate({
-            //    type: 'date'
-            //});
-            //$page.find('#PartyFaceNo').lrpickerex({
-            //    code: 'BCdPartyFace',
-            //    type: 'sourceData',
-            //    ivalue: 'partyfaceno',
-            //    itext: 'partyface'
-            //});
-            //$page.find('#NationalityNo').lrpickerex({
-            //    code: 'National',
-            //    type: 'dataItem'
-            //});
-            $page.find('#ResidenceNo').lrpickerex({
-                code: 'ResidenceNo',
-                type: 'dataItem'
-            });
-            //$page.find('#Photo').imagepicker();
-            //$page.find('#FamilyOriginNo').lrpickerex({
-            //    type: 'sourceData',
-            //    code: 'BCdFamilyOrigin',
-            //    ivalue: 'familyoriginno',
-            //    itext: 'familyorigin'
-            //});
-            //$page.find('#OverseasChineseNo').lrpickerex({
-            //    type: 'sourceData',
-            //    code: 'BCdOverseasChinese',
-            //    ivalue: 'overseaschineseno',
-            //    itext: 'overseaschinesename'
-            //});
-            //$page.find('#GraduateNo').lrpickerex({
-            //    code: 'CollegeType',
-            //    type: 'dataItem'
-            //});
-        }, destroy: function (pageinfo) {
-            $header = null;
-            keyValue = '';
-        }
-    };
-    return page;
-})(); 
+				// 添加编辑按钮 
+				$page.find('.lr-form-container').setFormRead();
+				$header.find('.lr-form-header-btnlist').show();
+				// 获取表单数据 
+				learun.layer.loading(true, '获取表单数据');
+				learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/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('#Birthday').lrdate({
+			//    type: 'date'
+			//});
+			//$page.find('#PartyFaceNo').lrpickerex({
+			//    code: 'BCdPartyFace',
+			//    type: 'sourceData',
+			//    ivalue: 'partyfaceno',
+			//    itext: 'partyface'
+			//});
+			$page.find('#NationalityNo').lrpickerex({
+			   code: 'National',
+			   type: 'dataItem'
+			});
+			// $page.find('#ResidenceNo').lrpickerex({
+			// 	code: 'ResidenceNo',
+			// 	type: 'dataItem',
+
+			// });
+			$page.find('#DepositBank').lrpickerex({
+				code: 'DepositBank',
+				type: 'dataItem'
+			});
+
+			//$page.find('#Photo').imagepicker();
+			//$page.find('#FamilyOriginNo').lrpickerex({
+			//    type: 'sourceData',
+			//    code: 'BCdFamilyOrigin',
+			//    ivalue: 'familyoriginno',
+			//    itext: 'familyorigin'
+			//});
+			//$page.find('#OverseasChineseNo').lrpickerex({
+			//    type: 'sourceData',
+			//    code: 'BCdOverseasChinese',
+			//    ivalue: 'overseaschineseno',
+			//    itext: 'overseaschinesename'
+			//});
+			//$page.find('#GraduateNo').lrpickerex({
+			//    code: 'CollegeType',
+			//    type: 'dataItem'
+			//});
+		},
+		destroy: function(pageinfo) {
+			$header = null;
+			keyValue = '';
+		}
+	};
+	return page;
+})();

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

@@ -1,142 +1,157 @@
-<div class="welcome">
-    <div class="welT">基本信息</div>
-    <div class="welBox">
-        <input type="hidden" name="ID" value="" id="ID" />
-        <div class="welText">
-            学号
-            <span id="StuNo"></span>
-        </div>
-        <div class="welText">
-            准考证号
-            <span id="zkzh"></span>
-        </div>
-        <div class="welText">
-            考生号
-            <span id="ksh"></span>
-        </div>
-        <div class="welText">
-            姓名 <span id="StuName"></span>
-        </div>
-        <div class="welText">
-            性别
-            <span id="GenderNo"></span>
-        </div>
-        <div class="welText">
-            系别
-            <span id="DeptNo"></span>
-        </div>
-        <div class="welText">
-            专业
-            <span id="MajorNo"></span>
-        </div>
-        <div class="welText">
-            班级
-            <span id="ClassNo"></span>
-        </div>
-        <div class="welText">
-            身份证号
-            <span id="IdentityCardNo"></span>
-        </div>
-        <div class="welText">
-            出生日期
-            <span id="Birthday"></span>
-        </div>
-        <div class="welText">
-            户口类别
-            <span id="ResidenceNo"></span>
-        </div>
-        <div class="welText">
-            政治面貌
-            <span id="PartyFaceNo"></span>
-        </div>
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">采集照片信息</div>
-    <div class="welBox">
-        <input type="hidden" id="Photo" value="" />
-        <input id="files" type="file" accept="image/*">
-        <div class="welImgAdd">
-            <!--<div id="welImgBtn">上传照片</div>-->
-            <img id="PhotoImg" src="" alt="">
-        </div>
-        <!--<div class="welText">说明：近期两寸免冠正面彩色照小于100K</div>-->
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">自然信息</div>
-    <div class="welBox">
-        <div class="welInput">
-            <span>籍贯</span>
-            <input id="RegionNo" type="text" placeholder="请填写籍贯" />
-        </div>
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">通讯信息</div>
-    <div class="welBox">
-        <div class="welInput">
-            <span>家庭住址</span>
-            <input id="FamilyAddress" type="text" placeholder="按XX省XX市XX县XX街道填写" />
-        </div>
-        <div class="welInput">
-            <span>联系电话</span>
-            <input id="telephone" type="text" placeholder="请填写联系电话(重要)" />
-        </div>
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">家庭成员(直系家属) <i title="家庭成员(直系家属)" class="iconfont icon-add"></i></div>
-    <div class="welBox" id="StuInfoFreshFamily">
-        <div class="welCon">
-            <div class="welInput">
-                <span>姓名</span>
-                <input type="text" name="Name" placeholder="请填写姓名" />
-            </div>
-            <div class="welInput">
-                <span>与本人关系</span>
-                <input type="text" name="Relation" placeholder="请填写与本人关系" />
-            </div>
-            <div class="welInput">
-                <span>性别</span>
-                <input type="text" name="Sex" placeholder="请填写性别" />
-            </div>
-            <div class="welInput">
-                <span>年龄</span>
-                <input type="text" name="Age" placeholder="请填写年龄" />
-            </div>
-            <div class="welInput">
-                <span>政治面貌</span>
-                <input type="text" name="Politicy" placeholder="请填写政治面貌" />
-            </div>
-            <div class="welDel"> <i class="iconfont icon-move"></i> </div>
-        </div>
-    </div>
-    <div class="welLine"></div>
-    <div class="welT">紧急联系人 <i title="紧急联系人" class="iconfont icon-add"></i></div>
-    <div class="welBox" id="StuInfoFreshEmergePeople">
-        <div class="welCon">
-            <div class="welInput">
-                <span>姓名</span>
-                <input type="text" name="Name" placeholder="请填写姓名" />
-            </div>
-            <div class="welInput">
-                <span>与本人关系</span>
-                <input type="text" name="Relation" placeholder="请填写与本人关系" />
-            </div>
-            <div class="welInput">
-                <span>手机号码</span>
-                <input type="text" name="Telephone" placeholder="请填写手机号码" />
-            </div>
-            <div class="welInput">
-                <span>座机号码</span>
-                <input type="text" name="Mobile" placeholder="请填写座机号码" />
-            </div>
-            <div class="welInput">
-                <span>联系地址</span>
-                <input type="text" name="Address" placeholder="请填写联系地址" />
-            </div>
-            <div class="welDel"> <i class="iconfont icon-move"></i> </div>
-        </div>
-    </div>
+	<div class="welT">基本信息</div>
+	<div class="welBox">
+		<input type="hidden" name="ID" value="" id="ID" />
+		<div class="welText">
+			学号
+			<span id="StuNo"></span>
+		</div>
+		<div class="welText">
+			准考证号
+			<span id="zkzh"></span>
+		</div>
+		<div class="welText">
+			考生号
+			<span id="ksh"></span>
+		</div>
+		<div class="welText">
+			姓名 <span id="StuName"></span>
+		</div>
+		<div class="welText">
+			性别
+			<span id="GenderNo"></span>
+		</div>
+		<div class="welText">
+			系别
+			<span id="DeptNo"></span>
+		</div>
+		<div class="welText">
+			专业
+			<span id="MajorNo"></span>
+		</div>
+		<div class="welText">
+			班级
+			<span id="ClassNo"></span>
+		</div>
+		<div class="welText">
+			身份证号
+			<span id="IdentityCardNo"></span>
+		</div>
+		<div class="welText">
+			出生日期
+			<span id="Birthday"></span>
+		</div>
+		<div class="welText">
+			户口类别
+			<span id="ResidenceNo"></span>
+		</div>
+		<div class="welText">
+			政治面貌
+			<span id="PartyFaceNo"></span>
+		</div>
+	</div>
+	<div class="welLine"></div>
+	<div class="welT">采集照片信息</div>
+	<div class="welBox">
+		<input type="hidden" id="Photo" value="" />
+		<input id="files" type="file" accept="image/*">
+		<div class="welImgAdd">
+			<!--<div id="welImgBtn">上传照片</div>-->
+			<img id="PhotoImg" src="" alt="">
+		</div>
+		<!--<div class="welText">说明：近期两寸免冠正面彩色照小于100K</div>-->
+	</div>
+	<div class="welLine"></div>
+	<div class="welT">自然信息</div>
+	<div class="welBox">
+		<div class="welInput">
+			<span>籍贯</span>
+			<input id="RegionNo" type="text" placeholder="请填写籍贯" />
+		</div>
+	</div>
+	<div class="welLine"></div>
+	<div class="welT">通讯信息</div>
+	<div class="welBox">
+		<div class="welInput">
+			<span>家庭住址</span>
+			<input id="FamilyAddress" type="text" placeholder="按XX省XX市XX县XX街道填写" />
+		</div>
+		<div class="welInput">
+			<span>联系电话</span>
+			<input id="telephone" type="text" placeholder="请填写联系电话(重要)" />
+		</div>
 
-    <div class="btnBox">
-        <button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block">保存</button>
-    </div>
-</div>
+		<div data-table="StuInfoBasic">
+			<span>基础信息</span>
+			<div class="welInput">
+				<span>开户银行</span>
+				<!-- <input id="DepositBank" type="text" placeholder="请选择开户银行" /> -->
+				<div id="DepositBank" placeholder="请选择开户银行"></div>
+			</div>
+			<div class="welInput  ">
+				<span>银行卡账号</span>
+				<input id="BankCard" type="text" placeholder="请填写银行卡号"/>
+			</div>
+			<div class="welInput  ">
+				<span>开户行位置</span>
+				<input id="BankLocation" type="text" placeholder="请填写开户行位置" />
+			</div>
+		</div>
+		<div class="welLine"></div>
+		<div class="welT">家庭成员(直系家属) <i title="家庭成员(直系家属)" class="iconfont icon-add"></i></div>
+		<div class="welBox" id="StuInfoFreshFamily">
+			<div class="welCon">
+				<div class="welInput">
+					<span>姓名</span>
+					<input type="text" name="Name" placeholder="请填写姓名" />
+				</div>
+				<div class="welInput">
+					<span>与本人关系</span>
+					<input type="text" name="Relation" placeholder="请填写与本人关系" />
+				</div>
+				<div class="welInput">
+					<span>性别</span>
+					<input type="text" name="Sex" placeholder="请填写性别" />
+				</div>
+				<div class="welInput">
+					<span>年龄</span>
+					<input type="text" name="Age" placeholder="请填写年龄" />
+				</div>
+				<div class="welInput">
+					<span>政治面貌</span>
+					<input type="text" name="Politicy" placeholder="请填写政治面貌" />
+				</div>
+				<div class="welDel"> <i class="iconfont icon-move"></i> </div>
+			</div>
+		</div>
+		<div class="welLine"></div>
+		<div class="welT">紧急联系人 <i title="紧急联系人" class="iconfont icon-add"></i></div>
+		<div class="welBox" id="StuInfoFreshEmergePeople">
+			<div class="welCon">
+				<div class="welInput">
+					<span>姓名</span>
+					<input type="text" name="Name" placeholder="请填写姓名" />
+				</div>
+				<div class="welInput">
+					<span>与本人关系</span>
+					<input type="text" name="Relation" placeholder="请填写与本人关系" />
+				</div>
+				<div class="welInput">
+					<span>手机号码</span>
+					<input type="text" name="Telephone" placeholder="请填写手机号码" />
+				</div>
+				<div class="welInput">
+					<span>座机号码</span>
+					<input type="text" name="Mobile" placeholder="请填写座机号码" />
+				</div>
+				<div class="welInput">
+					<span>联系地址</span>
+					<input type="text" name="Address" placeholder="请填写联系地址" />
+				</div>
+				<div class="welDel"> <i class="iconfont icon-move"></i> </div>
+			</div>
+		</div>
+
+		<div class="btnBox">
+			<button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block">保存</button>
+		</div>
+	</div>

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

@@ -1,340 +1,375 @@
-(function () {
-    var colDataItemArr = ['GenderNo'];
-    var colDataItemCode = ['usersex'];
-    
-    var page = {
-        isScroll: false,
-        init: function ($page) {
-            // 获取登录者信息
-            var userinfo = learun.storage.get('userinfo');
+(function() {
+	var colDataItemArr = ['GenderNo'];
+	var colDataItemCode = ['usersex'];
+	var colDataItemBank = ['DepositBank'];
 
-            //增加联系人
-            $page.find('.welT i').on('tap', function () {
-                var FamilyHtml = '<div class="welCon"><form class="welConForm">' +
-                    '<div class="welInput">' +
-                    '<span>姓名</span>' +
-                    '<input type="text" name="Name" placeholder="请填写姓名" />' +
-                    '</div>' +
-                    '<div class="welInput">' +
-                    '<span>与本人关系</span>' +
-                    '<div name="Relation" value=""></div>' +
-                    '</div>' +
-                    '<div class="welInput">' +
-                    '<span>性别</span>' +
-                    '<div name="Sex" value=""></div>' +
-                    '</div>' +
-                    '<div class="welInput">' +
-                    '<span>年龄</span>' +
-                    '<input type="text" name="Age" placeholder="请填写年龄" />' +
-                    '</div>' +
-                    '<div class="welInput">' +
-                    '<span>政治面貌</span>' +
-                    '<div name="Politicy" value=""></div>' +
-                    '</div>' +
-                    //'<div class="welInput">' +
-                    //'<span>身份证号</span>' +
-                    //'<input type="text" name="IdCard" placeholder="请填写身份证号" />' +
-                    //'</div>' +
-                    '<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
-                    '</form></div>';
-                var EmergePeopleHtml = '<div class="welCon"><form class="welConForm">' +
-                    '<div class="welInput">' +
-                    '<span>姓名</span>' +
-                    '<input type="text" name="Name" placeholder="请填写姓名" />' +
-                    '</div>' +
-                    '<div class="welInput">' +
-                    '<span>与本人关系</span>' +
-                    '<input type="text" name="Relation"  placeholder="请填写与本人关系" />' +
-                    '</div>' +
-                    '<div class="welInput">' +
-                    '<span>手机号码</span>' +
-                    '<input type="text" name="Telephone"  placeholder="请填写手机号码" />' +
-                    '</div>' +
-                    '<div class="welInput">' +
-                    '<span>座机号码</span>' +
-                    '<input type="text" name="Mobile" placeholder="请填写座机号码" />' +
-                    '</div>' +
-                    '<div class="welInput">' +
-                    '<span>联系地址</span>' +
-                    '<input type="text" name="Address" placeholder="请填写联系地址" />' +
-                    '</div>' +
-                    '<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
-                    '</form></div>';
+	var page = {
+		isScroll: false,
+		init: function($page) {
+			// 获取登录者信息
+			var userinfo = learun.storage.get('userinfo');
 
+			//增加联系人
+			$page.find('.welT i').on('tap', function() {
+				var FamilyHtml = '<div class="welCon"><form class="welConForm">' +
+					'<div class="welInput">' +
+					'<span>姓名</span>' +
+					'<input type="text" name="Name" placeholder="请填写姓名" />' +
+					'</div>' +
+					'<div class="welInput">' +
+					'<span>与本人关系</span>' +
+					'<div name="Relation" value=""></div>' +
+					'</div>' +
+					'<div class="welInput">' +
+					'<span>性别</span>' +
+					'<div name="Sex" value=""></div>' +
+					'</div>' +
+					'<div class="welInput">' +
+					'<span>年龄</span>' +
+					'<input type="text" name="Age" placeholder="请填写年龄" />' +
+					'</div>' +
+					'<div class="welInput">' +
+					'<span>政治面貌</span>' +
+					'<div name="Politicy" value=""></div>' +
+					'</div>' +
+					//'<div class="welInput">' +
+					//'<span>身份证号</span>' +
+					//'<input type="text" name="IdCard" placeholder="请填写身份证号" />' +
+					//'</div>' +
+					'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+					'</form></div>';
+				var EmergePeopleHtml = '<div class="welCon"><form class="welConForm">' +
+					'<div class="welInput">' +
+					'<span>姓名</span>' +
+					'<input type="text" name="Name" placeholder="请填写姓名" />' +
+					'</div>' +
+					'<div class="welInput">' +
+					'<span>与本人关系</span>' +
+					'<input type="text" name="Relation"  placeholder="请填写与本人关系" />' +
+					'</div>' +
+					'<div class="welInput">' +
+					'<span>手机号码</span>' +
+					'<input type="text" name="Telephone"  placeholder="请填写手机号码" />' +
+					'</div>' +
+					'<div class="welInput">' +
+					'<span>座机号码</span>' +
+					'<input type="text" name="Mobile" placeholder="请填写座机号码" />' +
+					'</div>' +
+					'<div class="welInput">' +
+					'<span>联系地址</span>' +
+					'<input type="text" name="Address" placeholder="请填写联系地址" />' +
+					'</div>' +
+					'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+					'</form></div>';
 
-                var obj = $(this).parent().next();
-                if ($(this).attr('title') == '紧急联系人') {
-                    obj.append(EmergePeopleHtml);
-                } else {
-                    obj.append(FamilyHtml);
-                }
 
+				var obj = $(this).parent().next();
+				if ($(this).attr('title') == '紧急联系人') {
+					obj.append(EmergePeopleHtml);
+				} else {
+					obj.append(FamilyHtml);
+				}
 
-                page.bind($page);
-            })
-            //删除联系人
-            $page.find('.welBox').on('tap', '.welDel i', function () {
-                var parents = $(this).parents('.welCon')
-                learun.layer.confirm('是否删除此联系人？', function (_index) {
-                    _index == 1 ? parents.remove() : ''
-                }, '提示', ['否', '是']);
-            })
-            //上传照片
-            var inputNode = $page.find('#files');
-            $page.find('#welImgBtn').on('tap', function () {
-                var evt = new MouseEvent("click", {
-                    bubbles: false,
-                    cancelable: true,
-                    view: window
-                });
-                inputNode[0].dispatchEvent(evt);
-            })
-            inputNode.on('change', function () {
-                previewFile();
-            });
 
-            //数据绑定 
-            learun.layer.loading(true, '获取数据中');
-            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
-                if (data) {
-                    //基本信息
-                    for (var id in data['StuInfoFreshEntity']) {
-                        var dom = $('#' + id)[0];
-                        if (dom) {
-                            if (dom.tagName.toLowerCase() == "span") {
-                                $('#' + id).html(data['StuInfoFreshEntity']['' + id + '']);
-                                //数据字典
-                                if ($.inArray(id, colDataItemArr) >= 0) {
-                                    learun.clientdata.get('dataItem', {
-                                        code: colDataItemCode[$.inArray(id, colDataItemArr)],
-                                        key: data['StuInfoFreshEntity']['' + id + ''],
-                                        callback: function (data, op) {
-                                            $('#' + id).html(data.text);
-                                        }
-                                    });
-                                }
-                                if (id == "PartyFaceNo") {
-                                    learun.clientdata.get('sourceData', {
-                                        code: 'BCdPartyFace',
-                                        key: data['StuInfoFreshEntity']['' + id + ''],
-                                        keyId: 'partyfaceno',
-                                        callback: function (data, op) {
-                                            $("#PartyFaceNo").html(data.partyface);
-                                        }
-                                    });
-                                }
-                            } else if (dom.tagName.toLowerCase() == "input") {
-                                $('#' + id).val(data['StuInfoFreshEntity']['' + id + '']);
-                            }
-                        }
-                    }
-                    $("#Birthday").html($("#Birthday").text().substr(0, $("#Birthday").text().indexOf(' ')));
-                    //头像
-                    $('#PhotoImg').attr('src', config.web + data['Url']);
-                    //家庭成员
-                    $('#StuInfoFreshFamily').html("");
-                    $.each(data['StuInfoFreshFamilyList'], function (i, item) {
-                        var html = '<div class="welCon"><form class="welConForm">' +
-                            '<div class="welInput">' +
-                            '<span>姓名</span>' +
-                            '<input 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>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>性别</span>' +
-                            //'<input 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 + '"/>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>政治面貌</span>' +
-                            //'<input 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 + '"/>' +
-                            //'</div>' +
-                            '<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
-                            '</form></div> ';
-                        $('#StuInfoFreshFamily').append(html);
+				page.bind($page);
+			})
+			//删除联系人
+			$page.find('.welBox').on('tap', '.welDel i', function() {
+				var parents = $(this).parents('.welCon')
+				learun.layer.confirm('是否删除此联系人？', function(_index) {
+					_index == 1 ? parents.remove() : ''
+				}, '提示', ['否', '是']);
+			})
+			//上传照片
+			var inputNode = $page.find('#files');
+			$page.find('#welImgBtn').on('tap', function() {
+				var evt = new MouseEvent("click", {
+					bubbles: false,
+					cancelable: true,
+					view: window
+				});
+				inputNode[0].dispatchEvent(evt);
+			})
+			inputNode.on('change', function() {
+				previewFile();
+			});
 
-                    });
+			//数据绑定 
+			learun.layer.loading(true, '获取数据中');
+			learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (
+				data) => {
+				if (data) {
+					//基本信息
+					for (var id in data['StuInfoFreshEntity']) {
+						var dom = $('#' + id)[0];
+						if (dom) {
+							if (dom.tagName.toLowerCase() == "span") {
+								$('#' + id).html(data['StuInfoFreshEntity']['' + id + '']);
+								//数据字典
+								if ($.inArray(id, colDataItemArr) >= 0) {
+									learun.clientdata.get('dataItem', {
+										code: colDataItemCode[$.inArray(id,
+											colDataItemArr)],
+										key: data['StuInfoFreshEntity']['' + id + ''],
+										callback: function(data, op) {
+											$('#' + id).html(data.text);
+										}
+									});
+								}
+								if (id == "PartyFaceNo") {
+									learun.clientdata.get('sourceData', {
+										code: 'BCdPartyFace',
+										key: data['StuInfoFreshEntity']['' + id + ''],
+										keyId: 'partyfaceno',
+										callback: function(data, op) {
+											$("#PartyFaceNo").html(data.partyface);
+										}
+									});
+								}
+								// if (id == "#DepositBank") {
+								// 	learun.clientdata.get('sourceData', {
+								// 		code: 'DepositBank',
+								// 		key: data['StuInfoFreshEntity']['' + id + ''],
+								// 		keyId: 'DepositBank',
+								// 		callback: function(data, op) {
+								// 			$("#DepositBank").html(data.text);
+								// 		}
+								// 	});
+								// }
+							} else if (dom.tagName.toLowerCase() == "input") {
+								$('#' + id).val(data['StuInfoFreshEntity']['' + id + '']);
+							}
+						}
+					}
+					$("#Birthday").html($("#Birthday").text().substr(0, $("#Birthday").text()
+						.indexOf(' ')));
+					$("#DepositBank").lrpickerSet(data.StuInfoFreshEntity.DepositBank);
+					//头像
+					$('#PhotoImg').attr('src', config.web + data['Url']);
+					//家庭成员
+					$('#StuInfoFreshFamily').html("");
+					$.each(data['StuInfoFreshFamilyList'], function(i, item) {
+						var html = '<div class="welCon"><form class="welConForm">' +
+							'<div class="welInput">' +
+							'<span>姓名</span>' +
+							'<input 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>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>性别</span>' +
+							//'<input 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 + '"/>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>政治面貌</span>' +
+							//'<input 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 + '"/>' +
+							//'</div>' +
+							'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+							'</form></div> ';
+						$('#StuInfoFreshFamily').append(html);
 
-                    //紧急联系人
-                    $('#StuInfoFreshEmergePeople').html("");
-                    $.each(data['StuInfoFreshEmergePeopleList'], function (i, item) {
-                        var html = '<div class="welCon"><form class="welConForm">' +
-                            '<div class="welInput">' +
-                            '<span>姓名</span>' +
-                            '<input type="text" name="Name" placeholder="请填写姓名" value="' + item.Name + '"/>' +
-                            '</div >' +
-                            '<div class="welInput">' +
-                            '<span>与本人关系</span>' +
-                            '<input type="text" name="Relation" placeholder="请填写与本人关系" value="' + item.Relation + '"/>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>手机号码</span>' +
-                            '<input type="text" name="Telephone" placeholder="请填写手机号码" value="' + item.Telephone + '"/>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>座机号码</span>' +
-                            '<input type="text" name="Mobile" placeholder="请填写座机号码" value="' + item.Mobile + '"/>' +
-                            '</div>' +
-                            '<div class="welInput">' +
-                            '<span>联系地址</span>' +
-                            '<input type="text" name="Address" placeholder="请填写联系地址" value="' + item.Address + '"/>' +
-                            '</div>' +
-                            '<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
-                            '</form></div > ';
-                        $('#StuInfoFreshEmergePeople').append(html);
+					});
 
-                    });
+					//紧急联系人
+					$('#StuInfoFreshEmergePeople').html("");
+					$.each(data['StuInfoFreshEmergePeopleList'], function(i, item) {
+						var html = '<div class="welCon"><form class="welConForm">' +
+							'<div class="welInput">' +
+							'<span>姓名</span>' +
+							'<input type="text" name="Name" placeholder="请填写姓名" value="' +
+							item.Name + '"/>' +
+							'</div >' +
+							'<div class="welInput">' +
+							'<span>与本人关系</span>' +
+							'<input type="text" name="Relation" placeholder="请填写与本人关系" value="' +
+							item.Relation + '"/>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>手机号码</span>' +
+							'<input type="text" name="Telephone" placeholder="请填写手机号码" value="' +
+							item.Telephone + '"/>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>座机号码</span>' +
+							'<input type="text" name="Mobile" placeholder="请填写座机号码" value="' +
+							item.Mobile + '"/>' +
+							'</div>' +
+							'<div class="welInput">' +
+							'<span>联系地址</span>' +
+							'<input type="text" name="Address" placeholder="请填写联系地址" value="' +
+							item.Address + '"/>' +
+							'</div>' +
+							'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+							'</form></div > ';
+						$('#StuInfoFreshEmergePeople').append(html);
 
-                    page.bind($page);
-                    learun.layer.loading(false);
+					});
 
-                }
+					page.bind($page);
+					learun.layer.loading(false);
 
-            });
+				}
 
-            //保存
-            $page.find('#saveBtn').on('tap', function () {
-                var postdata = {
-                    ID: $('#ID').val(),
-                    RegionNo: $('#RegionNo').val(),
-                    FamilyAddress: $('#FamilyAddress').val(),
-                    telephone: $('#telephone').val(),
-                    Photo: $('#Photo').val(),
-                    StuInfoFreshFamilyEntities: family(),
-                    StuInfoFreshEmergePeopleEntities: emergePeople()
-                };
+			});
+
+			//保存
+			$page.find('#saveBtn').on('tap', function() {
+				var postdata = {
+					ID: $('#ID').val(),
+					RegionNo: $('#RegionNo').val(),
+					FamilyAddress: $('#FamilyAddress').val(),
+					telephone: $('#telephone').val(),
+					Photo: $('#Photo').val(),
+					DepositBank: $('#DepositBank').lrpickerGet(),
+					BankCard: $('#BankCard').val(),
+					BankLocation: $('#BankLocation').val(),
+					StuInfoFreshFamilyEntities: family(),
+					StuInfoFreshEmergePeopleEntities: emergePeople()
+				};
 				console.log(postdata)
 				// return
-                learun.layer.loading(true, '正在提交数据');
-                learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (data) => {
-                    learun.layer.loading(false);
-                    if (data) {
-                        learun.layer.toast('保存成功');
-                        location.reload();
-                    }
-                });
+				learun.layer.loading(true, '正在提交数据');
+				learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (
+					data) => {
+					learun.layer.loading(false);
+					if (data) {
+						learun.layer.toast('保存成功');
+						location.reload();
+					}
+				});
+
+			});
 
-            });
 
+		},
+		bind: function($page) {
+			//性别
+			$.each($page.find('[name="Sex"]'), function(i, item) {
+				$page.find(item).lrpickerex({
+					code: 'usersex',
+					type: 'dataItem'
+				});
+				//赋值
+				$(item).lrpickerSet($(item).attr('value'));
+			});
+			$page.find('#DepositBank').lrpickerex({
+				code: 'DepositBank',
+				type: 'dataItem'
+			});
+			//政治面貌
+			$.each($page.find('[name="Politicy"]'), function(i, item) {
+				$page.find(item).lrpickerex({
+					code: 'BCdPartyFace',
+					type: 'sourceData',
+					ivalue: 'partyfaceno',
+					itext: 'partyface'
+				});
+				//赋值
+				$(item).lrpickerSet($(item).attr('value'));
+			});
+			//与本人关系
+			$.each($page.find('#StuInfoFreshFamily').find('[name="Relation"]'), function(i, item) {
+				$page.find(item).lrpickerex({
+					code: 'FamilyRelation',
+					type: 'dataItem'
+				});
+				//赋值
+				$(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.DepositBank = $(item).find('[name="DepositBank"]').lrpickerGet();
+			o.Politicy = $(item).find('[name="Politicy"]').lrpickerGet();
+			o.Relation = $(item).find('[name="Relation"]').lrpickerGet();
+			list.push(o);
+		});
+		return list;
+	}
 
-        },
-        bind: function ($page) {
-            //性别
-            $.each($page.find('[name="Sex"]'), function (i, item) {
-                $page.find(item).lrpickerex({
-                    code: 'usersex',
-                    type: 'dataItem'
-                });
-                //赋值
-                $(item).lrpickerSet($(item).attr('value'));
-            });
-            //政治面貌
-            $.each($page.find('[name="Politicy"]'), function (i, item) {
-                $page.find(item).lrpickerex({
-                    code: 'BCdPartyFace',
-                    type: 'sourceData',
-                    ivalue: 'partyfaceno',
-                    itext: 'partyface'
-                });
-                //赋值
-                $(item).lrpickerSet($(item).attr('value'));
-            });
-            //与本人关系
-            $.each($page.find('#StuInfoFreshFamily').find('[name="Relation"]'), function (i, item) {
-                $page.find(item).lrpickerex({
-                    code: 'FamilyRelation',
-                    type: 'dataItem'
-                });
-                //赋值
-                $(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;
-    }
+	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;
-    }
+	$.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;
+	}
 
-    //上传照片
-    function previewFile() {
-        var html = '';
-        var file = document.querySelector('input[type=file]').files[0];
-        var reader = new FileReader();
-        reader.onloadend = function () {
-            //$('#PhotoImg').attr('src', reader.result);
-            var postData = {
-                Base64Url: reader.result
-            }
-            learun.httppost(config.webapi + "StuInfoFresh/savePhoto", postData, (data) => {
-                if (data) {
-                    $('#Photo').val(data.AnnexesFileId);
-                    $('#PhotoImg').attr('src', config.web + data.Url);
-                } else {
-                    learun.layer.toast('采集照片信息失败！');
-                }
-            });
-        }
-        if (file) {
-            reader.readAsDataURL(file);
-        }
-    }
+	//上传照片
+	function previewFile() {
+		var html = '';
+		var file = document.querySelector('input[type=file]').files[0];
+		var reader = new FileReader();
+		reader.onloadend = function() {
+			//$('#PhotoImg').attr('src', reader.result);
+			var postData = {
+				Base64Url: reader.result
+			}
+			learun.httppost(config.webapi + "StuInfoFresh/savePhoto", postData, (data) => {
+				if (data) {
+					$('#Photo').val(data.AnnexesFileId);
+					$('#PhotoImg').attr('src', config.web + data.Url);
+				} else {
+					learun.layer.toast('采集照片信息失败！');
+				}
+			});
+		}
+		if (file) {
+			reader.readAsDataURL(file);
+		}
+	}
 
-    //产生随机数
-    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 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;
+	}
 
-    return page;
+	return page;
 })();

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

@@ -39,6 +39,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 银行
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexBank()
+        {
+            return View("Index");
+        }
+        /// <summary>
         /// 主页面【大厂】
         /// <summary>
         /// <returns></returns>

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

@@ -46,6 +46,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Indexbank()
+        {
+            return View("Index");
+        }
+        
         [HttpGet]
         public ActionResult IndexDC()
         {

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

@@ -41,7 +41,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">疫情状态</div>
-        <div id="HealthStatus" ></div>
+        <div id="HealthStatus"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
@@ -54,8 +54,8 @@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">健康状况</div>
         <div id="HealthStatusNo"></div>
-    </div> 
-      <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">户口分类</div>
         <div id="ResidenceNo"></div>
     </div>
@@ -79,6 +79,18 @@
         <div class="lr-form-item-title">E-mail</div>
         <input id="EMail" type="text" class="form-control" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">开户银行<font face="宋体">*</font></div>
+        <div id="DepositBank" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">开户卡账号<font face="宋体">*</font></div>
+        <input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">开户银行位置</div>
+        <input id="BankLocation" type="text" class="form-control" />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">通信地址<font face="宋体">*</font></div>
         <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />

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

@@ -55,6 +55,7 @@ var bootstrap = function ($, learun) {
             }
         },
         bind: function () {
+            $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); 
             $('#F_ProvinceId').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {
@@ -168,6 +169,7 @@ var bootstrap = function ($, learun) {
                         learun.alert.error('请先选择系和专业');
                     }
                 });
+
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -198,7 +198,6 @@ var bootstrap = function ($, learun) {
 
 
 
-
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -351,7 +351,10 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                         }
-                    }
+                    },
+                    { label: '开户银行', name: 'DepositBank', width: 100, align: "left" },
+                    { label: '银行卡账号', name: 'BankCard', width: 150, align: "left" },
+                    { label: '开户银行位置', name: 'BankLocation', width: 200, align: "left" },
                 ],
                 mainId: 'StuId',
                 isPage: true,

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

@@ -129,7 +129,18 @@
         <div class="lr-form-item-title">精准贫困户</div>
         <div id="IsPoor"></div>
     </div>
-
+    <div class="col-xs-6 lr-form-item"  data-table="StuInfoFresh" > 
+        <div class="lr-form-item-title">开户银行<font face="宋体">*</font></div> 
+        <div id="DepositBank" isvalid="yes" checkexpession="NotNull" ></div> 
+    </div> 
+    <div class="col-xs-6 lr-form-item"  data-table="StuInfoFresh" > 
+        <div class="lr-form-item-title">银行卡账号<font face="宋体">*</font></div> 
+        <input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" /> 
+    </div> 
+    <div class="col-xs-6 lr-form-item"  data-table="StuInfoFresh" > 
+        <div class="lr-form-item-title">开户银行位置</div> 
+        <input id="BankLocation" type="text" class="form-control"  /> 
+    </div> 
 
     <div class="col-xs-12" id="photoBox">
         <div id="photoBtn" class="btn btn-default ">拍照</div>

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

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); 
             $("#GenderNo").lrDataItemSelect({ code: 'usersex' });
             $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
             $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });

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

@@ -321,6 +321,9 @@ var bootstrap = function ($, learun) {
                     { label: '数学', name: 'MathScore', width: 100, align: "left" },
                     { label: '英语', name: 'ForeignLangScore', width: 100, align: "left" },
                     { label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" },
+                    { label: '开户银行', name: 'DepositBank', width: 100, align: "left" },
+                    { label: '银行卡账号', name: 'BankCard', width: 150, align: "left" },
+                    { label: '开户银行位置', name: 'BankLocation', width: 200, align: "left" },
                 ],
                 mainId: 'ID',
                 isPage: true,

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

@@ -7172,6 +7172,8 @@
     <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\TeacherIndex.cshtml" />
     <Content Include="Areas\LR_OrganizationModule\Views\User\FamilyIndex.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
+    <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\FormViewAttendance.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexStatistics.cshtml" />
@@ -7253,6 +7255,10 @@
     <Content Include="Views\SSOSystem\_LayoutSSODrag.cshtml" />
     <Content Include="Views\Login\PageSeven.cshtml" />
     <Content Include="Views\Login\PageSevenWxLogin.cshtml" />
+    <None Include="Properties\PublishProfiles\FolderProfile2.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile3.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
+    <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile4.pubxml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
+自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>bin\Release\Publish</publishUrl>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js

@@ -38,9 +38,19 @@
             }
             return res;
         },
+        isBankCard: function (obj) {//验证银行卡的长度
+            var res = { code: true, msg: '' };
+            obj = $.trim(obj);
+            if (obj.length >= 20 || obj.length < 16) {
+                res.code = false;
+                res.msg = '输入错误，请核对银行卡账号';
+            }
+            return res;
+        },
         isNum: function (obj) {// 验证数字
             return learun.validator.validReg(obj, /^[-+]?\d+$/, '必须为数字');
         },
+
         isPositiveInteger: function (obj) {// 正整数
             return learun.validator.validReg(obj, /^[1-9]\d*$/, '必须为正整数');
         },
@@ -201,7 +211,7 @@
                 res.msg = '必须小于等于' + n + '位字符或空';
             }
             return res;
-        }
+        },
     };
 
 })(window.jQuery, top.learun);

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

@@ -171,6 +171,10 @@ namespace Learun.Application.WebApi.Modules
             entity.RegionNo = model.RegionNo;
             entity.FamilyAddress = model.FamilyAddress;
             entity.telephone = model.telephone;
+            entity.BankCard = model.BankCard;
+            entity.BankLocation = model.BankLocation;
+            entity.DepositBank = model.DepositBank;
+
             if (!string.IsNullOrEmpty(model.Photo))
             {
                 entity.IsPhoto = true;
@@ -330,7 +334,6 @@ namespace Learun.Application.WebApi.Modules
         {
             ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
             StuInfoFreshEntity entity = parameter.strEntity.ToObject<StuInfoFreshEntity>();
-
             stuInfoFreshIBLL.SaveEntity(parameter.keyValue, entity);
             return Success("保存成功！");
         }
@@ -388,6 +391,18 @@ namespace Learun.Application.WebApi.Modules
             /// 紧急联系人
             /// </summary>
             public List<StuInfoFreshEmergePeopleEntity> StuInfoFreshEmergePeopleEntities { get; set; }
+            /// <summary>
+            /// 开户行
+            /// </summary>
+            public string DepositBank { get; set; }
+            /// <summary>
+            /// 银行卡号
+            /// </summary>
+            public string BankCard { get; set; }
+            /// <summary>
+            /// 开户行位置
+            /// </summary>
+            public string BankLocation { get; set; }
 
         }
 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config

@@ -92,6 +92,10 @@
   <!-- ================== 默认头像 ================== -->
   <add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
   <!--统一身份认证加密公钥-->
+  <!--批量生成家长帐号时默认的角色Id-->
+  <add key="GenerateParentsRoleId" value="" />
+  <!--默认密码-->
+  <add key="defaultpwd" value="123456" />
   <add key="SSOPublicSecret" value="bjquanjiang" />
   <!-- 深信服ACIp -->
   <add key="ACIp" value=""/>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -708,7 +708,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("TWOPOSITION")]
         public string TwoPosition { get; set; }
-
+        /// <summary> 
+        /// 开户银行 
+        /// </summary> 
+        [Column("DEPOSITBANK")]
+        public string DepositBank { get; set; }
+        /// <summary> 
+        /// 银行卡账号 
+        /// </summary> 
+        [Column("BANKCARD")]
+        public string BankCard { get; set; }
+        /// <summary> 
+        /// 开户银行位置 
+        /// </summary> 
+        [Column("BANKLOCATION")]
+        public string BankLocation { get; set; }
         #endregion
 
         #region  扩展操作

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

@@ -597,6 +597,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         [Column("ISINBASIC")]
         public bool? IsInBasic { get; set; }
+        /// <summary> 
+        /// 开户银行 
+        /// </summary> 
+        [Column("DEPOSITBANK")]
+        public string DepositBank { get; set; }
+        /// <summary> 
+        /// 银行卡账号 
+        /// </summary> 
+        [Column("BANKCARD")]
+        public string BankCard { get; set; }
+        /// <summary> 
+        /// 开户银行位置 
+        /// </summary> 
+        [Column("BANKLOCATION")]
+        public string BankLocation { get; set; }
 
         #endregion
 

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

@@ -861,6 +861,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     entity.Modify(keyValue);
                     db.Update(entity);
                     db.Delete<StuInfoFreshEmergePeopleEntity>(t => t.StuInfoFreshId == stuInfoFreshEntityTmp.ID);
+                    
                     if (null != stuInfoFreshEmergePeopleList && null != stuInfoFreshFamilyList)
                     {
                         foreach (StuInfoFreshEmergePeopleEntity item in stuInfoFreshEmergePeopleList)
@@ -899,10 +900,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         }
                     }
                 }
-                db.Commit();
-
                 //家长生成账号
                 GenerateAccoutForStuFamily(entity, stuInfoFreshFamilyList);
+                db.Commit();
+
+            
             }
             catch (Exception ex)
             {