HR_asco/asco_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display name 1401-02-22

Browse Source
This commit is contained in:
sedmedgh
2022-05-12 17:18:28 +04:30
parent e318b84acb
commit dd391780e0
8 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+4 -3
View File
@@ -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)
src/assets/css/main.css
+17
View File
@@ -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;
}
src/layouts/components/navbar/components/ProfileDropDown.vue
+1 -1
View File
@@ -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">
src/store/access/access.js
-1
View File
@@ -26,7 +26,6 @@ const actions = {
rid = [...set1]
}
})
console.log("rid",rid)
commit('SetPermissions', rid);
},
async save({commit}, payload) {
src/views/auth/Login.vue
+4 -2
View File
@@ -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)
src/views/personel/Personel.vue
+1 -1
View File
@@ -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>
src/views/proposal/Proposal.vue
+1 -1
View File
@@ -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>
src/views/restore/restore.vue
+4 -4
View File
@@ -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="بله"