From bafe47af1d42a0df842a152b520afed0b9adcbc7 Mon Sep 17 00:00:00 2001
From: sedmedgh <sedmedgh@gmail.com>
Date: Thu, 26 May 2022 17:25:49 +0430
Subject: [PATCH] fixed set field edu 1401-03-05

---
 src/views/dashboard/DashboardAnalytics.vue |  4 ++--
 src/views/dashboard/workChart.js           | 11 ++++-------
 src/views/personel/view_edit_personel.vue  | 12 ++++++++++--
 src/views/register/Register.vue            |  8 ++++----
 src/views/register/RegisterPersonnel.vue   |  8 ++++----
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/views/dashboard/DashboardAnalytics.vue b/src/views/dashboard/DashboardAnalytics.vue
index 060c64d..00d0e85 100644
--- a/src/views/dashboard/DashboardAnalytics.vue
+++ b/src/views/dashboard/DashboardAnalytics.vue
@@ -132,8 +132,8 @@
       <div>
         <a-card title="سوابق کاری">
           <x-table :model="workChart">
-            <template slot="history" slot-scope="{text, record}">
-              {{record.history?record.history+' سال':'-'}}
+            <template slot="count_year" slot-scope="{text, record}">
+              {{text?text+' سال':'-'}}
             </template>
             <template slot="end" slot-scope="{text, record}">
               {{record.end_at?record.end_at:'-'}}
diff --git a/src/views/dashboard/workChart.js b/src/views/dashboard/workChart.js
index a532015..524aea6 100644
--- a/src/views/dashboard/workChart.js
+++ b/src/views/dashboard/workChart.js
@@ -1,11 +1,8 @@
 import XTbl, {Xtc} from '@/components/new-x-table/index';
 
 const tbl = new XTbl('/work', 'لیست پرسنل');
-tbl.add(new Xtc('proposal.name', 'نام و نام خانوادگی').filterText())
-tbl.add(new Xtc('history', 'سابقه کار').renderSlot('history').filterText());
-tbl.add(new Xtc('title', 'نام شغل').filterText())
-tbl.add(new Xtc('university', 'مکان').filterText())
-tbl.add(new Xtc('has_certificate_str', 'وضعیت مدرک').filterText())
-tbl.add(new Xtc('start_at', 'تاریخ شروع سابقه').filterDate().filterKey('start_at'))
-tbl.add(new Xtc('end_at', 'تاریخ اتمام سابقه').renderSlot('end').filterDate().filterKey('end_at'))
+tbl.add(new Xtc('name', 'نام و نام خانوادگی').filterText())
+tbl.add(new Xtc('ncode', 'کد ملی').filterText())
+tbl.add(new Xtc('count_year', 'سابقه کار').renderSlot('count_year'))
+tbl.add(new Xtc('last_education_str', 'آخرین مدرک تحصیلی').filterText())
 export default tbl;
diff --git a/src/views/personel/view_edit_personel.vue b/src/views/personel/view_edit_personel.vue
index a3fea62..795c697 100644
--- a/src/views/personel/view_edit_personel.vue
+++ b/src/views/personel/view_edit_personel.vue
@@ -212,13 +212,13 @@
                       </a-select>
                     </a-form-item>
                   </div>
-                  <a-form-item label="آخرین مدرک تحصیلی">
+<!--                  <a-form-item label="آخرین مدرک تحصیلی">
                     <a-select v-decorator="[`last_education`]">
                       <a-select-option v-for="(item,index) in grade" :value="index">
                         {{ item }}
                       </a-select-option>
                     </a-select>
-                  </a-form-item>
+                  </a-form-item>-->
 
                 </div>
               </a-card>
