From 87b27a5f90784c522c07021107dade28e23bf95c Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Thu, 9 Oct 2025 16:11:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9F=B9=E8=AE=AD=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue                   |  2 +-
 src/store/modules/user.js                          |  4 +++-
 src/views/qualification/vehicleTrain/index.vue     | 14 +++++++++++++-
 src/views/system/userApproval/userApprovalForm.vue |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 831f10c..797f269 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -132,7 +132,7 @@ import { getSiteMessagePage, updateSiteMessageStatus, oneClickClear } from "@/ap
 const appStore = useAppStore()
 const userStore = useUserStore()
 const router = useRouter()
-const settingsStore = useSettingsStore()
+const settingsStore = useSettingsStore() 
 
 const { proxy } = getCurrentInstance()
 const timer = ref(null)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 40db6bc..ed5b240 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -14,6 +14,7 @@ const useUserStore = defineStore(
       name: '',
       nickName: '',
       avatar: '',
+      dependencyId: '', //属地id
       roles: [],
       permissions: []
     }),
@@ -38,7 +39,7 @@ const useUserStore = defineStore(
       getInfo() {
         return new Promise((resolve, reject) => {
           getInfo().then(res => {
-            const user = res.user
+            const user = res.user 
             let avatar = user.avatar || ""
             if (!isHttp(avatar)) {
               avatar = (isEmpty(avatar)) ? defAva : import.meta.env.VITE_APP_BASE_API + avatar
@@ -52,6 +53,7 @@ const useUserStore = defineStore(
             this.id = user.userId
             this.name = user.userName
             this.nickName = user.nickName
+            this.dependencyId = user.dependencyId
             this.avatar = avatar
             /* 初始密码提示 */
             if(res.isDefaultModifyPwd) {
diff --git a/src/views/qualification/vehicleTrain/index.vue b/src/views/qualification/vehicleTrain/index.vue
index 76ddab7..d3760d7 100644
--- a/src/views/qualification/vehicleTrain/index.vue
+++ b/src/views/qualification/vehicleTrain/index.vue
@@ -94,13 +94,17 @@ import { getVehicleTrainingPageList, deleteVehicleModelTraining } from "@/api/qu
 import { getBusDependencyPage } from "@/api/system/dependency"
 import { listUser } from "@/api/system/user"
 import moment from 'moment'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 
 const { proxy } = getCurrentInstance()
 // 初始化
 onMounted(() => {
     getAllUser();
+    getBusDependencyData();
+    queryParams.value.dependencyId = userStore?.dependencyId
+    console.log('用户', userStore.roles[0])
     getList();
-    getBusDependencyData()
 });
 
 const router = useRouter()
@@ -168,10 +172,18 @@ const handleOpenAddForm = () => {
     router.push('/qualification/vehicleTrain/Form')
 }
 const handleEdit = (record) => {
+    if (userStore.roles[0] != 'admin' && record.dependencyId != userStore.dependencyId) {
+        proxy.$modal.notifyWarning("您没有权限操作!!!")
+        return false
+    }
     router.push("/qualification/vehicleTrain/Form/" + record.id)
 }
 /** 删除按钮操作 */
 const handleDelete = (row) => {
+    if (userStore.roles[0] != 'admin' && row.dependencyId != userStore.dependencyId) {
+        proxy.$modal.notifyWarning("您没有权限操作!!!")
+        return false
+    }
     const rowId = row.id
     proxy.$modal.confirm('是否确认删除该项数据项？').then(function () {
         return deleteVehicleModelTraining(rowId)
diff --git a/src/views/system/userApproval/userApprovalForm.vue b/src/views/system/userApproval/userApprovalForm.vue
index db5e8e7..b703b2f 100644
--- a/src/views/system/userApproval/userApprovalForm.vue
+++ b/src/views/system/userApproval/userApprovalForm.vue
@@ -238,7 +238,7 @@ const handleCancel = () => {
 const handleSubmit = () => {
     proxy.$refs["ruleFormRef"].validate(valid => {
         if (valid) {
-            ruleForm.value.roleIds = [2]
+            ruleForm.value.roleIds = ['2']
             checkRegisterUser(ruleForm.value).then(res => {
                 if (res.code == 200) {
                     router.push({