优化

WebRoot/ymbk/routes/std/info/std_info.html

@@ -1,4 +1,9 @@
 
+<style>
+	input[readonly] {
+		color: grey; /* 文字颜色 */
+	}
+</style>
 <div ng-controller="StdInfoCtrl">
 	<div class="weui-panel weui-panel_access">
 		<div class="weui-panel__hd">个人信息</div>
@@ -118,7 +123,7 @@
 					<label class="weui-label">高考报名号</label>
 				</div>
 				<div class="weui-cell__bd">
-					<input class="weui-input" type="text" placeholder="请输入高考报名号" maxlength="14" ng-model="StdReg.exam_id">
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入高考报名号" maxlength="14" ng-model="StdReg.exam_id"  >
 				</div>
 			</div>
 			<div class="weui-cell">
@@ -126,7 +131,7 @@
 					<label class="weui-label">手机号码</label>
 				</div>
 				<div class="weui-cell__bd">
-					<input class="weui-input"  type="text" placeholder="请输入手机号码" maxlength="11" ng-model="StdReg.std_mobile" >
+					<input class="weui-input"  ng-readonly="!modifyFlag" type="text" placeholder="请输入手机号码" maxlength="11" ng-model="StdReg.std_mobile" >
 				</div>
 			</div>
 			<div class="weui-cell">
@@ -134,7 +139,7 @@
 					<label class="weui-label">政治面貌</label>
 				</div>
 				<div class="weui-cell__bd">
-					<select class="weui-select" ng-model="StdReg.std_political" style="height:25px;line-height:25px;padding-left:0px;">
+					<select class="weui-select" ng-model="StdReg.std_political" style="height:25px;line-height:25px;padding-left:0px;"  ng-disabled="!modifyFlag">
 						<option value="{{d.dict_value}}" ng-repeat="d in PoliticalTypeArray">{{d.dict_text}}</option>
 					</select>
 				</div>
@@ -145,7 +150,7 @@
 						<label class="weui-label">科类</label>
 					</div>
 					<div class="weui-cell__bd">
-						<select class="weui-select" ng-model="StdReg.std_param3"  style="height:25px;line-height:25px;padding-left:0px;" >
+						<select class="weui-select" ng-model="StdReg.std_param3"  style="height:25px;line-height:25px;padding-left:0px;" ng-disabled="!modifyFlag">
 							<option value="{{d.dict_value}}" ng-repeat="d in YmStdCategoryArray">{{d.dict_text}}</option>
 						</select>
 					</div>
@@ -157,7 +162,7 @@
 						<label class="weui-label">毕业类型</label>
 					</div>
 					<div class="weui-cell__bd">
-						<select class="weui-select" ng-model="StdReg.std_param4"  style="height:25px;line-height:25px;padding-left:0px;">
+						<select class="weui-select" ng-model="StdReg.std_param4"  style="height:25px;line-height:25px;padding-left:0px;" ng-disabled="!modifyFlag">
 							<option value="{{d.dict_value}}" ng-repeat="d in GraduateTypeArray">{{d.dict_text}}</option>
 						</select>
 					</div>
@@ -168,7 +173,7 @@
 						<label class="weui-label">毕业学校</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="请输入考生毕业学校" maxlenth="128" ng-model="StdReg.std_school">
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入考生毕业学校" maxlenth="128" ng-model="StdReg.std_school">
 					</div>
 				</div>
 				
@@ -178,7 +183,7 @@
 						<label class="weui-label">考生类别</label>
 					</div>
 					<div class="weui-cell__bd">
-						<select class="weui-select" ng-model="StdReg.std_param5" placeholder="请选择考生类别" style="height:25px;line-height:25px;padding-left:0px;">
+						<select class="weui-select" ng-model="StdReg.std_param5" placeholder="请选择考生类别" style="height:25px;line-height:25px;padding-left:0px;" ng-disabled="!modifyFlag">
 							<option value="{{d.dict_value}}" ng-repeat="d in StdTypeArray">{{d.dict_text}}</option>
 						</select>
 					</div>
@@ -201,7 +206,7 @@
 						<label class="weui-label">毕业时间</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input"  type="text"  placeholder="请选择毕业时间" maxlenth="20" ng-model="StdReg.end_date" id="showDatePicker">
