From f749664174cde1fcc88873072ac0009478fe8dd5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 05 三月 2025 16:02:40 +0800
Subject: [PATCH] 主公司可以查看、办理子公司的任务
---
src/store/modules/user.js | 5 +++++
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 2 +-
src/views/projectProcess/detail/index.vue | 5 +----
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3a8f745..09c7af6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -8,6 +8,7 @@
name: '',
avatar: '',
deptId: null,
+ childDeptIds: [],
deptName: '',
roles: [],
roleIds: [],
@@ -35,6 +36,9 @@
},
SET_DEPT: (state, deptId) => {
state.deptId = deptId
+ },
+ SET_CHILD_DEPT: (state, deptIds) => {
+ state.childDeptIds = deptIds
},
SET_DEPT_NAME: (state, deptName) => {
state.deptName = deptName
@@ -78,6 +82,7 @@
commit('SET_ROLE_IDS', user.roles.map(role => role.roleId))
commit('SET_NAME', user.userName)
commit('SET_DEPT', user.deptId)
+ commit('SET_CHILD_DEPT', res.childDeptList)
commit('SET_DEPT_NAME', user.dept ? user.dept.deptName : '')
commit('SET_AVATAR', avatar)
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index 4807cf7..b5eed36 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -120,7 +120,7 @@
<el-col :span="6">
<el-form-item label="椤圭洰鐘舵��" label-width="100px" prop="projectStatus" style="width: 100%">
- <el-select v-model="projectForm.projectStatus" clearable placeholder="璇烽�夋嫨" @change="handleProjectStatusChange" style="width: 100%">
+ <el-select v-model="projectForm.projectStatus" clearable placeholder="璇烽�夋嫨" style="width: 100%">
<el-option v-for="item in dict.type.sys_project_status" :key="item.value" :label="item.label"
:value="item.value"/>
</el-select>
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 95a42ab..00e54ed 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -417,12 +417,9 @@
showHandle(row) {
if (row.taskStatus === '寰呭姙' || row.taskStatus === '鎸傝捣') {
if (row.handlerType === "USER") {
- console.log(row.handlerId.indexOf(this.$store.state.user.id) !== -1, "鎴戞槸涓嶆槸")
return row.handlerId.indexOf(this.$store.state.user.id) !== -1
} else if (row.handlerType === "DEPT") {
- console.log(this.$store.state.user.deptId, "閮ㄩ棬id", row.handlerUnitId)
- return row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1
- // return this.$store.state.user.name === '甯傚彂灞曟敼闈╁' || this.$store.state.user.name === '甯備綇寤哄眬'
+ return row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1 || row.handlerUnitId.some(id => this.$store.state.user.childDeptIds.indexOf(id) !== -1)
} else if (row.handlerType === "ROLE") {
return row.handlerUnitId.some(roleId => this.$store.state.user.roleIds.indexOf(roleId) !== -1)
}
--
Gitblit v1.8.0