upgrade form

src/blocks/app-registration-form/app-registration-form.js

@@ -247,7 +247,7 @@ Vue.component('app-registration-form', {
 							(this.valdateName(this.fieldsVal.juridical.companyTrans)) &&
 							(this.valdateName(this.fieldsVal.juridical.companyGovNum)) && 
 							(this.localRecord.wAddress.region.name !== '') && 
-							(this.valdateName(this.fieldsVal.juridical.companyTransportCostPerKm))
+							(this.fieldsVal.juridical.companyTransportCostPerKm !== '')
 						) {
 							return true;
 						}
@@ -268,14 +268,13 @@ Vue.component('app-registration-form', {
 					(this.valdatePassNum(this.fieldsVal.natural.personPassportNumber)) &&
 					(this.valdateName(this.fieldsVal.natural.personPassportIssuedBy)) &&
 					(this.valdatePassDate(this.fieldsVal.natural.personPassportIssuedDate)) &&
-					(this.valdateName(this.fieldsVal.natural.personPassportDepartmentCode)) || 1
-
+					(this.valdateName(this.fieldsVal.natural.personPassportDepartmentCode)) 
 				) { 
 					if (this.personRegType !== "executor") {
 						if (
 							(this.valdateLogin(this.fieldsVal.natural.personAuthLogin)) &&
 							(this.valdatePass(this.fieldsVal.natural.personAuthPass, this.fieldsVal.natural.personAuthPassRepeat))
-						   ) {
+						) {
 							return true;
 						}
 					} else {
@@ -284,7 +283,7 @@ Vue.component('app-registration-form', {
 							(this.valdateName(this.fieldsVal.natural.personTrans)) &&
 							(this.valdateName(this.fieldsVal.natural.personGovNum)) && 
 							(this.localRecord.wAddress.region.name !== '') && 
-							(this.valdateName(this.fieldsVal.natural.personTransportCostPerKm)) //&& 
+							(this.fieldsVal.natural.personTransportCostPerKm != '') 
 							//(this.wUnitAmounts != [{}]) 
 						) {
 							return true;
@@ -316,7 +315,7 @@ Vue.component('app-registration-form', {
 			this.localRecord.wGroup = e;
 			this.transportUnitsLoad();
 		},
-		addUnit(index){
+		addUnit(){
 			//alert(this.wUnitsSelect.options.length);
 			this.wUnitAmounts.push({});
 		},
@@ -326,10 +325,10 @@ Vue.component('app-registration-form', {
 			//alert(JSON.stringify(e));
 		},
 		transportGroupUrl(){
-			return 'https://r52.ru/api/transport/getTypes/';
+			return '/api/transport/getTypes/';
 		},
 		transportUnitsUrl(id){
-			return 'https://r52.ru/api/transport/getUnits/' + id;
+			return '/api/transport/getUnits/' + id;
 		},
 		transportGroupLoad(){
 			axios
@@ -440,6 +439,7 @@ Vue.component('app-registration-form', {
 						url: "form.php",
 						data: {
 								"date": post_data,
+								"record": this.localRecord
 						},
 						dataType: "html",
 						type: "post",
@@ -448,7 +448,15 @@ Vue.component('app-registration-form', {
 								data = JSON.parse(data);
 
 								if (data.success) {
-									window.location.href = "/customers/" + data.ID + '/';
+									if (this.personRegType == "executor") {
+										window.location.href = "/executor/" + data.ID + '/';
+									} else if (this.personRegType == "customer") {
+										window.location.href = "/customers/" + data.ID + '/';
+									} else if (this.personRegType == "neworder") {
+										window.location.href = "/orders/" + data.ID + '/';
+									} else {
+										window.location.href = "/orders/";
+									}
 								} else {
 									alert = '<div class=\'row  wrap_alert_error\' >' +
 													'<div class=\'offset-lg-1 col-lg-10 offset-xl-2 col-xl-8\'>' + 
@@ -725,7 +733,7 @@ Vue.component('app-registration-form', {
 
 		valdateName(name) {
 
-			name = name.replace(/[^a-zA-Z0-9]/g, '')
+			name = name.replace(/[^a-zA-Zа-яА-Я0-9]/g, '')
 			if (name.length >= 2) {
 				return true;
 			}
@@ -739,7 +747,6 @@ Vue.component('app-registration-form', {
 			return valid;
 		}, 
 
-
 		valdatePhone(phone) {
 			var re = /^\d[\d\(\)\ -]{7,14}\d$/;
 			var valid = re.test(phone);
@@ -1139,6 +1146,7 @@ Vue.component('app-registration-form', {
 										<span class="field-text__input-wrap">
 											<input	type="text" 
 															placeholder="Контактный телефон" 
+															v-mask="'##/##/####'"
 															class="field-text__input"
 															v-model="fieldsVal.juridical.companyContactPhone"
 											>

src/pages/index.pug

@@ -20,7 +20,7 @@ block page
 
 		h1.title!=title
 
-		app-registration(:reg_info_from="'neworder'")
+		app-registration(:reg_info_from="'executor'")
 
 		br
 		br