From dd391780e0bec36838f8fe595e2a2572a6ae7d33 Mon Sep 17 00:00:00 2001
From: sedmedgh <sedmedgh@gmail.com>
Date: Thu, 12 May 2022 17:18:28 +0430
Subject: [PATCH] display name 1401-02-22

---
 src/App.vue                                     |  7 ++++---
 src/assets/css/main.css                         | 17 +++++++++++++++++
 .../navbar/components/ProfileDropDown.vue       |  2 +-
 src/store/access/access.js                      |  1 -
 src/views/auth/Login.vue                        |  6 ++++--
 src/views/personel/Personel.vue                 |  2 +-
 src/views/proposal/Proposal.vue                 |  2 +-
 src/views/restore/restore.vue                   |  8 ++++----
 8 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2169f84..b73fc74 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -73,9 +73,10 @@ export default {
   async created() {
 
     try{
-      let {data:{permission}} = await axios.get('/permission/user')
-      await this.$store.dispatch("access/setPermissions", permission)
-      // console.log("user data",this.$store.state.access.permissions)
+      let {data} = await axios.get('/permission/user')
+      await this.$store.dispatch("access/setPermissions", data.permission)
+      delete data.permission
+      localStorage.setItem('userInfo',JSON.stringify(data))
     }
     catch (e) {
       console.log("eeeee: ",e)
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index b30669f..6172c61 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -105,3 +105,20 @@
   right: auto !important;
   transform-origin: 0 !important;
 }
+.ant-btn-warning{
+ color: #fff;
+ background-color: #faad14;
+ border-color: #faad14;
+ text-shadow: 0 -1px 0 rgb(0 0 0 / 12%);
+ box-shadow: 0 2px 0 rgb(0 0 0 / 5%)
+}
+.ant-btn-warning:hover, .ant-btn-warning:focus {
+ color: #fff;
+ background-color: #ffc042;
+ border-color: #ffc042;
+}
+.ant-btn-warning:active, .ant-btn-warning:active {
+ color: #fff;
+ background-color: #ffaa00;
+ border-color: #ffaa00;
+}
\ No newline at end of file
diff --git a/src/layouts/components/navbar/components/ProfileDropDown.vue b/src/layouts/components/navbar/components/ProfileDropDown.vue
index 6f4ed68..ba2208c 100644
--- a/src/layouts/components/navbar/components/ProfileDropDown.vue
+++ b/src/layouts/components/navbar/components/ProfileDropDown.vue
@@ -7,7 +7,7 @@
                       {{ username.name  }}
                   </p>
                   <p class="font-semibold mb-0">
-                    {{username.user_type_str}}
+                    {{username.user_type_type}}
                   </p>
                 </div>
                 <div class="con-img ml-3">
diff --git a/src/store/access/access.js b/src/store/access/access.js
index edbfadf..75d29fa 100644
--- a/src/store/access/access.js
+++ b/src/store/access/access.js
@@ -26,7 +26,6 @@ const actions = {
         rid = [...set1]
       }
     })
-    console.log("rid",rid)
     commit('SetPermissions', rid);
   },
   async save({commit}, payload) {
diff --git a/src/views/auth/Login.vue b/src/views/auth/Login.vue
index 2645a07..0228e24 100644
--- a/src/views/auth/Login.vue
+++ b/src/views/auth/Login.vue
@@ -125,8 +125,10 @@
                   this.$message.error(msg);
                 })
         try{
-          let {data:{permission}} = await axios.get('/permission/user')
-          await this.$store.dispatch("access/setPermissions", permission)
+          let {data} = await axios.get('/permission/user')
+          await this.$store.dispatch("access/setPermissions", data.permission)
+          delete data.permission
+          localStorage.setItem('userInfo',JSON.stringify(data))
         }
         catch (e) {
           console.log("eeeee: ",e)
diff --git a/src/views/personel/Personel.vue b/src/views/personel/Personel.vue
index 94bc94d..5cadfbe 100644
--- a/src/views/personel/Personel.vue
+++ b/src/views/personel/Personel.vue
@@ -20,7 +20,7 @@
                     cancel-text="خیر"
                     @confirm="deletePersonnel(text.record.id)"
                 >
-                  <a-button type="danger"> حذف پرسنل</a-button>
+                  <a-button type="danger"> بایگانی پرسنل</a-button>
                 </a-popconfirm>
               </div>
             </template>
diff --git a/src/views/proposal/Proposal.vue b/src/views/proposal/Proposal.vue
index 17cbb0c..381f5dd 100644
--- a/src/views/proposal/Proposal.vue
+++ b/src/views/proposal/Proposal.vue
@@ -30,7 +30,7 @@
                 <a href="javascript:;" @click="showSetEmployeModal(text.record.id)">استخدام</a>
               </a-menu-item>
               <a-menu-item v-if="$getAccess('request.delete')">
-                <a href="javascript:;" @click="deleteProposal(text.record.id)">حذف درخواست</a>
+                <a href="javascript:;" @click="deleteProposal(text.record.id)">بایگانی درخواست</a>
               </a-menu-item>
               <a-menu-item v-if="$getAccess('personnel.type') && text.record.employed">
                 <a href="javascript:;" @click="showUpdateTypeModal(text.record.id)">تغییر نوع کاربری درخواست</a>
diff --git a/src/views/restore/restore.vue b/src/views/restore/restore.vue
index cf64f10..deb93f1 100644
--- a/src/views/restore/restore.vue
+++ b/src/views/restore/restore.vue
@@ -6,12 +6,12 @@
           <x-table v-if="$getAccess('archive.personnel.show')" v-show="tabs == 0" :model="personnelCols" ref="personnelTbl" class="mt-3">
             <div slot="operator" slot-scope="text,record" class="grid grid-cols-1 md:grid-cols-1 gap-2">
 <!--              v-if="$getAccess('personnel.delete')"-->
-              <a-popconfirm title="آیا می خواهید بازیافت کنید؟" v-if="$getAccess('archive.personnel.restore')"
+              <a-popconfirm title="آیا می خواهید بازیابی کنید؟" v-if="$getAccess('archive.personnel.restore')"
                   ok-text="بله"
                   cancel-text="خیر"
                   @confirm="restorePersonnel(text.record.id)"
               >
-                <a-button type="primary">بازیافت اطلاعات</a-button>
+                <a-button type="primary">بازیابی اطلاعات</a-button>
               </a-popconfirm>
 <!--              <a-popconfirm title="آیا می خواهید حذف کنید؟" v-if="$getAccess('archive.personnel.destroy')"
                   ok-text="بله"
@@ -26,12 +26,12 @@
         <vs-tab label="بایگانی درخواست ها">
           <x-table v-if="$getAccess('archive.proposal.show')" v-show="tabs == 1" :model="proposalCols" ref="proposalTbl" class="mt-3">
             <div slot="operator" slot-scope="text,record" class="grid grid-cols-1 md:grid-cols-1 gap-2">
-              <a-popconfirm title="آیا می خواهید بازیافت کنید؟" v-if="$getAccess('archive.proposal.restore')"
+              <a-popconfirm title="آیا می خواهید بازیابی کنید؟" v-if="$getAccess('archive.proposal.restore')"
                   ok-text="بله"
                   cancel-text="خیر"
                   @confirm="restoreProposal(text.record.id)"
               >
-                <a-button type="primary">بازیافت اطلاعات</a-button>
+                <a-button type="primary">بازیابی اطلاعات</a-button>
               </a-popconfirm>
 <!--              <a-popconfirm title="آیا می خواهید حذف کنید؟" v-if="$getAccess('archive.proposal.destroy')"
                   ok-text="بله"