diff --git a/src/assets/scss/ara/farsi.scss b/src/assets/scss/ara/farsi.scss
index 593f3c6..f960040 100644
--- a/src/assets/scss/ara/farsi.scss
+++ b/src/assets/scss/ara/farsi.scss
@@ -34,7 +34,7 @@
 }
 
 body, * {
-  font-family: p-yek ,sans-serif, tahoma;
+  font-family: 'p-yek' ,sans-serif, tahoma;
   letter-spacing: 0px !important;
   font-size: inherit;
   line-height: inherit;
diff --git a/src/assets/scss/vuexy/_fixesVuesax.scss b/src/assets/scss/vuexy/_fixesVuesax.scss
index cf40d95..7363c15 100644
--- a/src/assets/scss/vuexy/_fixesVuesax.scss
+++ b/src/assets/scss/vuexy/_fixesVuesax.scss
@@ -61,7 +61,7 @@
 
 .vs-button {
 
-  font-family: "Montserrat", Helvetica, Arial, sans-serif;
+  font-family: 'p-yek', Helvetica, Arial, sans-serif;
   font-size: 1rem;
 
   &.vs-button-gradient {
diff --git a/src/assets/scss/vuexy/_variables.scss b/src/assets/scss/vuexy/_variables.scss
index 0b0f61c..7692e9a 100644
--- a/src/assets/scss/vuexy/_variables.scss
+++ b/src/assets/scss/vuexy/_variables.scss
@@ -37,11 +37,11 @@ $black: #22292f;
         TYPOGRAPHY
 =========================================================*/
 
-$font-family-sans-serif:  "Montserrat", Helvetica, Arial, sans-serif !default;
-$font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
+$font-family-sans-serif:  'p-yek', Helvetica, Arial, sans-serif !default;
+$font-family-serif:       'p-yek', "Times New Roman", Times, serif !default;
 
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
-$font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
+$font-family-monospace:   'p-yek', Monaco, Consolas, "Courier New", monospace !default;
 $font-family-base:        $font-family-sans-serif !default;
 
 $font-size-base:          14px !default;
diff --git a/src/views/proposal/Proposal.vue b/src/views/proposal/Proposal.vue
index 2972f85..ef52644 100644
--- a/src/views/proposal/Proposal.vue
+++ b/src/views/proposal/Proposal.vue
@@ -26,7 +26,7 @@
                 <a href="javascript:;" @click="showAddMosahebe(text.record.id)">ثبت مصاحبه</a>
 
               </a-menu-item>
-              <a-menu-item v-if="$getAccess('request.employment')">
+              <a-menu-item v-if="$getAccess('request.employment') && !text.record.employed">
                 <a href="javascript:;" @click="showConfirme(text.record.id)">استخدام</a>
               </a-menu-item>
             </a-menu>
diff --git a/src/views/register/Register.vue b/src/views/register/Register.vue
index d3e83ae..24e6a25 100644
--- a/src/views/register/Register.vue
+++ b/src/views/register/Register.vue
@@ -6,7 +6,7 @@
     </div>
     <vx-card class="mx-auto mt-10">
 
-      <a-steps :current="current">
+      <a-steps :current="current" v-show="current<2">
         <a-step title="مرحله اول"/>
         <a-step title="مرحله دوم"/>
         <a-step title="مرحله سوم"/>
@@ -546,19 +546,19 @@
               </a-alert>
 
             </div>
-            <div v-show="current==2">
-              <a-result
+          </a-form>
+          <div v-show="current==2">
+               <a-result
                   status="success"
-                  title="اطلاعات با موفقیت ثبت شد"
+                  title="رزومه با موفقیت دریافت شد و در صورت امکان همکاری، برای مراحل بعدی با شما ارتباط برقرار خواهیم کرد"
                   sub-title="">
-                <template #extra>
-                  <a-button @click="LoginUser">
-                    اتمام
-                  </a-button>
-                </template>
+                  <template #extra>
+                    <a-button type="primary" size="large" @click="clearAll">
+                      تایید
+                    </a-button>
+                  </template>
               </a-result>
             </div>
-          </a-form>
         </ASpin>
       </div>
 
@@ -841,6 +841,15 @@ export default {
     }
   },
   methods: {
+    clearAll(){
+      this.from.resetFields()
+      this.formEdu.resetFields()
+      this.formFamily.resetFields()
+      this.formEducational.resetFields()
+      this.formWork.resetFields()
+      this.formFirst.resetFields()
+      this.current = 0
+    },
     setMarriage_sts(event) {
       this.flags.marriage_sts = event.target.value
     },
diff --git a/src/views/register/RegisterPersonnel.vue b/src/views/register/RegisterPersonnel.vue
index a4f6a2e..01e6df1 100644
--- a/src/views/register/RegisterPersonnel.vue
+++ b/src/views/register/RegisterPersonnel.vue
@@ -6,7 +6,7 @@
       </div>-->
     <vx-card class="mx-auto mt-10">
 
-      <a-steps :current="current">
+      <a-steps :current="current" v-show="current<2">
         <a-step title="مرحله اول"/>
         <a-step title="مرحله دوم"/>
         <a-step title="مرحله سوم"/>
@@ -555,15 +555,15 @@
 
             </div>
             <div v-show="current==2">
-              <a-result
+             <a-result
                   status="success"
-                  title="اطلاعات با موفقیت ثبت شد"
+                  title="رزومه با موفقیت دریافت شد و در صورت امکان همکاری، برای مراحل بعدی با شما ارتباط برقرار خواهیم کرد"
                   sub-title="">
-                <template #extra>
-                  <a-button href="/register/personnel">
-                    اتمام
-                  </a-button>
-                </template>
+                  <template #extra>
+                    <a-button type="primary" size="large" @click="clearAll">
+                      تایید
+                    </a-button>
+                  </template>
               </a-result>
             </div>
           </a-form>
@@ -848,6 +848,15 @@ export default {
     }
   },
   methods: {
+    clearAll(){
+      this.from.resetFields()
+      this.formEdu.resetFields()
+      this.formFamily.resetFields()
+      this.formEducational.resetFields()
+      this.formWork.resetFields()
+      this.formFirst.resetFields()
+      this.current = 0
+    },
     setMarriage_sts(event) {
       this.flags.marriage_sts = event.target.value
     },