+						<input class="weui-input" ng-readonly="!modifyFlag"  type="text"  placeholder="请选择毕业时间" maxlenth="20" ng-model="StdReg.end_date" id="showDatePicker">
 					</div>
 				</div>
 				
@@ -210,7 +215,7 @@
 						<label class="weui-label">紧急联系人</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="请输入紧急联系人" maxlength="128" ng-model="StdReg.link_man" >
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入紧急联系人" maxlength="128" ng-model="StdReg.link_man" >
 					</div>
 				</div>				
 				<div class="weui-cell">
@@ -218,7 +223,7 @@
 						<label class="weui-label">联系人手机</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="请输入家长手机号" maxlength="100" ng-model="StdReg.link_mobile" >
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入家长手机号" maxlength="100" ng-model="StdReg.link_mobile" >
 					</div>
 				</div>
 				
@@ -228,7 +233,7 @@
 						<label class="weui-label">通信地址</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="请输入通信地址" maxlength="300" ng-model="StdReg.link_addr">
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入通信地址" maxlength="300" ng-model="StdReg.link_addr">
 					</div>
 				</div>
 				
@@ -238,7 +243,7 @@
 						<label class="weui-label">邮政编码</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="请输入邮政编码" maxlength="6" ng-model="StdReg.link_postal">
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入邮政编码" maxlength="6" ng-model="StdReg.link_postal">
 					</div>
 				</div>
 				
@@ -248,7 +253,7 @@
 						<label class="weui-label">电子邮箱</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="请输入电子邮箱" maxlength="60" ng-model="StdReg.email">
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入电子邮箱" maxlength="60" ng-model="StdReg.email">
 					</div>
 				</div>
 			
@@ -293,8 +298,7 @@
 
 
 		<div class="button-sp-area">
-			<a href="javascript:;" class="weui-btn weui-btn_primary"
-				ng-click="saveExtendInfo()">修改个人信息</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="saveExtendInfo()" ng-if="modifyFlag">修改个人信息</a>
 		</div>
 	</div>
 </div>

WebRoot/ymbk/routes/std/info/std_info.js

@@ -55,8 +55,18 @@ app.controller('StdInfoCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$s
             }
         });
     }
+
+	// 获取截止时间标志
+	$scope.getDeadLineFlag = function() {
+		$rootScope.ajaxRequest({
+			url : '../enrol/std/modify/info/flag/get.htm'
+		}, function(response) {
+			$scope.modifyFlag = response.entity;
+		});
+	}
     
     $scope.findProvinceArtScience();
+	$scope.getDeadLineFlag();
     
 	
 	//是否是中文
@@ -197,5 +207,7 @@ app.controller('StdInfoCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$s
 	        title: '日期选择'
 	    });
 	});
+
+
 	
 } ])

WebRoot/ymbk/routes/std/reg/std_reg.js

@@ -219,10 +219,17 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		}
 
 		// 识别姓名和自输入姓名不相等
