haogh 7 月之前
父節點
當前提交
c9779b61c1

+ 42 - 42
WebRoot/ymbk/routes/std/reg/std_reg.js

@@ -23,7 +23,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 				}
                 for (const art of $scope.artArr) {
                     for (const st of $rootScope.StdCategoryArray) {
-                        if (art === st.dict_value) {
+                        if (art == st.dict_value) {
                             $scope.YmStdCategoryArray.push(st);
                             break;
                         }
@@ -38,11 +38,11 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
     }
 
 
-	if ($rootScope.ArtStdReg !== undefined) {
+	if ($rootScope.ArtStdReg != undefined) {
 		$scope.StdReg = angular.extend({}, $rootScope.ArtStdReg);
-		if ($scope.StdReg.reg_status === 'IdCard') {
+		if ($scope.StdReg.reg_status == 'IdCard') {
 			$scope.curStep = 'NoCrownPhotoWarning';
-		} else if ($scope.StdReg.reg_status === 'NoCrownPhoto') {
+		} else if ($scope.StdReg.reg_status == 'NoCrownPhoto') {
 			$scope.curStep = 'StdExtendInfo';
 			$scope.findProvinceArtScience();
 		}
@@ -106,9 +106,9 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 	 * 选择生源地
 	 */
 	$scope.chooseProvince = function(p) {
-		if(p.reg_status === 'InActive') {
+		if(p.reg_status == 'InActive') {
 			var msg = '未开放【'+p.province_name+'】考生注册!';
-			if(p.reg_fetch_param !== undefined)
+			if(p.reg_fetch_param != undefined)
 				msg = p.reg_fetch_param;
 			$.alert(msg);
 			return;
@@ -116,19 +116,19 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		$scope.currentProvince = p;
 		$scope.StdReg.std_province = p.province_id;
 		$scope.StdReg.province_name = p.province_name;
-		if ((p.province_id + '') === '90') {
+		if ((p.province_id + '') == '90') {
 			// 外国,护照
 			$scope.curStep = 'PassportWarning';
 			$scope.StdReg.cert_type = 'Passport';
-		} else if ((p.province_id + '') === '71') {
+		} else if ((p.province_id + '') == '71') {
 			// 台湾,台湾居民往来大陆通行证,澳门,香港 港澳居民来往内地通行证
 			$scope.curStep = 'IdCard71Warning';
 			$scope.StdReg.cert_type = 'TaiWanPass';
-		}else if ((p.province_id + '') === '80' || (p.province_id + '') === '81' || (p.province_id + '') === '82') {
+		}else if ((p.province_id + '') == '80' || (p.province_id + '') == '81' || (p.province_id + '') == '82') {
 			// 澳门,香港 港澳居民来往内地通行证
 			$scope.curStep = 'HongKongMacaoPass';
 			$scope.StdReg.cert_type = 'TaiWanPass';
-		}  else if (p.ksh_status === 'Active') {
+		}  else if (p.ksh_status == 'Active') {
 			// 必须有高考报名号
 			$scope.curStep = 'ExamIdWarning';
 		} else {
@@ -141,7 +141,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 
 	$scope.checkExamId = function() {
 		$scope.StdReg.exam_id = $.trim($scope.StdReg.exam_id);
-		if ($scope.StdReg.exam_id === undefined || $scope.StdReg.exam_id.length === 0) {
+		if ($scope.StdReg.exam_id == undefined || $scope.StdReg.exam_id.length === 0) {
 			$.alert('高考报名号必须填写!');
 			return false;
 		}
@@ -174,25 +174,25 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		$scope.StdReg.std_sex = $.trim($scope.StdReg.std_sex);
 		$scope.StdReg.std_mobile = $.trim($scope.StdReg.std_mobile);
 		$scope.StdReg.std_name_confirm = $.trim($scope.StdReg.std_name_confirm);
-		if ($scope.StdReg.cert_id === undefined || $scope.StdReg.cert_id.length === 0) {
+		if ($scope.StdReg.cert_id == undefined || $scope.StdReg.cert_id.length === 0) {
 			$.alert('请输入证件号码!');
 			return false;
 		}
-		if(flag === 2) {
-			if ($scope.StdReg.std_param2 === undefined || $scope.StdReg.std_param2.length === 0) {
+		if(flag == 2) {
+			if ($scope.StdReg.std_param2 == undefined || $scope.StdReg.std_param2.length === 0) {
 				$.alert('请输入身份证号码!');
 				return false;
 			}
-			if($scope.StdReg.cert_id.indexOf('(') !==-1 ||  $scope.StdReg.cert_id.indexOf(')')!== -1) {
+			if($scope.StdReg.cert_id.indexOf('(') !=-1 ||  $scope.StdReg.cert_id.indexOf(')')!= -1) {
 				$.alert('证件号码请输入半角括号!');
 				return false;
 			}
-			if($scope.StdReg.std_param2.indexOf('(') !==-1 ||  $scope.StdReg.std_param2.indexOf(')') !== -1) {
+			if($scope.StdReg.std_param2.indexOf('(') !=-1 ||  $scope.StdReg.std_param2.indexOf(')') != -1) {
 				$.alert('身份证号码请输入半角括号!');
 				return false;
 			}
 			if(!$scope.isCert($scope.StdReg.cert_id)) {
-				if($scope.StdReg.std_province === '90') {
+				if($scope.StdReg.std_province == '90') {
 					$.alert('护照号只能为数字、字母、半角括号!');
 					return false;
 				} else {
@@ -205,28 +205,28 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 				return false;
 			}
 		}
-		if ($scope.StdReg.std_name === undefined || $scope.StdReg.std_name.length === 0) {
+		if ($scope.StdReg.std_name == undefined || $scope.StdReg.std_name.length === 0) {
 			$.alert('请输入考生姓名!');
 			return false;
 		}
-		if ($scope.StdReg.std_sex === undefined || $scope.StdReg.std_sex.length === 0) {
+		if ($scope.StdReg.std_sex == undefined || $scope.StdReg.std_sex.length === 0) {
 			$.alert('请选择考生性别!');
 			return false;
 		}
-		if ($scope.StdReg.std_mobile === undefined || $scope.StdReg.std_mobile.length !== 11) {
+		if ($scope.StdReg.std_mobile == undefined || $scope.StdReg.std_mobile.length !== 11) {
 			$.alert('请输入正确的手机号码!');
 			return false;
 		}
 
 		// 识别姓名和自输入姓名不相等
-		if ($scope.StdReg.std_name_confirm !== $scope.StdReg.std_name) {
+		if ($scope.StdReg.std_name_confirm != $scope.StdReg.std_name) {
 			$.alert("自动识别的姓名和考生确认的姓名不一致,请修改为正确的姓名!");
 			return false;
 		}
 		
 		$.showLoading("正在提交考生信息,请稍后...")
 		//针对非大陆考生
-		if(flag === 2) {
+		if(flag == 2) {
 			$.confirm("请确认考生信息!", function() {
 				// 点击确认后的回调函数
 				$rootScope.ajaxRequest({
@@ -284,44 +284,44 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 				return false;
 			}
 		}
-		if ($scope.StdReg.link_mobile && $scope.StdReg.std_mobile === $scope.StdReg.link_mobile) {
+		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 === '') {
+		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) {
+		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) {
+		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 === '')) {
+		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 === '') {
+		if ($scope.StdReg.std_param5 == undefined || $scope.StdReg.std_param5 == '') {
 			$.alert('请选择考生类别!');
 			return false;
 		}
 		/**毕业时间**/
-		if ($scope.StdReg.end_date === undefined || $scope.StdReg.end_date === '') {
+		if ($scope.StdReg.end_date == undefined || $scope.StdReg.end_date == '') {
 			$.alert('请填写毕业时间!');
 			return false;
 		}
 		//紧急联系人
-		if ($scope.StdReg.link_man === undefined || $scope.StdReg.link_man === '') {
+		if ($scope.StdReg.link_man == undefined || $scope.StdReg.link_man == '') {
 			$.alert('请填写紧急联系人!');
 			return false;
 		} else if(!$scope.isChinese($scope.StdReg.link_man)) {
@@ -330,20 +330,20 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		}
 		
 		//家长手机号
-		if ($scope.StdReg.link_mobile === undefined || $scope.StdReg.link_mobile === '') {
+		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 === '')) {
+		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) {
+		if ($scope.StdReg.link_postal == undefined || $scope.StdReg.link_postal == '' || $scope.StdReg.link_postal.length===0) {
 			$.alert('请填写邮政编码!');
 			return false;
 		}
@@ -353,8 +353,8 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		}
 		
 		//电子邮箱
-		if ($rootScope.getParamValue('EnrolReg_email','Active') === 'Active') {
-			if($scope.StdReg.email === undefined || $scope.StdReg.email === '') {
+		if ($rootScope.getParamValue('EnrolReg_email','Active') == 'Active') {
+			if($scope.StdReg.email == undefined || $scope.StdReg.email == '') {
 				$.alert('请填写电子邮箱!');
 				return false;
 			}
@@ -407,7 +407,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 				$scope.showLiveCheckLoading = false;
 				//   location.reload();
 				$.hideLoading();
-				if (res && res.result === 1) {
+				if (res && res.result == 1) {
 					$scope.curStep = "StdExtendInfo";
 				}
 			}
@@ -461,7 +461,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 							$.hideLoading();
 							if ($scope.StdReg.std_province < '70') {
 								//针对新疆少民,限定特定的民族才能选择这个类别
-								if($scope.StdReg.std_province === '66') {
+								if($scope.StdReg.std_province == '66') {
 									var arr = ['维吾尔','哈萨克','蒙古','柯尔克孜','塔吉克','锡伯','乌孜别克','塔塔尔','达斡尔','藏','俄罗斯'];
 									if(!arr.inArray(response.map.IdCardInfo.person_nation)) {
 										$.hideLoading();
@@ -477,11 +477,11 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 								$scope.curStep = 'IdCardResult';
 							} else {
 								//香港、台湾、澳门的考生,需要显示不同的提示
-								if ($scope.StdReg.std_province === '71') {
+								if ($scope.StdReg.std_province == '71') {
 									$scope.certTips = '请输入台湾身份证号码';
-								} else if ($scope.StdReg.std_province === '80' || $scope.StdReg.std_province === '81') {
+								} else if ($scope.StdReg.std_province == '80' || $scope.StdReg.std_province == '81') {
 									$scope.certTips = '请输入香港身份证件号码';
-								} else if ($scope.StdReg.std_province === '82') {
+								} else if ($scope.StdReg.std_province == '82') {
 									$scope.certTips = '请输入澳门身份证件号码';
 								} else {
 									$scope.certTips = '请输入身份证号码';

+ 2 - 2
WebRoot/ymbk/routes/ticket/list/ticket_list.js

@@ -5,12 +5,12 @@ app.controller('StdTicketListCtrl', [ '$rootScope', '$scope',
 				$rootScope.ajaxRequest({
 					url : '../enrol/std/ticket/list.htm'
 				}, function(response) {
-					if (response.array.length == 1) {
+					if (response.array.length === 1) {
 						$scope.goTicket(response.array[0]);
 						return;
 					}
 					$scope.TicketArray = response.array;
-					if ($scope.TicketArray.length == 0) {
+					if ($scope.TicketArray.length === 0) {
 						$("#divId").show();
 					}
 					

+ 7 - 7
WebRoot/ymfz/js/angular.app.js

@@ -134,7 +134,7 @@ app.controller('AppCtrl', [ '$rootScope', '$scope', '$http', '$localStorage', '$
 		});
 	};
 	$rootScope.getParamValue = function(paran_name, default_value) {
-		if ($rootScope.FrameParam[paran_name] === undefined)
+		if ($rootScope.FrameParam[paran_name] == undefined)
 			return default_value;
 		return $rootScope.FrameParam[paran_name];
 	}
@@ -189,7 +189,7 @@ app.controller('AppCtrl', [ '$rootScope', '$scope', '$http', '$localStorage', '$
 				}
 
 				// 判断当前考务状态
-				if ($rootScope.FrameParam.ArtStatus === 'Config') {
+				if ($rootScope.FrameParam.ArtStatus == 'Config') {
 					// 未开放报名,
 					$rootScope.InitStatus = false;
 					WeixinJSBridge.call('closeWindow');
@@ -200,21 +200,21 @@ app.controller('AppCtrl', [ '$rootScope', '$scope', '$http', '$localStorage', '$
 				$rootScope.WxUser = data.map.WxUser;
 				if (data.map.StdReg !== undefined) {
 					// 处理考生信息
-					if (data.map.StdReg.reg_status === 'IdCard') {
+					if (data.map.StdReg.reg_status == 'IdCard') {
 						// 上传了证件照片
 						$rootScope.goLocation('std/reg');
-					} else if (data.map.StdReg.reg_status === 'NoCrownPhoto') {
+					} else if (data.map.StdReg.reg_status == 'NoCrownPhoto') {
 						// 上传免冠照片
 						$rootScope.goLocation('std/reg');
-					} else if (data.map.StdReg.std_score_file === 'firstLogin') {
+					} else if (data.map.StdReg.std_score_file == 'firstLogin') {
 						$rootScope.goLocation('std/info');
 					} else {
 						$rootScope.goLocation('main');
 					}
 				} else {
-					if ($rootScope.FrameParam.AllowStdReg === 'InActive') {
+					if ($rootScope.FrameParam.AllowStdReg == 'InActive') {
 						// 不允许考生自行注册
-						if($rootScope.FrameParam.GeneralExam === 'Active') {
+						if($rootScope.FrameParam.GeneralExam == 'Active') {
 							$rootScope.goLocation('std/wybinding');
 						} else {
 							$rootScope.goLocation('std/binding');

+ 51 - 51
WebRoot/ymfz/routes/std/reg/std_reg.js

@@ -28,7 +28,7 @@ app.controller("StdRegCtrl", [
             $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) {
+                if (art == st.dict_value) {
                   $scope.YmStdCategoryArray.push(st);
                   break;
                 }
@@ -47,11 +47,11 @@ app.controller("StdRegCtrl", [
       );
     };
 
-    if ($rootScope.ArtStdReg !== undefined) {
+    if ($rootScope.ArtStdReg != undefined) {
       $scope.StdReg = angular.extend({}, $rootScope.ArtStdReg);
-      if ($scope.StdReg.reg_status === "IdCard") {
+      if ($scope.StdReg.reg_status == "IdCard") {
         $scope.curStep = "NoCrownPhotoWarning";
-      } else if ($scope.StdReg.reg_status === "NoCrownPhoto") {
+      } else if ($scope.StdReg.reg_status == "NoCrownPhoto") {
         $scope.curStep = "StdExtendInfo";
         $scope.findProvinceArtScience();
       }
@@ -120,32 +120,32 @@ app.controller("StdRegCtrl", [
      * 选择生源地
      */
     $scope.chooseProvince = function (p) {
-      if (p.reg_status === "InActive") {
+      if (p.reg_status == "InActive") {
         var msg = "未开放【" + p.province_name + "】考生注册!";
-        if (p.reg_fetch_param !== undefined) msg = p.reg_fetch_param;
+        if (p.reg_fetch_param != undefined) msg = p.reg_fetch_param;
         $.alert(msg);
         return;
       }
       $scope.currentProvince = p;
       $scope.StdReg.std_province = p.province_id;
       $scope.StdReg.province_name = p.province_name;
-      if (p.province_id + "" === "90") {
+      if (p.province_id + "" == "90") {
         // 外国,护照
         $scope.curStep = "PassportWarning";
         $scope.StdReg.cert_type = "Passport";
-      } else if (p.province_id + "" === "71") {
+      } else if (p.province_id + "" == "71") {
         // 台湾,台湾居民往来大陆通行证,澳门,香港 港澳居民来往内地通行证
         $scope.curStep = "IdCard71Warning";
         $scope.StdReg.cert_type = "TaiWanPass";
       } else if (
-        p.province_id + "" === "80" ||
-        p.province_id + "" === "81" ||
-        p.province_id + "" === "82"
+        p.province_id + "" == "80" ||
+        p.province_id + "" == "81" ||
+        p.province_id + "" == "82"
       ) {
         // 澳门,香港 港澳居民来往内地通行证
         $scope.curStep = "HongKongMacaoPass";
         $scope.StdReg.cert_type = "TaiWanPass";
-      } else if (p.ksh_status === "Active") {
+      } else if (p.ksh_status == "Active") {
         // 必须有高考报名号
         $scope.curStep = "ExamIdWarning";
       } else {
@@ -159,7 +159,7 @@ app.controller("StdRegCtrl", [
     $scope.checkExamId = function () {
       $scope.StdReg.exam_id = $.trim($scope.StdReg.exam_id);
       if (
-        $scope.StdReg.exam_id === undefined ||
+        $scope.StdReg.exam_id == undefined ||
         $scope.StdReg.exam_id.length === 0
       ) {
         $.alert("高考报名号必须填写!");
@@ -196,7 +196,7 @@ app.controller("StdRegCtrl", [
       $scope.StdReg.std_mobile = $.trim($scope.StdReg.std_mobile);
       $scope.StdReg.std_name_confirm = $.trim($scope.StdReg.std_name_confirm);
       if (
-        $scope.StdReg.cert_id === undefined ||
+        $scope.StdReg.cert_id == undefined ||
         $scope.StdReg.cert_id.length === 0
       ) {
         $.alert("请输入证件号码!");
@@ -204,7 +204,7 @@ app.controller("StdRegCtrl", [
       }
       if (flag === 2) {
         if (
-          $scope.StdReg.std_param2 === undefined ||
+          $scope.StdReg.std_param2 == undefined ||
           $scope.StdReg.std_param2.length === 0
         ) {
           $.alert("请输入身份证号码!");
@@ -225,7 +225,7 @@ app.controller("StdRegCtrl", [
           return false;
         }
         if (!$scope.isCert($scope.StdReg.cert_id)) {
-          if ($scope.StdReg.std_province === "90") {
+          if ($scope.StdReg.std_province == "90") {
             $.alert("护照号只能为数字、字母、半角括号!");
             return false;
           } else {
@@ -239,22 +239,22 @@ app.controller("StdRegCtrl", [
         }
       }
       if (
-        $scope.StdReg.std_name === undefined ||
-        $scope.StdReg.std_name.length === 0
+        $scope.StdReg.std_name == undefined ||
+        $scope.StdReg.std_name.length == 0
       ) {
         $.alert("请输入考生姓名!");
         return false;
       }
       if (
-        $scope.StdReg.std_sex === undefined ||
-        $scope.StdReg.std_sex.length === 0
+        $scope.StdReg.std_sex == undefined ||
+        $scope.StdReg.std_sex.length == 0
       ) {
         $.alert("请选择考生性别!");
         return false;
       }
 
       if (
-        $scope.StdReg.std_mobile === undefined ||
+        $scope.StdReg.std_mobile == undefined ||
         $scope.StdReg.std_mobile.length !== 11
       ) {
         $.alert("请输入正确的手机号码!");
@@ -263,7 +263,7 @@ app.controller("StdRegCtrl", [
 
 
       // 识别姓名和自输入姓名不相等
-      if ($scope.StdReg.std_name_confirm !== $scope.StdReg.std_name) {
+      if ($scope.StdReg.std_name_confirm != $scope.StdReg.std_name) {
         $.alert("自动识别的姓名和考生确认的姓名不一致,请修改为正确的姓名!");
         return false;
       }
@@ -300,10 +300,10 @@ app.controller("StdRegCtrl", [
      */
     $scope.saveExtendInfo = function () {
       // 考生
-      if ($rootScope.getParamValue("SchoolCode") === "51065") {
+      if ($rootScope.getParamValue("SchoolCode") == "51065") {
         if (
-          $scope.StdReg.std_type === undefined ||
-          $scope.StdReg.std_type === ""
+          $scope.StdReg.std_type == undefined ||
+          $scope.StdReg.std_type == ""
         ) {
           $.alert("请选择考生类型!");
           return false;
@@ -311,7 +311,7 @@ app.controller("StdRegCtrl", [
       }
       if (
         $scope.StdReg.link_mobile &&
-        $scope.StdReg.std_mobile === $scope.StdReg.link_mobile
+        $scope.StdReg.std_mobile == $scope.StdReg.link_mobile
       ) {
         $.alert("紧急联系人电话与本人手机号码不能相同!");
         return false;
@@ -319,16 +319,16 @@ app.controller("StdRegCtrl", [
 
       //政治面貌
       if (
-        $scope.StdReg.std_political === undefined ||
-        $scope.StdReg.std_political === ""
+        $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 == undefined ||
+        $scope.StdReg.std_param3 == "" ||
         $scope.StdReg.std_param3.length === 0
       ) {
         $.alert("请选择科类!");
@@ -336,8 +336,8 @@ app.controller("StdRegCtrl", [
       }
       //科类
       if (
-        $scope.StdReg.std_param4 === undefined ||
-        $scope.StdReg.std_param4 === "" ||
+        $scope.StdReg.std_param4 == undefined ||
+        $scope.StdReg.std_param4 == "" ||
         $scope.StdReg.std_param4.length === 0
       ) {
         $.alert("请选择毕业类型!");
@@ -345,34 +345,34 @@ app.controller("StdRegCtrl", [
       }
       //毕业学校
       if (
-        $rootScope.getParamValue("EnrolReg_ShowStdSchool", "Active") ===
+        $rootScope.getParamValue("EnrolReg_ShowStdSchool", "Active") ==
           "Active" &&
-        ($scope.StdReg.std_school === undefined ||
-          $scope.StdReg.std_school === "")
+        ($scope.StdReg.std_school == undefined ||
+          $scope.StdReg.std_school == "")
       ) {
         $.alert("请填写毕业学校!");
         return false;
       }
       //考生类别
       if (
-        $scope.StdReg.std_param5 === undefined ||
-        $scope.StdReg.std_param5 === ""
+        $scope.StdReg.std_param5 == undefined ||
+        $scope.StdReg.std_param5 == ""
       ) {
         $.alert("请选择考生类别!");
         return false;
       }
       /**毕业时间**/
       if (
-        $scope.StdReg.end_date === undefined ||
-        $scope.StdReg.end_date === ""
+        $scope.StdReg.end_date == undefined ||
+        $scope.StdReg.end_date == ""
       ) {
         $.alert("请填写毕业时间!");
         return false;
       }
       //紧急联系人
       if (
-        $scope.StdReg.link_man === undefined ||
-        $scope.StdReg.link_man === ""
+        $scope.StdReg.link_man == undefined ||
+        $scope.StdReg.link_man == ""
       ) {
         $.alert("请填写紧急联系人!");
         return false;
@@ -383,8 +383,8 @@ app.controller("StdRegCtrl", [
 
       //家长手机号
       if (
-        $scope.StdReg.link_mobile === undefined ||
-        $scope.StdReg.link_mobile === ""
+        $scope.StdReg.link_mobile == undefined ||
+        $scope.StdReg.link_mobile == ""
       ) {
         $.alert("请填写联系人手机号!");
         return false;
@@ -392,9 +392,9 @@ app.controller("StdRegCtrl", [
 
       //通信地址
       if (
-        $rootScope.getParamValue("EnrolReg_LinkAddr", "Active") === "Active" &&
-        ($scope.StdReg.link_addr === undefined ||
-          $scope.StdReg.link_addr === "")
+        $rootScope.getParamValue("EnrolReg_LinkAddr", "Active") == "Active" &&
+        ($scope.StdReg.link_addr == undefined ||
+          $scope.StdReg.link_addr == "")
       ) {
         $.alert("请填写通讯地址!");
         return false;
@@ -402,8 +402,8 @@ app.controller("StdRegCtrl", [
 
       //邮政编码
       if (
-        $scope.StdReg.link_postal === undefined ||
-        $scope.StdReg.link_postal === "" ||
+        $scope.StdReg.link_postal == undefined ||
+        $scope.StdReg.link_postal == "" ||
         $scope.StdReg.link_postal.length === 0
       ) {
         $.alert("请填写邮政编码!");
@@ -418,8 +418,8 @@ app.controller("StdRegCtrl", [
       }
 
       //电子邮箱
-      if ($rootScope.getParamValue("EnrolReg_email", "Active") === "Active") {
-        if ($scope.StdReg.email === undefined || $scope.StdReg.email === "") {
+      if ($rootScope.getParamValue("EnrolReg_email", "Active") == "Active") {
+        if ($scope.StdReg.email == undefined || $scope.StdReg.email == "") {
           $.alert("请填写电子邮箱!");
           return false;
         }
@@ -473,7 +473,7 @@ app.controller("StdRegCtrl", [
           $scope.showLiveCheckLoading = false;
           //   location.reload();
           $.hideLoading();
-          if (res && res.result === 1) {
+          if (res && res.result == 1) {
             $scope.curStep = "StdExtendInfo";
           }
         }

+ 2 - 2
src/cn/hmsoft/art/data/dao/ly/LyStdTicketDao.java

@@ -70,9 +70,9 @@ public class LyStdTicketDao extends PlatformDaoSupport<LyStdTicket> {
 	private final static String LIST_STD_TICKET = "select t.std_id,t.ly_ticket_id,cg.category_name,t.ticket_no,t.ticket_file_name,ag.agent_name,ag.agent_addr,ag.ticket_start_time,ag.ticket_end_time,t.ticket_batch,t.ly_agent_id,t.category_id from ly_std_ticket t ,cf_agent ag,cf_category cg where t.ly_agent_id=ag.agent_id  and t.std_id=? "
 			+ " and t.category_id=cg.category_id and (ly_ticket_id=? or 1=?) and (ticket_start_time<=? or 1=?) and (ticket_end_time>=? or 1=?) order by ag.ticket_start_time,cg.category_order desc";
 
-	public List<Map<String, Object>> listStdTicket( int std_id,Integer ly_ticket_id, FrameOptr optr) {
+	public List<Map<String, Object>> listStdTicket(int std_id, Integer ly_ticket_id, FrameOptr optr) {
 		LocalDateTime now = LocalDateTime.now();
-		return this.listMapBySql(LIST_STD_TICKET, std_id, ly_ticket_id,ly_ticket_id==null?1:2,now, optr == null ? 2 : 1, now,
+		return this.listMapBySql(LIST_STD_TICKET, std_id, ly_ticket_id, ly_ticket_id == null ? 1 : 2, now, optr == null ? 2 : 1, now,
 				optr == null ? 2 : 1);
 	}