Parcourir la source

调整记录盒页面样式,部门选择默认展开

cfort il y a 2 ans
Parent
commit
2cd1ea0fe5

+ 1 - 7
src/business/platform/org/position/panel.vue

@@ -128,7 +128,7 @@ export default {
     data () {
         return {
             parentId: '0',
-            defaultExpandAll: false,
+            defaultExpandAll: true,
             lazyTree: true,
             defaultExpandedKeys: ['0'],
             moreSearchParams: {},
@@ -276,7 +276,6 @@ export default {
 
                     let arrList = []
                     const second = this.$store.getters.level.second || ''
-                    console.log(second)
                     if ((type === '1' || type === '2') && this.filtrate && second) {
                         const showBoo = arr.some((item) => item.id === second)
                         if (showBoo) {
@@ -303,10 +302,8 @@ export default {
             const positions = this.$store.getters.userInfo.employee.positions
             if (positions) {
                 const positionsList = positions.split(',')
-                console.log(positionsList)
                 positionsList.forEach(item => {
                     const index = arrList.findIndex(it => it.id === item)
-                    console.log(index)
                     if (index >= 0) {
                         arrList[index].disabled = true
                     }
@@ -326,8 +323,6 @@ export default {
                     }
                 })
             }
-
-            console.log(arrList)
         },
         toTree (data) {
             return TreeUtils.transformToTreeFormat(data, {
@@ -436,7 +431,6 @@ export default {
             this.$emit('selected', val)
         },
         changeRadio (data) {
-            console.log(data)
             if (data.id === 0 || data.id === '0' || data.disabled) return
             this.$emit('selected', data)
         },

+ 19 - 7
src/views/platform/bpmn/bpmInstHis/list.vue

@@ -245,7 +245,7 @@ export default {
                 // 表格字段配置
                 columns: [
                     // { prop: 'subject', label: '任务标题', link: 'dialog', width: 250 },
-                    { prop: 'tYear', label: '年份', width: 60 },
+                    // { prop: 'tYear', label: '年份', width: 60 },
                     { prop: 'tDept', label: '部门', width: 90 },
                     { prop: 'procDefName', label: '表单名称', sortable: 'custom', formatter: this.replaceFormName, width: 250 },
                     { prop: 'subject', label: '事务说明', formatter: this.getDesc, 'min-width': 300 },
@@ -254,11 +254,11 @@ export default {
                 ],
                 rowHandle: {
                     actions: [
-                        {
-                            key: 'detail',
-                            label: '详情',
-                            type: 'info'
-                        }
+                        // {
+                        //     key: 'detail',
+                        //     label: '详情',
+                        //     type: 'info'
+                        // }
                     ],
                     effect: 'display',
                     width: '100'
@@ -275,7 +275,19 @@ export default {
         if (hasRole) {
             // 系统管理角色不做分类过滤
             // this.hasPermission = false
-            this.listConfig.toolbars.push({ key: 'remove' })
+            const btn = [
+                {
+                    key: 'detail',
+                    label: '详情',
+                    type: 'info'
+                },
+                {
+                    key: 'remove',
+                    label: '删除',
+                    type: 'danger'
+                }
+            ]
+            this.listConfig.toolbars.push(...btn)
             this.selection = true
         }
     },