-		if (flag == 1 && $scope.StdReg.std_name_confirm != $scope.StdReg.std_name) {
-			$.alert("自动识别的姓名和考生确认的姓名不一致，请修改为正确的姓名！");
-			return false;
+		if(flag == 1) {
+			if ($scope.StdReg.std_name_confirm == undefined || $scope.StdReg.std_name_confirm.length === 0) {
+				$.alert('请输入确认姓名！');
+				return false;
+			}
+			if ($scope.StdReg.std_name_confirm != $scope.StdReg.std_name) {
+				$.alert("自动识别的姓名和考生确认的姓名不一致，请修改为正确的姓名！");
+				return false;
+			}
 		}
+
 		
 		$.showLoading("正在提交考生信息，请稍后...")
 		//针对非大陆考生

WebRoot/ymfz/routes/std/info/std_info.html

@@ -1,7 +1,12 @@
 
+<style>
+	input[readonly] {
+		color: grey; /* 文字颜色 */
+	}
+</style>
 <div ng-controller="StdInfoCtrl">
 	<div class="weui-panel weui-panel_access">
-		<div class="weui-panel__hd">请完善通讯地址</div>
+		<div class="weui-panel__hd">个人信息</div>
 		<div class="weui-cells">
 			<!--  央美 香港考生
 			<div class="weui-cell"
@@ -18,15 +23,6 @@
 				</div>
 			</div>
 			 -->
-			<div class="weui-cell">
-				<div class="weui-cell__hd">
-					<label class="weui-label">手机号码</label>
-				</div>
-				<div class="weui-cell__bd">
-					<input class="weui-input" type="text" placeholder="请输入手机号码"
-						maxlength="11" ng-model="StdReg.std_mobile">
-				</div>
-			</div>
 			<!-- <div class="weui-cell"
 				ng-if="getParamValue('EnrolReg_ShowExamId','Active') == 'Active'">
 				<div class="weui-cell__hd">
@@ -40,7 +36,7 @@
 						ng-if="getParamValue('EnrolStdExamIdModify','Active') == 'InActive'"
 						maxlength="14" ng-model="StdReg.exam_id">
 				</div>
-			</div>-->
+			</div>
 			<div class="weui-cell"
 				ng-if="getParamValue('EnrolReg_ShowStdType','InActive') == 'Active'">
 				<div class="weui-cell__hd">
@@ -55,17 +51,8 @@
 							</select>
 					</div>
 				</div>
-			</div>
-			<div class="weui-cell">
-				<div class="weui-cell__hd">
-					<label class="weui-label">备用手机</label>
-				</div>
-				<div class="weui-cell__bd">
-					<input class="weui-input" type="text" placeholder="请输入考生备用手机"
-						maxlength="11" ng-model="StdReg.link_mobile">
-				</div>
-			</div>
-			<div class="weui-cell"
+			</div>-->
+			<!-- <div class="weui-cell"
 				ng-if="getParamValue('EnrolReg_ShowStdSchool','true') == 'true'">
 				<div class="weui-cell__hd">
 					<label class="weui-label">毕业学校</label>
@@ -81,7 +68,7 @@
 				</div>
 				<div class="weui-cell__bd">
 					<select class="form-control m-b" ng-model="StdReg.link_province" style="width:150px;height:30px;"
-						ng-options="item.province_id as item.province_name for item in provArray" 
+						ng-options="item.province_id as item.province_name for item in provArray"
 						name="link_province" ng-change="freshCity(this);" required></select>
 				</div>
 			</div>
@@ -91,10 +78,10 @@
 				</div>
 				<div class="weui-cell__bd">
 					<select class="form-control m-b" ng-model="StdReg.link_city" style="width:150px;height:30px;"
-						ng-options="item.city_id as item.city_name for item in cityArray" 
+						ng-options="item.city_id as item.city_name for item in cityArray"
 						name="link_city" required></select>
-				</div>					
-			</div>			
+				</div>
+			</div>
 			<div class="weui-cell"
 				ng-if="getParamValue('EnrolReg_ShowLinkAddr','true') == 'true'">
 				<div class="weui-cell__hd">
@@ -106,7 +93,171 @@
 					<span class="text-muted" style="font-size:12px" >试卷邮寄预计2月18日开始。</span>
 				</div>
 			</div>
-			<div class="weui-cell"
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">手机号码</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" type="text" placeholder="请输入手机号码"
+						maxlength="11" ng-model="StdReg.std_mobile">
+				</div>
+			</div>-->
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">姓名</label>
+				</div>
+				<div class="weui-cell__bd" style="color:grey;">
+					{{StdReg.std_name}}
+				</div>
+			</div>
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">身份证号</label>
+				</div>
+				<div class="weui-cell__bd" style="color:grey;">
+					{{StdReg.cert_id}}
+				</div>
+			</div>
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">高考报名号</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入高考报名号" maxlength="14" ng-model="StdReg.exam_id"  >
+				</div>
+			</div>
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">手机号码</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input"  ng-readonly="!modifyFlag" type="text" placeholder="请输入手机号码" maxlength="11" ng-model="StdReg.std_mobile" >
+				</div>
+			</div>
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">政治面貌</label>
+				</div>
+				<div class="weui-cell__bd">
+					<select class="weui-select" ng-model="StdReg.std_political" style="height:25px;line-height:25px;padding-left:0px;"  ng-disabled="!modifyFlag">
+						<option value="{{d.dict_value}}" ng-repeat="d in PoliticalTypeArray">{{d.dict_text}}</option>
+					</select>
+				</div>
+			</div>
+			<!-- 考生科类，如:艺术文、艺术理、不分文理 -->
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">科类</label>
+				</div>
+				<div class="weui-cell__bd">
+					<select class="weui-select" ng-model="StdReg.std_param3"  style="height:25px;line-height:25px;padding-left:0px;" ng-disabled="!modifyFlag">
+						<option value="{{d.dict_value}}" ng-repeat="d in YmStdCategoryArray">{{d.dict_text}}</option>
+					</select>
+				</div>
+			</div>
+
+			<!-- 毕业类型 -->
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">毕业类型</label>
+				</div>
+				<div class="weui-cell__bd">
+					<select class="weui-select" ng-model="StdReg.std_param4"  style="height:25px;line-height:25px;padding-left:0px;" ng-disabled="!modifyFlag">
+						<option value="{{d.dict_value}}" ng-repeat="d in GraduateTypeArray">{{d.dict_text}}</option>
+					</select>
+				</div>
+			</div>
+
+			<div class="weui-cell" ng-if="getParamValue('EnrolReg_ShowStdSchool','Active') == 'Active'">
+				<div class="weui-cell__hd">
+					<label class="weui-label">毕业学校</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入考生毕业学校" maxlenth="128" ng-model="StdReg.std_school">
+				</div>
+			</div>
+
+			<!-- 考生类别 -->
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">考生类别</label>
+				</div>
+				<div class="weui-cell__bd">
+					<select class="weui-select" ng-model="StdReg.std_param5" placeholder="请选择考生类别" style="height:25px;line-height:25px;padding-left:0px;" ng-disabled="!modifyFlag">
+						<option value="{{d.dict_value}}" ng-repeat="d in StdTypeArray">{{d.dict_text}}</option>
+					</select>
+				</div>
+			</div>
+
+
+			<!-- 毕业时间
+            <div class="weui-cell">
+                <div class="weui-cell__hd">
+                    <label class="weui-label">毕业时间</label>
+                </div>
+                <div class="weui-cell__bd">
+                    <input class="weui-input" type="text"  placeholder="如：2010年09月" maxlenth="20" ng-model="StdReg.end_date">
+                </div>
+            </div> -->
+
+			<!-- 毕业时间 -->
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">毕业时间</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" ng-readonly="!modifyFlag"  type="text"  placeholder="请选择毕业时间" maxlenth="20" ng-model="StdReg.end_date" id="showDatePicker">
+				</div>
+			</div>
+
+			<div class="weui-cell"><!--  ng-if="getParamValue('EnrolReg_ShowLinkMan','true') == 'true'" -->
+				<div class="weui-cell__hd">
+					<label class="weui-label">紧急联系人</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入紧急联系人" maxlength="128" ng-model="StdReg.link_man" >
+				</div>
+			</div>
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">联系人手机</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入家长手机号" maxlength="100" ng-model="StdReg.link_mobile" >
+				</div>
+			</div>
+
+			<!-- 通信地址 -->
+			<div class="weui-cell" ng-if="getParamValue('EnrolReg_LinkAddr','Active') == 'Active'">
+				<div class="weui-cell__hd">
+					<label class="weui-label">通信地址</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入通信地址" maxlength="300" ng-model="StdReg.link_addr">
+				</div>
+			</div>
+
+			<!-- 通信地址 -->
+			<div class="weui-cell" ng-if="getParamValue('EnrolReg_LinkAddr','Active') == 'Active'">
+				<div class="weui-cell__hd">
+					<label class="weui-label">邮政编码</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入邮政编码" maxlength="6" ng-model="StdReg.link_postal">
+				</div>
+			</div>
+
+			<!-- 电子邮箱 -->
+			<div class="weui-cell" ng-if="getParamValue('EnrolReg_email','Active') == 'Active'">
+				<div class="weui-cell__hd">
+					<label class="weui-label">电子邮箱</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入电子邮箱" maxlength="60" ng-model="StdReg.email">
+				</div>
+			</div>
+
+			<!-- <div class="weui-cell"
 				ng-if="getParamValue('EnrolReg_ShowLinkPostal','true') == 'true'">
 				<div class="weui-cell__hd">
 					<label class="weui-label">邮政编码</label>
@@ -116,23 +267,38 @@
 						maxlength="6" ng-model="StdReg.link_postal">
 				</div>
 			</div>
-			<div class="weui-cell"
-				ng-if="getParamValue('EnrolReg_ShowLinkMan','true') == 'true'">
+			<div class="weui-cell">
 				<div class="weui-cell__hd">
-					<label class="weui-label">联系人</label>
+					<label class="weui-label">地址</label>
 				</div>
 				<div class="weui-cell__bd">
-					<input class="weui-input" type="text" placeholder="请输入联系人"
+					<input class="weui-input" type="text" placeholder="请输入地址" ng-model="StdReg.cert_addr">
+				</div>
+			</div>
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">紧急联系人</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" type="text" placeholder="请输入紧急联系人"
 						maxlength="128" ng-model="StdReg.link_man">
 				</div>
 			</div>
+			<div class="weui-cell">
+				<div class="weui-cell__hd">
+					<label class="weui-label">联系人电话</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" type="text" placeholder="请输入联系人"
+						maxlength="128" ng-model="StdReg.link_mobile">
+				</div>
+			</div>	 -->
 		</div>
 
 
 
 		<div class="button-sp-area">
-			<a href="javascript:;" class="weui-btn weui-btn_primary"
-				ng-click="saveExtendInfo()">完善通讯地址</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="saveExtendInfo()" ng-if="modifyFlag">修改个人信息</a>
 		</div>
 	</div>
 </div>

WebRoot/ymfz/routes/std/info/std_info.js

@@ -1,32 +1,55 @@
 app.controller('StdInfoCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$state', '$stateParams', function($rootScope, $scope, $http, $timeout, $state, $stateParams) {
 	$scope.StdReg = angular.copy($rootScope.ArtStdReg);
-	
-	//生源地
-	$rootScope.ajaxRequest({
-		url : '../enrol/reg/province/list.htm'
-	}, function(response) {
-		$scope.provinceArray = response.array;
-	});
-	//邮寄省份
-	$rootScope.ajaxRequest({
-		url : '../enrol/std/reg/province/list.htm'
-	}, function(response) {
-		$scope.provArray = response.array;
-	});
-	//邮寄城市初始列表
-	$rootScope.ajaxRequest({
-		url : '../enrol/std/reg/city/alllist.htm'
-	}, function(response) {
-		$scope.cityArray = response.array;
-	});			
-	//过滤城市
-	$scope.freshCity = function() {
+
+
+	$scope.YmStdCategoryArray = [];
+
+	/****************************
+	 *  根据省份-查找该省份的文理区分
+	 */
+	$scope.findProvinceArtScience = function () {
+		$rootScope.ajaxRequest({
+			url: '../conf/std/reg/get/province.htm',
+			data: {province_id: $scope.StdReg.std_province}
+		}, function (response) {
+			if (response.entity) {
+				$scope.artArr = [];
+				$scope.artArr = response.entity.art_science_status.split(",");
+				for (const art of $scope.artArr) {
+					for (const st of $rootScope.StdCategoryArray) {
+						if (art == st.dict_value) {
+							$scope.YmStdCategoryArray.push(st);
+							break;
+						}
+					}
+				}
+				if($scope.YmStdCategoryArray.length == 1) {
+					$scope.StdReg.std_param3 = $scope.YmStdCategoryArray[0].dict_value;
+				}
+				$scope.YmStdCategoryArray.unshift({dict_text: '请选择', dict_value: null});
+			}
+		});
+	}
+
+	// 获取截止时间标志
+	$scope.getDeadLineFlag = function() {
 		$rootScope.ajaxRequest({
-			url : '../enrol/std/reg/city/list.htm?province_id=' + $scope.StdReg.link_province
+			url : '../enrol/std/modify/info/flag/get.htm'
 		}, function(response) {
-			$scope.cityArray = response.array;
+			$scope.modifyFlag = response.entity;
 		});
-	}	
+	}
+
+	$scope.findProvinceArtScience();
+	$scope.getDeadLineFlag();
+
+
+	//是否是中文
+	$scope.isChinese = function(str){
+		var reg = /^[\u4e00-\u9fa5]+$/;
+		return reg.test(str);
+	}
+
 	/**************
 	 * 完善个人信息
 	 */
@@ -39,7 +62,7 @@ app.controller('StdInfoCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$s
 				break;
 			}
 		}
-		
+
 		/*if(change) {
 			$.alert("报名时间已过，不允许修改个人信息！");
 			return;
@@ -56,14 +79,110 @@ app.controller('StdInfoCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$s
 			$.alert("已过邮寄地址修改时间[2021-01-12 22:00:00],不能修改！");
 			return;
 		}*/
+
+		if ($scope.StdReg.link_mobile && $scope.StdReg.std_mobile == $scope.StdReg.link_mobile) {
+			$.alert('紧急联系电话与本人手机号码不能相同！');
+			return false;
+		}
+
+		//政治面貌
+		if ($scope.StdReg.std_political == undefined || $scope.StdReg.std_political == '') {
+			$.alert('请选择政治面貌！');
+			return false;
+		}
+		//科类
+		if ($scope.StdReg.std_param3 == undefined || $scope.StdReg.std_param3 == '' || $scope.StdReg.std_param3.length == 0) {
+			$.alert('请选择科类！');
+			return false;
+		}
+		//科类
+		if ($scope.StdReg.std_param4 == undefined || $scope.StdReg.std_param4 == '' || $scope.StdReg.std_param4.length == 0) {
+			$.alert('请选择毕业类型！');
+			return false;
+		}
+		//毕业学校
+		if ($rootScope.getParamValue('EnrolReg_ShowStdSchool','Active') == 'Active' &&
+			($scope.StdReg.std_school == undefined || $scope.StdReg.std_school == '')) {
+			$.alert('请填写毕业学校！');
+			return false;
+		}
+		//考生类别
+		if ($scope.StdReg.std_param5 == undefined || $scope.StdReg.std_param5 == '') {
+			$.alert('请选择考生类别！');
+			return false;
+		}
+		/**毕业时间**/
+		if ($scope.StdReg.end_date == undefined || $scope.StdReg.end_date == '') {
+			$.alert('请填写毕业时间！');
+			return false;
+		}
+		//紧急联系人
+		if ($scope.StdReg.link_man == undefined || $scope.StdReg.link_man == '') {
+			$.alert('请填写紧急联系人！');
+			return false;
+		} else if(!$scope.isChinese($scope.StdReg.link_man)) {
+			$.alert('紧急联系人必须是汉字！');
+			return false;
+		}
+
+		//家长手机号
+		if ($scope.StdReg.link_mobile == undefined || $scope.StdReg.link_mobile == '') {
+			$.alert('请填写联系人手机号！');
+			return false;
+		}
+
+		//通信地址
+		if ($rootScope.getParamValue('EnrolReg_LinkAddr','Active') == 'Active' &&
+			($scope.StdReg.link_addr == undefined || $scope.StdReg.link_addr == '')) {
+			$.alert('请填写通讯地址！');
+			return false;
+		}
+
+		//邮政编码
+		if ($scope.StdReg.link_postal == undefined || $scope.StdReg.link_postal == '' || $scope.StdReg.link_postal.length==0) {
+			$.alert('请填写邮政编码！');
+			return false;
+		}
+
+		//电子邮箱
+		if ($rootScope.getParamValue('EnrolReg_email','Active') == 'Active') {
+			if($scope.StdReg.email == undefined || $scope.StdReg.email == '') {
+				$.alert('请填写电子邮箱！');
+				return false;
+			}
+		}
+
 		$.showLoading("正在提交考生信息，请稍后...")
 		$rootScope.ajaxRequest({
 			url : '../enrol/std/info/save.htm',
 			data : $scope.StdReg
 		}, function(response) {
-			$.toast("考生信息已保存！");
+//			$.toast("考生信息已保存！");
+			$.alert("考生信息已保存！")
 			$.hideLoading();
 			$rootScope.ArtStdReg = response.entity;
 		});
 	}
+
+	//使用weiui自带的默认日期选择器
+	$('#showDatePicker').on('click', function() {
+		weui.datePicker({
+			start: 1990,
+			end: new Date().getFullYear(),
+			defaultValue: [new Date().getFullYear(), new Date().getMonth()+1, new Date().getDate()],
+			depth:2,
+			onChange: function (result) {
+				//console.log(result);
+			},
+			onConfirm: function (result) {
+				$scope.$apply(function () {
+					$scope.StdReg.end_date = result[0].label + result[1].label;
+				});
+			},
+			title: '日期选择'
+		});
+	});
+
+
+
 } ])

