diff --git a/src/views/personel/view_edit_personel.vue b/src/views/personel/view_edit_personel.vue index 795c697..71d20e6 100644 --- a/src/views/personel/view_edit_personel.vue +++ b/src/views/personel/view_edit_personel.vue @@ -236,26 +236,26 @@ + v-decorator="[`personal_details.family[${index}].name`, {initialValue: item.name}]"/> + v-decorator="[`personal_details.family[${index}].relation`, {initialValue: item.relation}]"/> - - + + {{ item }} + v-decorator="[`personal_details.family[${index}].edu_title`, {initialValue: item.edu_title}]"/> + v-decorator="[`personal_details.family[${index}].job`, {initialValue: item.job}]"/> @@ -272,34 +272,34 @@
+ v-decorator="[`personal_details.education[${index}].id`, {initialValue: item.id}]"/> - - + + {{ item }} + v-decorator="[`personal_details.education[${index}].university`, {initialValue: item.university}]"/> + v-decorator="[`personal_details.education[${index}].title`, {initialValue: item.title}]"/> + v-decorator="[`personal_details.education[${index}].trend`, {initialValue: item.trend}]"/> + v-decorator="[`personal_details.education[${index}].start_at`,{ rules: [{pattern:/^[0-9]+$/,message:'مقدار وارد شده باید عددی باشد.'},],initialValue: item.start_at }]"/> + v-decorator="[`personal_details.education[${index}].end_at`,{ rules: [{pattern:/^[0-9]+$/,message:'مقدار وارد شده باید عددی باشد.'},],initialValue: item.end_at }]"/>
@@ -320,19 +320,19 @@ + v-decorator="[`personal_details.traning[${index}].university`, {initialValue: item.university}]"/> + v-decorator="[`personal_details.traning[${index}].title`, {initialValue: item.title}]"/> + v-decorator="[`personal_details.traning[${index}].start_at`,{ rules: [{pattern:/^[0-9]+$/,message:'مقدار وارد شده باید عددی باشد.'},],initialValue: item.start_at }]"/> + v-decorator="[`personal_details.traning[${index}].has_certificate`,{initialValue:item.has_certificate,valuePropName: 'checked'}]"/> @@ -353,24 +353,24 @@ + v-decorator="[`personal_details.jobs_history[${index}].university`, {initialValue: item.university}]"/> + v-decorator="[`personal_details.jobs_history[${index}].title`, {initialValue: item.title}]"/> + v-decorator="[`personal_details.jobs_history[${index}].note`, {initialValue: item.note}]"/> + v-decorator="[`personal_details.jobs_history[${index}].start_at`,{ rules: [{pattern:/^[0-9]+$/,message:'مقدار وارد شده باید عددی باشد.'},], initialValue: item.start_at }]"/> + v-decorator="[`personal_details.jobs_history[${index}].end_at`,{ rules: [{pattern:/^[0-9]+$/,message:'مقدار وارد شده باید عددی باشد.'},], initialValue: item.end_at }]"/> @@ -1264,13 +1264,13 @@ export default { "title": null, "university": null, "start_at": null, - "has_certificate": null, + "has_certificate": false, } this.personalDetails['traning'].push(obj); }, AddEducation() { const obj = { - "level": 1, + "level": null, "title": null, "trend": null, "university": null, @@ -1283,7 +1283,7 @@ export default { const obj = { "name": null, "relation": null, - "edu_level": 1, + "edu_level": null, "edu_title": null, "job": null, }; @@ -1719,10 +1719,10 @@ export default { this.flags = {gender: record.proposal.gender, marriage_sts: record.proposal.marriage_sts,} record.personal_details.education.forEach((item) => { - item.level = `${item.level}` + item.level = item.level ? `${item.level}` : item.level }) record.personal_details.family.forEach((item) => { - item.edu_level = `${item.edu_level}` + item.edu_level = item.edu_level ? `${item.edu_level}` : item.edu_level }) // personal_details.family[${index}].edu_level this.$nextTick(() => { diff --git a/src/views/register/Register.vue b/src/views/register/Register.vue index 24b8726..d2809e7 100644 --- a/src/views/register/Register.vue +++ b/src/views/register/Register.vue @@ -1045,11 +1045,8 @@ export default { this.formFamily.validateFields(async (err, values) => { if (!err) { try { - if (this.find_grade) { - values.edu = this.find_grade; - values.edu_level = this.find_grade.level; - } - + // values.edu = {level: this.find_grade, title:this.grade[this.find_grade]} + values.edu_level = this.find_grade; if (this.editMode) { const find = this.family.findIndex(item => item.id == this.tempRow.id) Object.assign(this.family[find], values); @@ -1077,7 +1074,7 @@ export default { this.formEdu.validateFields(async (err, values) => { if (!err) { try { - if (this.find_grade) values.grade = this.find_grade + // if (this.find_grade) values.grade = this.find_grade if (this.editMode) { const find = this.edu.findIndex(item => item.id == this.tempRow.id) Object.assign(this.edu[find], values); diff --git a/src/views/register/RegisterPersonnel.vue b/src/views/register/RegisterPersonnel.vue index c67aaa6..d80a184 100644 --- a/src/views/register/RegisterPersonnel.vue +++ b/src/views/register/RegisterPersonnel.vue @@ -1,9 +1,10 @@ + + –> @@ -27,20 +28,20 @@
- + –>
- + –>
- + –> - + <!– –>
- + –> - + <!– –>
- + –>
@@ -97,7 +98,7 @@
- + <!– –> @@ -107,7 +108,7 @@ - + <!––> @@ -117,12 +118,12 @@ - + <!– v-decorator="['birthdate',{initialValue: null,rules: [{ required: true, message: 'تاریخ تولد را وارد نمایید' }]}]"–>
- + <!––> @@ -174,13 +175,13 @@ - + –>
@@ -206,7 +207,7 @@ autocomplete="off" style="width: 77%;direction: rtl"/> - + –> - - + <!– –> + <!– –> @@ -269,8 +270,8 @@ - - + <!––> + <!– –> @@ -279,8 +280,8 @@ - - + <!––> + <!– –> @@ -294,8 +295,8 @@ - - + <!– –> + <!– –> @@ -304,8 +305,8 @@ - - + <!––> + <!– –> @@ -314,8 +315,8 @@ - - + <!––> + <!– –> @@ -616,7 +617,7 @@ - + –> @@ -693,7 +694,7 @@ - + <!––>
@@ -1202,7 +1203,7 @@ export default { this.current++; }, prev() { - this.current--; + this.current--; }, async getGrad(){ try { @@ -1250,3 +1251,4 @@ export default { }*/ +-->