@@ -1717,6 +1717,14 @@ export default {
         this.personel = record;
         this.personelBirthDate = record && record.proposal && record.proposal.birth_date ? record.proposal.birth_date : null;
         this.flags = {gender: record.proposal.gender, marriage_sts: record.proposal.marriage_sts,}
+
+        record.personal_details.education.forEach((item) => {
+          item.level = `${item.level}`
+        })
+        record.personal_details.family.forEach((item) => {
+          item.edu_level = `${item.edu_level}`
+        })
+        // personal_details.family[${index}].edu_level
         this.$nextTick(() => {
           this.fromPersonel.setFieldsValue(record);
         });
diff --git a/src/views/register/Register.vue b/src/views/register/Register.vue
index 8a00502..24b8726 100644
--- a/src/views/register/Register.vue
+++ b/src/views/register/Register.vue
@@ -165,13 +165,13 @@
                     </a-select-option>
                   </a-select>
                 </a-form-item>
-                <a-form-item label="آخرین مدرک تحصیلی">
+<!--                <a-form-item label="آخرین مدرک تحصیلی">
                   <a-select v-decorator="[`last_education`]">
                     <a-select-option v-for="(item,index) in grade" :value="index">
                       {{ item }}
                     </a-select-option>
                   </a-select>
-                </a-form-item>
+                </a-form-item>-->
 
               </div>
 
@@ -346,7 +346,7 @@
                       <div style="direction: rtl">نسبت : {{ item.relation }}</div>
                     </div>
                     <div>
-                      <div style="direction: ltr" v-if="item.edu"> مقطع :{{ item.edu.title }}</div>
+                      <div style="direction: ltr" v-if="item.edu"> مقطع :{{ grade[item.edu] }}</div>
                       <div style="direction: rtl">رشته تحصیلی : {{ item.edu_title }}</div>
                     </div>
                     <div>
@@ -385,7 +385,7 @@
                         bordered item-layout="horizontal">
                   <a-list-item class="grid grid-cols-4" v-for="(item,index) in edu" :key="index">
                     <div>
-                      <div style="direction: ltr" v-if="item.grade"> مقطع :{{ item.grade.title }}</div>
+                      <div style="direction: ltr" v-if="item.grade"> مقطع :{{ grade[item.grade] }}</div>
                       <div style="direction: rtl">دانشگاه : {{ item.university }}</div>
                     </div>
 
diff --git a/src/views/register/RegisterPersonnel.vue b/src/views/register/RegisterPersonnel.vue
index b4b0a4a..c67aaa6 100644
--- a/src/views/register/RegisterPersonnel.vue
+++ b/src/views/register/RegisterPersonnel.vue
@@ -174,13 +174,13 @@
                     </a-select-option>
                   </a-select>
                 </a-form-item>
-                <a-form-item label="آخرین مدرک تحصیلی">
+<!--                <a-form-item label="آخرین مدرک تحصیلی">
                   <a-select v-decorator="[`last_education`]">
                     <a-select-option v-for="(item,index) in grade" :value="index">
                       {{ item }}
                     </a-select-option>
                   </a-select>
-                </a-form-item>
+                </a-form-item>-->
 
               </div>
 
@@ -354,7 +354,7 @@
                       <div style="direction: rtl">نسبت : {{ item.relation }}</div>
                     </div>
                     <div>
-                      <div style="direction: ltr" v-if="item.edu"> مقطع :{{ item.edu.title }}</div>
+                      <div style="direction: ltr" v-if="item.edu">{{item.ed}} مقطع :{{ grade[`${item.edu}`] }}</div>
                       <div style="direction: rtl">رشته تحصیلی : {{ item.edu_title }}</div>
                     </div>
                     <div>
@@ -393,7 +393,7 @@
                         bordered item-layout="horizontal">
                   <a-list-item class="grid grid-cols-4" v-for="(item,index) in edu" :key="index">
                     <div>
-                      <div style="direction: ltr" v-if="item.grade"> مقطع :{{ item.grade.title }}</div>
+                      <div style="direction: ltr" v-if="item.grade"> {{item.grade}}مقطع :{{ grade[`${item.grade}`] }}</div>
                       <div style="direction: rtl">دانشگاه : {{ item.university }}</div>
                     </div>