sql/update.sql

@@ -128,4 +128,9 @@ WHERE `REPORT_NAME` = 'TicketStdNotDownloadReport';
 INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'YmScoreFinalEndTime', '2022-03-28 09:00:00', '复试成绩查询结束时间');
 INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'YmScoreFinalStartTime', '2022-03-28 09:00:00', '复试成绩查询开始时间');
 INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'YmScoreFirstEndTime', '2022-03-28 09:00:00', '初试成绩查询结束时间');
-INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'YmScoreFirstStartTime', '2022-03-28 09:00:00', '初试成绩查询开始时间');
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'YmScoreFirstStartTime', '2022-03-28 09:00:00', '初试成绩查询开始时间');
+
+
+-- 2024-11-13
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'ModifyStuDeadLine', '2025-03-01 09:00:00', '个人信息修改截止时间');
+

src/cn/hmsoft/art/control/ex/pad/PadAppControl.java

@@ -134,7 +134,7 @@ public class PadAppControl {
 		sql = "select ly_agent_id agent_id,ly_group_id group_id,ly_room_id room_id,room_name,room_seq,room_addr,room_capacity,room_status from ly_room_written where ly_agent_id=?  order by ly_group_id,room_seq";
 		// 央美-只有中国画和造型艺术需要拍照
 		if(ArtParamHelper.SchoolCode.equals("10047")) {
-			sql = "select ly_aget_id agent_id,ly_group_id group_id,ly_room_id room_id,room_name,room_seq,room_addr,room_capacity,room_status from ly_room_written where ly_agent_id=? and (room_name like '%中国画%' or room_name like '%造型艺术%') or order by ly_group_id,room_seq ";
+			sql = "select ly_agent_id agent_id,ly_group_id group_id,ly_room_id room_id,room_name,room_seq,room_addr,room_capacity,room_status from ly_room_written where ly_agent_id=? and (room_name like '%中国画%' or room_name like '%造型艺术%')  order by ly_group_id,room_seq ";
 		}
 		map.put("RoomArray", this.daoAgent.listMapBySql(sql, agent_id));
 

src/cn/hmsoft/art/enrol/control/std/EnrolStdInfoControl.java

@@ -2,6 +2,8 @@ package cn.hmsoft.art.enrol.control.std;
 
 import java.time.LocalDateTime;
 
+import cn.hmsoft.helper.LocalDateHelper;
+import cn.hmsoft.log.LogHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -90,4 +92,26 @@ public class EnrolStdInfoControl extends EnrolStdAbstractControl {
 		StdReg s = this.daoStd.findByStdId(std.getStd_id());
 		return new Ajax(s);
 	}
+
+	// 获取个人修改信息标志
+	@RequestMapping("/enrol/std/modify/info/flag/get")
+	public Ajax getModifyStuInfoFlag() {
+		boolean flag = true;
+		try {
+			//可修改考生信息的截止时间
+			String modifyStuDeadLine = ArtParamHelper.getParamValue("ModifyStuDeadLine", null);
+			LocalDateTime now = LocalDateTime.now();
+			if (modifyStuDeadLine != null) {
+				LocalDateTime modifyDateTime = LocalDateHelper.parseDateTime(modifyStuDeadLine);
+				if (now.isAfter(modifyDateTime)) {
+					flag = false;
+				}
+			}
+		} catch (Exception e) {
+			LogHelper.error(e.getMessage());
+		}
+		return new Ajax(flag);
+	}
+
+
 }