Jelajahi Sumber

调整层级组件默认值

cfort 2 tahun lalu
induk
melakukan
46c9b11ee9

+ 1 - 1
src/business/platform/data/templaterender/templates/list.vue

@@ -793,7 +793,7 @@ export default {
                             return
                         }
                         src = `${this.$reportPath.replace('show', 'pdf')}${button.reportPath}&id_=${selection}`
-                        console.log(src)
+                        // console.log(src)
                         this.$common.preview(this, src)
                         break
                     case 'download': // 下载记录

+ 3 - 3
src/business/platform/form/utils/formUtil.js

@@ -352,7 +352,7 @@ const FormUtil = {
     },
     getCurrentDataValue ({ selectorType, bindId, fieldName, storeType }) {
         const userInfo = store.getters.userInfo
-        const { level = '' } = store.getters
+        const { level = {} } = store.getters
         // 缓存用户
         if (userInfo.employee && userInfo.employee.id) {
             const selectors = [{
@@ -363,8 +363,8 @@ const FormUtil = {
         }
         // 当前层级
         if (selectorType === 'currentPosition') {
-            const selectors = level.split(',').map(str => ({ id: str }))
-            console.log(selectors)
+            const t = level.second || level.first
+            const selectors = t ? t.split(',').map(str => ({ id: str })) : ''
             this.CACHE_CURRENT_USER_DATA['currentPosition'] = selectors
         }
         // 当前组织

+ 4 - 2
src/store/modules/ibps/modules/user.js

@@ -74,9 +74,11 @@ export default {
                             root: true
                         })
                         if (info.positions && info.positions.length) {
+                            // 当存在第二级为空时,说明具备最高级权限
+                            const hasFirst = info.positions.some(obj => obj.path.split('.')[1] === '')
                             const level = {
-                                first: [...new Set(info.positions.map(obj => obj.path ? obj.path.split('.')[0] : '').filter(Boolean))].join(','),
-                                second: [...new Set(info.positions.map(obj => obj.path ? obj.path.split('.')[1] : '').filter(Boolean))].join(',')
+                                first: [...new Set(info.positions.map(obj => obj.path.split('.')[0]))].join(','),
+                                second: hasFirst ? '' : [...new Set(info.positions.map(obj => obj.path.split('.')[1]))].join(',')
                             }
                             await dispatch('ibps/param/setLevel', level, {
                                 root: true