table 状态、结果等 样式统一

src/components/layouts/TabLayout.vue

@@ -1,8 +1,10 @@
 <template>
   <global-layout @dynamicRouterShow="dynamicRouterShow">
     <!-- update-begin- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
-    <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" style="z-index: 9999;" @select="onMenuSelect"/>
+    <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" style="z-index: 9999;" @select="onMenuSelect" />
     <!-- update-end- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
+
+    <!-- 头部 标签页 active-key 当前激活 tab 面板的 key -->
     <a-tabs
       @contextmenu.native="e => onContextmenu(e)"
       v-if="multipage"
@@ -13,7 +15,8 @@
       type="editable-card"
       @change="changePage"
       @tabClick="tabCallBack"
-      @edit="editPage">
+      @edit="editPage"
+    >
       <a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList">
         <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
       </a-tab-pane>
@@ -21,10 +24,10 @@
     <div style="margin: 12px 12px 0;">
       <transition name="page-toggle">
         <keep-alive v-if="multipage">
-          <router-view v-if="reloadFlag"/>
+          <router-view v-if="reloadFlag" />
         </keep-alive>
         <template v-else>
-          <router-view v-if="reloadFlag"/>
+          <router-view v-if="reloadFlag" />
         </template>
       </transition>
     </div>
@@ -32,282 +35,282 @@
 </template>
 
 <script>
-  import GlobalLayout from '@/components/page/GlobalLayout'
-  import Contextmenu from '@/components/menu/Contextmenu'
-  import { mixin, mixinDevice } from '@/utils/mixin.js'
-  import { triggerWindowResizeEvent } from '@/utils/util'
+import GlobalLayout from '@/components/page/GlobalLayout'
+import Contextmenu from '@/components/menu/Contextmenu'
+import { mixin, mixinDevice } from '@/utils/mixin.js'
+import { triggerWindowResizeEvent } from '@/utils/util'
 
-  const indexKey = '/dashboard/analysis'
+const indexKey = '/dashboard/analysis'
 
-  export default {
+export default {
     name: 'TabLayout',
     components: {
-      GlobalLayout,
-      Contextmenu
+        GlobalLayout,
+        Contextmenu
     },
     mixins: [mixin, mixinDevice],
-    data() {
-      return {
-        pageList: [],
-        linkList: [],
-        activePage: '',
-        menuVisible: false,
-        menuItemList: [
-          { key: '4', icon: 'reload', text: '刷 新' },
-          { key: '1', icon: 'arrow-left', text: '关闭左侧' },
-          { key: '2', icon: 'arrow-right', text: '关闭右侧' },
-          { key: '3', icon: 'close', text: '关闭其它' }
-        ],
-        reloadFlag:true
-      }
+    data () {
+        return {
+            pageList: [],
+            linkList: [],
+            activePage: '',
+            menuVisible: false,
+            menuItemList: [
+                { key: '4', icon: 'reload', text: '刷 新' },
+                { key: '1', icon: 'arrow-left', text: '关闭左侧' },
+                { key: '2', icon: 'arrow-right', text: '关闭右侧' },
+                { key: '3', icon: 'close', text: '关闭其它' }
+            ],
+            reloadFlag: true
+        }
     },
     /* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用 ->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
-    provide(){
-      return{
-        closeCurrent:this.closeCurrent
-      }
+    provide () {
+        return {
+            closeCurrent: this.closeCurrent
+        }
     },
     /* update_end author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
     computed: {
-      multipage() {
-        //判断如果是手机模式，自动切换为单页面模式
-        if (this.isMobile()) {
-          return false
-        } else {
-          return this.$store.state.app.multipage
+        multipage () {
+            // 判断如果是手机模式，自动切换为单页面模式
+            if (this.isMobile()) {
+                return false
+            } else {
+                return this.$store.state.app.multipage
+            }
         }
-      }
     },
-    created() {
-      if (this.$route.path != indexKey) {
-        this.addIndexToFirst()
-      }
-      // update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
-      let storeKey = 'route:title:' + this.$route.fullPath
-      let routeTitle = this.$ls.get(storeKey)
-      if (routeTitle) {
-        this.$route.meta.title = routeTitle
-      }
-      // update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
-      this.pageList.push(this.$route)
-      this.linkList.push(this.$route.fullPath)
-      this.activePage = this.$route.fullPath
+    created () {
+        if (this.$route.path != indexKey) {
+            this.addIndexToFirst()
+        }
+        // update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
+        // let storeKey = 'route:title:' + this.$route.fullPath
+        // let routeTitle = this.$ls.get(storeKey)
+        // if (routeTitle) {
+        //     this.$route.meta.title = routeTitle
+        // }
+        // update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
+        this.pageList.push(this.$route)
+        this.linkList.push(this.$route.fullPath)
+        this.activePage = this.$route.fullPath
     },
     watch: {
-      '$route': function(newRoute) {
-        //console.log("新的路由",newRoute)
-        this.activePage = newRoute.fullPath
-        if (!this.multipage) {
-          this.linkList = [newRoute.fullPath]
-          this.pageList = [Object.assign({},newRoute)]
-        // update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
-        } else if(indexKey==newRoute.fullPath) {
-          //首页时 判断是否缓存 没有缓存 刷新之
-          if (newRoute.meta.keepAlive === false) {
-            this.routeReload()
-          }
-        // update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
-        }else if (this.linkList.indexOf(newRoute.fullPath) < 0) {
-          this.linkList.push(newRoute.fullPath)
-          this.pageList.push(Object.assign({},newRoute))
-          // update-begin-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍
-          if (newRoute.meta.keepAlive) {
-            this.routeReload()
-          }
-          // update-end-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍
-        } else if (this.linkList.indexOf(newRoute.fullPath) >= 0) {
-          let oldIndex = this.linkList.indexOf(newRoute.fullPath)
-          let oldPositionRoute = this.pageList[oldIndex]
-          this.pageList.splice(oldIndex, 1, Object.assign({},newRoute,{meta:oldPositionRoute.meta}))
-        }
-      },
-      'activePage': function(key) {
-        let index = this.linkList.lastIndexOf(key)
-        let waitRouter = this.pageList[index]
-        this.$router.push(Object.assign({},waitRouter));
-        this.changeTitle(waitRouter.meta.title)
-      },
-      'multipage': function(newVal) {
-        if(this.reloadFlag){
-          if (!newVal) {
-            this.linkList = [this.$route.fullPath]
-            this.pageList = [this.$route]
-          }
+        $route: function (newRoute) {
+            // console.log("新的路由",newRoute)
+            this.activePage = newRoute.fullPath
+            if (!this.multipage) {
+                this.linkList = [newRoute.fullPath]
+                this.pageList = [Object.assign({}, newRoute)]
+                // update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
+            } else if (indexKey == newRoute.fullPath) {
+                // 首页时 判断是否缓存 没有缓存 刷新之
+                if (newRoute.meta.keepAlive === false) {
+                    this.routeReload()
+                }
+                // update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
+            } else if (this.linkList.indexOf(newRoute.fullPath) < 0) {
+                this.linkList.push(newRoute.fullPath)
+                this.pageList.push(Object.assign({}, newRoute))
+                // update-begin-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍
+                if (newRoute.meta.keepAlive) {
+                    this.routeReload()
+                }
+                // update-end-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍
+            } else if (this.linkList.indexOf(newRoute.fullPath) >= 0) {
+                let oldIndex = this.linkList.indexOf(newRoute.fullPath)
+                let oldPositionRoute = this.pageList[oldIndex]
+                this.pageList.splice(oldIndex, 1, Object.assign({}, newRoute, { meta: oldPositionRoute.meta }))
+            }
+        },
+        activePage: function (key) {
+            let index = this.linkList.lastIndexOf(key)
+            let waitRouter = this.pageList[index]
+            this.$router.push(Object.assign({}, waitRouter))
+            this.changeTitle(waitRouter.meta.title)
+        },
+        multipage: function (newVal) {
+            if (this.reloadFlag) {
+                if (!newVal) {
+                    this.linkList = [this.$route.fullPath]
+                    this.pageList = [this.$route]
+                }
+            }
+        },
+        // update-begin-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
+        device () {
+            if (this.multipage && this.linkList.indexOf(indexKey) === -1) {
+                this.addIndexToFirst()
+            }
         }
-      },
-      // update-begin-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
-      device() {
-        if (this.multipage && this.linkList.indexOf(indexKey) === -1) {
-          this.addIndexToFirst()
-        }
-      },
-      // update-end-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
+    // update-end-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
     },
     methods: {
-      // update-begin-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
-      // 将首页添加到第一位
-      addIndexToFirst() {
-        this.pageList.splice(0, 0, {
-          name: 'dashboard-analysis',
-          path: indexKey,
-          fullPath: indexKey,
-          meta: {
-            icon: 'dashboard',
-            title: '首页'
-          }
-        })
-        this.linkList.splice(0, 0, indexKey)
-      },
-      // update-end-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
+    // update-begin-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
+    // 将首页添加到第一位
+        addIndexToFirst () {
+            this.pageList.splice(0, 0, {
+                name: 'dashboard-analysis',
+                path: indexKey,
+                fullPath: indexKey,
+                meta: {
+                    icon: 'dashboard',
+                    title: '首页'
+                }
+            })
+            this.linkList.splice(0, 0, indexKey)
+        },
+        // update-end-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
 
-      // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
-      changeTitle(title) {
-        let projectTitle = "上海萃颠信息科技有限公司"
-        // 首页特殊处理
-        if (this.$route.path === indexKey) {
-          document.title = projectTitle
-        } else {
-          document.title = title + ' · ' + projectTitle
-        }
-      },
-      // update-end-author:sunjianlei date:20200120 for: 动态更改页面标题
+        // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
+        changeTitle (title) {
+            let projectTitle = '上海萃颠信息科技有限公司'
+            // 首页特殊处理
+            if (this.$route.path === indexKey) {
+                document.title = projectTitle
+            } else {
+                document.title = title + ' · ' + projectTitle
+            }
+        },
+        // update-end-author:sunjianlei date:20200120 for: 动态更改页面标题
 
-      changePage(key) {
-        this.activePage = key
-      },
-      tabCallBack() {
-        this.$nextTick(() => {
-          triggerWindowResizeEvent()
-        })
-      },
-      editPage(key, action) {
-        this[action](key)
-      },
-      remove(key) {
-        if (key == indexKey) {
-          this.$message.warning('首页不能关闭!')
-          return
-        }
-        if (this.pageList.length === 1) {
-          this.$message.warning('这是最后一页，不能再关闭了啦')
-          return
-        }
-        this.pageList = this.pageList.filter(item => item.fullPath !== key)
-        let index = this.linkList.indexOf(key)
-        this.linkList = this.linkList.filter(item => item !== key)
-        index = index >= this.linkList.length ? this.linkList.length - 1 : index
-        this.activePage = this.linkList[index]
-      },
-      onContextmenu(e) {
-        const pagekey = this.getPageKey(e.target)
-        if (pagekey !== null) {
-          e.preventDefault()
-          this.menuVisible = true
-        }
-      },
-      getPageKey(target, depth) {
-        depth = depth || 0
-        if (depth > 2) {
-          return null
-        }
-        let pageKey = target.getAttribute('pagekey')
-        pageKey = pageKey || (target.previousElementSibling ? target.previousElementSibling.getAttribute('pagekey') : null)
-        return pageKey || (target.firstElementChild ? this.getPageKey(target.firstElementChild, ++depth) : null)
-      },
-      onMenuSelect(key, target) {
-        let pageKey = this.getPageKey(target)
-        switch (key) {
-          case '1':
-            this.closeLeft(pageKey)
-            break
-          case '2':
-            this.closeRight(pageKey)
-            break
-          case '3':
-            this.closeOthers(pageKey)
-            break
-          case '4':
-            this.routeReload()
-            break
-          default:
-            break
-        }
-      },
-      /* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
-      closeCurrent(){
-        this.remove(this.activePage);
-      },
-      /* update_end author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
-      closeOthers(pageKey) {
-        let index = this.linkList.indexOf(pageKey)
-        if (pageKey == indexKey || pageKey.indexOf('?ticke=')>=0) {
-          this.linkList = this.linkList.slice(index, index + 1)
-          this.pageList = this.pageList.slice(index, index + 1)
-          this.activePage = this.linkList[0]
-        } else {
-          let indexContent = this.pageList.slice(0, 1)[0]
-          this.linkList = this.linkList.slice(index, index + 1)
-          this.pageList = this.pageList.slice(index, index + 1)
-          this.linkList.unshift(indexContent.fullPath)
-          this.pageList.unshift(indexContent)
-          this.activePage = this.linkList[1]
-        }
-      },
-      closeLeft(pageKey) {
-        if (pageKey == indexKey) {
-          return
-        }
-        let tempList = [...this.pageList]
-        let indexContent = tempList.slice(0, 1)[0]
-        let index = this.linkList.indexOf(pageKey)
-        this.linkList = this.linkList.slice(index)
-        this.pageList = this.pageList.slice(index)
-        this.linkList.unshift(indexContent.fullPath)
-        this.pageList.unshift(indexContent)
-        if (this.linkList.indexOf(this.activePage) < 0) {
-          this.activePage = this.linkList[0]
-        }
-      },
-      closeRight(pageKey) {
-        let index = this.linkList.indexOf(pageKey)
-        this.linkList = this.linkList.slice(0, index + 1)
-        this.pageList = this.pageList.slice(0, index + 1)
-        if (this.linkList.indexOf(this.activePage < 0)) {
-          this.activePage = this.linkList[this.linkList.length - 1]
-        }
-      },
-      //update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
-      dynamicRouterShow(key,title){
-        let keyIndex = this.linkList.indexOf(key)
-        if(keyIndex>=0){
-          let currRouter = this.pageList[keyIndex]
-          let meta = Object.assign({},currRouter.meta,{title:title})
-          this.pageList.splice(keyIndex, 1, Object.assign({},currRouter,{meta:meta}))
-          if (key === this.activePage) {
-            this.changeTitle(title)
-          }
-        }
-      },
-      //update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
+        changePage (key) {
+            this.activePage = key
+        },
+        tabCallBack () {
+            this.$nextTick(() => {
+                triggerWindowResizeEvent()
+            })
+        },
+        editPage (key, action) {
+            this[action](key)
+        },
+        remove (key) {
+            if (key == indexKey) {
+                this.$message.warning('首页不能关闭!')
+                return
+            }
+            if (this.pageList.length === 1) {
+                this.$message.warning('这是最后一页，不能再关闭了啦')
+                return
+            }
+            this.pageList = this.pageList.filter(item => item.fullPath !== key)
+            let index = this.linkList.indexOf(key)
+            this.linkList = this.linkList.filter(item => item !== key)
+            index = index >= this.linkList.length ? this.linkList.length - 1 : index
+            this.activePage = this.linkList[index]
+        },
+        onContextmenu (e) {
+            const pagekey = this.getPageKey(e.target)
+            if (pagekey !== null) {
+                e.preventDefault()
+                this.menuVisible = true
+            }
+        },
+        getPageKey (target, depth) {
+            depth = depth || 0
+            if (depth > 2) {
+                return null
+            }
+            let pageKey = target.getAttribute('pagekey')
+            pageKey =
+        pageKey || (target.previousElementSibling ? target.previousElementSibling.getAttribute('pagekey') : null)
+            return pageKey || (target.firstElementChild ? this.getPageKey(target.firstElementChild, ++depth) : null)
+        },
+        onMenuSelect (key, target) {
+            let pageKey = this.getPageKey(target)
+            switch (key) {
+            case '1':
+                this.closeLeft(pageKey)
+                break
+            case '2':
+                this.closeRight(pageKey)
+                break
+            case '3':
+                this.closeOthers(pageKey)
+                break
+            case '4':
+                this.routeReload()
+                break
+            default:
+                break
+            }
+        },
+        /* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
+        closeCurrent () {
+            this.remove(this.activePage)
+        },
+        /* update_end author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
+        closeOthers (pageKey) {
+            let index = this.linkList.indexOf(pageKey)
+            if (pageKey == indexKey || pageKey.indexOf('?ticke=') >= 0) {
+                this.linkList = this.linkList.slice(index, index + 1)
+                this.pageList = this.pageList.slice(index, index + 1)
+                this.activePage = this.linkList[0]
+            } else {
+                let indexContent = this.pageList.slice(0, 1)[0]
+                this.linkList = this.linkList.slice(index, index + 1)
+                this.pageList = this.pageList.slice(index, index + 1)
+                this.linkList.unshift(indexContent.fullPath)
+                this.pageList.unshift(indexContent)
+                this.activePage = this.linkList[1]
+            }
+        },
+        closeLeft (pageKey) {
+            if (pageKey == indexKey) {
+                return
+            }
+            let tempList = [...this.pageList]
+            let indexContent = tempList.slice(0, 1)[0]
+            let index = this.linkList.indexOf(pageKey)
+            this.linkList = this.linkList.slice(index)
+            this.pageList = this.pageList.slice(index)
+            this.linkList.unshift(indexContent.fullPath)
+            this.pageList.unshift(indexContent)
+            if (this.linkList.indexOf(this.activePage) < 0) {
+                this.activePage = this.linkList[0]
+            }
+        },
+        closeRight (pageKey) {
+            let index = this.linkList.indexOf(pageKey)
+            this.linkList = this.linkList.slice(0, index + 1)
+            this.pageList = this.pageList.slice(0, index + 1)
+            if (this.linkList.indexOf(this.activePage < 0)) {
+                this.activePage = this.linkList[this.linkList.length - 1]
+            }
+        },
+        // update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
+        dynamicRouterShow (key, title) {
+            let keyIndex = this.linkList.indexOf(key)
+            if (keyIndex >= 0) {
+                let currRouter = this.pageList[keyIndex]
+                let meta = Object.assign({}, currRouter.meta, { title: title })
+                this.pageList.splice(keyIndex, 1, Object.assign({}, currRouter, { meta: meta }))
+                if (key === this.activePage) {
+                    this.changeTitle(title)
+                }
+            }
+        },
+        // update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
 
-      //update-begin-author:taoyan date:20191008 for:路由刷新
-      routeReload(){
-        this.reloadFlag = false
-        let ToggleMultipage = "ToggleMultipage"
-        this.$store.dispatch(ToggleMultipage,false)
-        this.$nextTick(()=>{
-          this.$store.dispatch(ToggleMultipage,true)
-          this.reloadFlag = true
-        })
-      }
-      //update-end-author:taoyan date:20191008 for:路由刷新
+        // update-begin-author:taoyan date:20191008 for:路由刷新
+        routeReload () {
+            this.reloadFlag = false
+            let ToggleMultipage = 'ToggleMultipage'
+            this.$store.dispatch(ToggleMultipage, false)
+            this.$nextTick(() => {
+                this.$store.dispatch(ToggleMultipage, true)
+                this.reloadFlag = true
+            })
+        }
+    // update-end-author:taoyan date:20191008 for:路由刷新
     }
-  }
+}
 </script>
 
 <style lang="less">
-
-  /*
+/*
  * The following styles are auto-applied to elements with
  * transition="page-transition" when their visibility is toggled
  * by Vue.js.
@@ -316,76 +319,69 @@
  * these styles.
  */
 
-  .page-transition-enter {
-    opacity: 0;
-  }
+.page-transition-enter {
+  opacity: 0;
+}
 
-  .page-transition-leave-active {
-    opacity: 0;
-  }
+.page-transition-leave-active {
+  opacity: 0;
+}
 
-  .page-transition-enter .page-transition-container,
-  .page-transition-leave-active .page-transition-container {
-    -webkit-transform: scale(1.1);
-    transform: scale(1.1);
-  }
+.page-transition-enter .page-transition-container,
+.page-transition-leave-active .page-transition-container {
+  -webkit-transform: scale(1.1);
+  transform: scale(1.1);
+}
 
-  /*美化弹出Tab样式*/
-  .ant-tabs-nav-container {
-    margin-top: 4px;
-  }
-
-  /* 修改 ant-tabs 样式 */
-  .tab-layout-tabs.ant-tabs {
-    border-bottom: 1px solid #ccc;
-    border-left: 1px solid #ccc;
-    background-color: white;
-    padding: 0 20px;
+/*美化弹出Tab样式*/
+.ant-tabs-nav-container {
+  margin-top: 4px;
+}
 
-    .ant-tabs-bar {
-      margin: 4px 0 0;
-      border: none;
-    }
+/* 修改 ant-tabs 样式 */
+.tab-layout-tabs.ant-tabs {
+  border-bottom: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+  background-color: white;
+  padding: 0 20px;
 
+  .ant-tabs-bar {
+    margin: 4px 0 0;
+    border: none;
   }
+}
 
-  .ant-tabs {
-
-    &.ant-tabs-card .ant-tabs-tab {
-
-      padding: 0 24px !important;
-      background-color: white !important;
-      margin-right: 10px !important;
-
-      .ant-tabs-close-x {
-        width: 12px !important;
-        height: 12px !important;
-        opacity: 0 !important;
-        cursor: pointer !important;
-        font-size: 12px !important;
-        margin: 0 !important;
-        position: absolute;
-        top: 36%;
-        right: 6px;
-      }
-
-      &:hover .ant-tabs-close-x {
-        opacity: 1 !important;
-      }
+.ant-tabs {
+  &.ant-tabs-card .ant-tabs-tab {
+    padding: 0 24px !important;
+    background-color: white !important;
+    margin-right: 10px !important;
 
+    .ant-tabs-close-x {
+      width: 12px !important;
+      height: 12px !important;
+      opacity: 0 !important;
+      cursor: pointer !important;
+      font-size: 12px !important;
+      margin: 0 !important;
+      position: absolute;
+      top: 36%;
+      right: 6px;
     }
 
-  }
-
-  .ant-tabs.ant-tabs-card > .ant-tabs-bar {
-    .ant-tabs-tab {
-      border: none !important;
-      border-bottom: 1px solid transparent !important;
-    }
-    .ant-tabs-tab-active {
-      border-color: @primary-color!important;
+    &:hover .ant-tabs-close-x {
+      opacity: 1 !important;
     }
   }
+}
 
-
-</style>
+.ant-tabs.ant-tabs-card > .ant-tabs-bar {
+  .ant-tabs-tab {
+    border: none !important;
+    border-bottom: 1px solid transparent !important;
+  }
+  .ant-tabs-tab-active {
+    border-color: @primary-color!important;
+  }
+}
+</style>

src/views/activiti/applyList.vue

@@ -4,12 +4,13 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
+          <a-col :md="4" :sm="12">
             <a-form-item label="标题">
               <a-input placeholder="请输入搜索关键词" v-model="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8">
+
+          <a-col :md="4" :sm="12">
             <a-form-item label="状态">
               <a-select v-model="queryParam.status" placeholder="请选择" :allowClear="true">
                 <a-select-option value="0">草稿</a-select-option>
@@ -19,7 +20,8 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8">
+
+          <a-col :md="4" :sm="12">
             <a-form-item label="结果">
               <a-select v-model="queryParam.result" placeholder="请选择" :allowClear="true">
                 <a-select-option value="0">未提交</a-select-option>
@@ -29,10 +31,11 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="10">
+
+          <a-col :md="6" :sm="12">
             <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker
-                style="width: 210px"
+                style="width: 100%"
                 v-model="queryParam.createTimeRange"
                 format="YYYY-MM-DD"
                 :placeholder="['开始时间', '结束时间']"
@@ -42,180 +45,173 @@
             </a-form-item>
           </a-col>
 
-          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="6" :sm="12">
-              <a-button type="primary" style="left: 10px" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px"
-                >重置</a-button
-              >
-            </a-col>
-          </span>
-          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="12" :sm="12">
-              <a-button
-                type="primary"
-                @click="addApply"
-                :loading="addApplyLoading"
-                style="left: 10px"
-                icon="plus-circle"
-                >发起申请</a-button
-              >
-            </a-col>
-          </span>
+          <!-- 查询按钮 -->
+          <a-col :md="6" :sm="6">
+            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="marginLeft:10px;">重置</a-button>
+          </a-col>
+        </a-row>
+
+        <a-row>
+          <a-col :md="12" :sm="12" style="margin:10px 0;">
+            <a-button type="primary" @click="addApply" :loading="addApplyLoading" icon="plus-circle">
+              发起申请
+            </a-button>
+          </a-col>
         </a-row>
       </a-form>
     </div>
 
     <!-- 表-->
-    <a-table
-      bordered
-      ref="table"
-      size="small"
-      rowKey="id"
-      :dataSource="dataSource"
-      :pagination="ipagination"
-      :loading="loading"
-      @change="handleTableChange"
-    >
-      <a-table-column title="#" :width="50" align="center">
-        <template slot-scope="t, r, i">
-          <span> {{ i + 1 }} </span>
-        </template>
-      </a-table-column>
-      <a-table-column title="标题" dataIndex="title" :width="150" align="center">
-        <template slot-scope="t, r, i">
-          <span> {{ t }} </span>
-        </template>
-      </a-table-column>
-      <a-table-column title="所属流程" dataIndex="processName" :width="150" align="center">
-        <template slot-scope="t, r, i">
-          <span> {{ t }} </span>
-        </template>
-      </a-table-column>
-      <a-table-column title="当前审批环节" dataIndex="currTaskName" :width="150" align="center">
-        <template slot-scope="t, r, i">
-          <span> {{ t }} </span>
-        </template>
-      </a-table-column>
+    <a-row :gutter="24">
+      <a-col :md="24" :sm="24">
+        <a-table
+          bordered
+          ref="table"
+          size="small"
+          rowKey="id"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          @change="handleTableChange"
+        >
+          <!-- 序号 -->
+          <a-table-column title="#" :width="50" align="center">
+            <template slot-scope="t, r, i">
+              <span> {{ i + 1 }} </span>
+            </template>
+          </a-table-column>
+          <a-table-column title="标题" dataIndex="title" :width="150" align="center">
+            <template slot-scope="t">
+              <span> {{ t }} </span>
+            </template>
+          </a-table-column>
+          <a-table-column title="所属流程" dataIndex="processName" :width="150" align="center">
+            <template slot-scope="t">
+              <span> {{ t }} </span>
+            </template>
+          </a-table-column>
+          <a-table-column title="当前审批环节" dataIndex="currTaskName" :width="150" align="center">
+            <template slot-scope="t">
+              <span> {{ t }} </span>
+            </template>
+          </a-table-column>
+
+          <!-- 状态 -->
+          <a-table-column
+            title="状态"
+            dataIndex="status"
+            :width="100"
+            align="center"
+            key="s"
+            :sorter="(a, b) => a.status - b.status"
+          >
+            <template slot-scope="t, r">
+              <template v-if="r.status == 0">
+                <a-tag color="red">草稿</a-tag>
+              </template>
 
-      <!-- 状态 -->
-      <a-table-column
-        title="状态"
-        dataIndex="status"
-        :width="100"
-        align="center"
-        key="s"
-        :sorter="(a, b) => a.status - b.status"
-      >
-        <template slot-scope="t, r, i">
-          <!-- <span :style="{ color: getStatus(t).color }"> {{ getStatus(t).text }} </span> -->
-          <!-- 草稿 -->
-          <template v-if="r.status == 0">
-            <a-tag color="red">草稿</a-tag>
-          </template>
+              <template v-if="r.status == 1">
+                <a-tag color="blue">处理中</a-tag>
+              </template>
 
-          <!-- 处理中 -->
-          <template v-if="r.status == 1">
-            <a-tag color="blue">处理中</a-tag>
-          </template>
+              <template v-if="r.status == 2">
+                <a-tag color="red">已结束</a-tag>
+              </template>
 
-          <!-- 已结束 -->
-          <template v-if="r.status == 2">
-            <a-tag color="green">已结束</a-tag>
-          </template>
+              <template v-if="r.status == 3">
+                <a-tag color="orange">已撤回</a-tag>
+              </template>
+            </template>
+          </a-table-column>
 
-          <!-- 已撤回 -->
-          <template v-if="r.status == 3">
-            <a-tag color="orange">已撤回</a-tag>
-          </template>
-        </template>
-      </a-table-column>
+          <!-- 结果 -->
+          <a-table-column
+            title="结果"
+            dataIndex="result"
+            :width="100"
+            align="center"
+            key="result"
+            :sorter="(a, b) => a.result - b.result"
+          >
+            <template slot-scope="t, r">
+              <!--未提交-->
+              <template v-if="r.result == 0">
+                <a-tag color="#f4a261">未提交</a-tag>
+              </template>
 
-      <!-- 结果 -->
-      <a-table-column
-        title="结果"
-        dataIndex="result"
-        :width="100"
-        align="center"
-        key="result"
-        :sorter="(a, b) => a.result - b.result"
-      >
-        <template slot-scope="t, r, i">
-          <!-- <span :style="{ color: getResult(t).color }"> {{ getResult(t).text }} </span> -->
-          <!--未提交-->
-          <template v-if="r.status == 0">
-            <a-tag color="#ab947e">未提交</a-tag>
-          </template>
+              <!-- 处理中 -->
+              <template v-if="r.result == 1">
+                <a-tag color="#108ee9">处理中</a-tag>
+              </template>
 
-          <!-- 处理中 -->
-          <template v-if="r.status == 1">
-            <a-tag color="#108ee9">处理中</a-tag>
-          </template>
+              <!-- 已通过 -->
+              <template v-if="r.result == 2">
+                <a-tag color="#87d068">已通过</a-tag>
+              </template>
 
-          <!-- 已通过 -->
-          <template v-if="r.status == 2">
-            <a-tag color="#87d068">已通过</a-tag>
-          </template>
+              <!-- 已驳回 -->
+              <template v-if="r.result == 3">
+                <a-tag color="#b7b7a4">已驳回</a-tag>
+              </template>
+            </template>
+          </a-table-column>
 
-          <!-- 已驳回 -->
-          <template v-if="r.status == 3">
-            <a-tag color="#f50">已驳回</a-tag>
-          </template>
-        </template>
-      </a-table-column>
+          <a-table-column title="创建时间" dataIndex="createTime" :width="150" align="center">
+            <template slot-scope="t">
+              <span> {{ t }} </span>
+            </template>
+          </a-table-column>
+          <a-table-column title="提交申请时间" dataIndex="applyTime" :width="150" align="center">
+            <template slot-scope="t">
+              <span> {{ t }} </span>
+            </template>
+          </a-table-column>
 
-      <!-- 创建时间 -->
-      <a-table-column title="创建时间" dataIndex="createTime" :width="150" align="center">
-        <template slot-scope="t, r, i">
-          <span> {{ t }} </span>
-        </template>
-      </a-table-column>
-      <a-table-column title="提交申请时间" dataIndex="applyTime" :width="150" align="center">
-        <template slot-scope="t, r, i">
-          <span> {{ t }} </span>
-        </template>
-      </a-table-column>
-      <a-table-column title="操作" dataIndex="" align="center" :width="200">
-        <template slot-scope="t, r, i">
-          <template v-if="r.status == 0">
-            <a href="javascript:void(0);" style="color: #00A0E9" @click="apply(r)">提交申请</a>
-            <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑</a>
-            <a-divider type="vertical" />
-            <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
-              <a href="javascript:void(0);" style="color: red">删除</a>
-            </a-popconfirm>
-          </template>
-          <template v-else-if="r.status == 1">
-            <a href="javascript:void(0);" @click="cancel(r)" style="color:#8000ff;">撤回</a>
-            <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="history(r)" style="color:#217dbb;">审批历史</a>
-            <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="detail(r)">表单数据</a>
-          </template>
-          <template v-else-if="(r.status == 2 && r.result == 3) || r.status == 3">
-            <a-popconfirm title="确定提交申请吗?" @confirm="() => apply(r)">
-              <a href="javascript:void(0);" style="color:#00A0E9;">重新申请</a>
-            </a-popconfirm>
-            <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;">编辑</a>
-            <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="history(r)" style="color:#217dbb;">审批历史</a>
-            <a-divider type="vertical" />
-            <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
-              <a href="javascript:void(0);" style="color: red">删除</a>
-            </a-popconfirm>
-          </template>
-          <template v-else>
-            <a href="javascript:void(0);" @click="detail(r)">表单数据</a>
-            <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="history(r)" style="color:#217dbb;">审批历史</a>
-          </template>
-        </template>
-      </a-table-column>
-    </a-table>
+          <!-- 操作按钮 -->
+          <a-table-column title="操作" dataIndex="" align="center" :width="200">
+            <template slot-scope="t, r">
+              <template v-if="r.status == 0">
+                <a href="javascript:void(0);" style="color: #00A0E9" @click="apply(r)">提交申请</a>
+                <a-divider type="vertical" />
+                <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑</a>
+                <a-divider type="vertical" />
+                <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
+                  <a href="javascript:void(0);" style="color: red">删除</a>
+                </a-popconfirm>
+              </template>
+              <template v-else-if="r.status == 1">
+                <a href="javascript:void(0);" @click="detail(r)">详情</a>
+                <a-divider type="vertical" />
+                <a href="javascript:void(0);" @click="cancel(r)" style="color:orange;">撤回</a>
+                <a-divider type="vertical" />
+                <a href="javascript:void(0);" @click="history(r)" style="color:gray;">审批历史</a>
+              </template>
+              <template v-else-if="(r.status == 2 && r.result == 3) || r.status == 3">
+                <a-popconfirm title="确定再次提交申请吗?" @confirm="() => apply(r)">
+                  <a href="javascript:void(0);" style="color:green;">再次申请</a>
+                </a-popconfirm>
+                <a-divider type="vertical" />
+                <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;">编辑</a>
+                <a-divider type="vertical" />
+                <a href="javascript:void(0);" @click="history(r)" style="color:gray;">审批历史</a>
+                <a-divider type="vertical" />
+                <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
+                  <a href="javascript:void(0);" style="color: red">删除</a>
+                </a-popconfirm>
+              </template>
+              <template v-else>
+                <a href="javascript:void(0);" @click="detail(r)">详情</a>
+                <a-divider type="vertical" />
+                <a href="javascript:void(0);" @click="history(r)" style="color:gray;">审批历史</a>
+              </template>
+            </template>
+          </a-table-column>
+        </a-table>
+      </a-col>
+    </a-row>
 
-    <!--表单数据-->
+    <!--发起申请按钮-->
     <a-drawer
       title="选择流程"
       width="33%"
@@ -229,7 +225,7 @@
       <div v-else>
         <a-collapse v-model="activeKey">
           <a-collapse-panel
-            v-for="(value, index) in activeKeyAll"
+            v-for="value in activeKeyAll"
             :header="filterDictText(dictOptions, value) || '未分类'"
             :key="value"
           >
@@ -254,6 +250,7 @@
         </a-collapse>
       </div>
     </a-drawer>
+
     <!--流程表单-->
     <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%">
       <component
@@ -267,8 +264,8 @@
       ></component>
     </a-modal>
 
-    <!--提交申请表单-->
-    <a-modal title="提交申请" v-model="modalVisible" :mask-closable="false" :width="500" :footer="null">
+    <!--再次申请-->
+    <a-modal title="再次申请" v-model="modalVisible" :mask-closable="false" :width="500" :footer="null">
       <div v-if="modalVisible">
         <a-form-item label="选择审批人" v-show="showAssign">
           <a-select

src/views/activiti/doneManage.vue

@@ -83,7 +83,7 @@
                 <a-tag color="#87d068">{{ t }}</a-tag>
               </template>
               <template v-else>
-                <a-tag color="#bf4342">{{ t }}</a-tag>
+                <a-tag color="#b7b7a4">{{ t }}</a-tag>
               </template>
             </template>
           </a-table-column>
@@ -111,9 +111,9 @@
           </a-table-column>
           <a-table-column title="操作" dataIndex="action" align="center" :width="150">
             <template slot-scope="t, r, i">
-              <a href="javascript:void(0);" @click="detail(r)">表单数据</a>
+              <a href="javascript:void(0);" @click="detail(r)">详情</a>
               <a-divider type="vertical" />
-              <a href="javascript:void(0);" @click="history(r)" style="color: #217dbb">审批历史</a>
+              <a href="javascript:void(0);" @click="history(r)" style="color:gray">审批历史</a>
               <a-divider type="vertical" />
               <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
                 <a style="color: red;">删除</a>

src/views/activiti/todoManage.vue

@@ -29,102 +29,105 @@
         <a-button @click="backAll" icon="md-close">批量驳回</a-button>
         <a-button @click="getDataList" icon="md-refresh">刷新</a-button>
       </a-row>-->
-      <a-row>
-        <!-- :scroll="scroll" -->
-        <a-table
-          bordered
-          :loading="loading"
-          rowKey="id"
-          :dataSource="data"
-          :pagination="ipagination"
-          @change="handleTableChange"
-          ref="table"
-        >
-          <a-table-column title="#" :width="50" align="center">
-            <template slot-scope="t, r, i">
-              <span> {{ i + 1 }} </span>
-            </template>
-          </a-table-column>
-          <a-table-column title="任务名称" dataIndex="name" :width="200" align="center">
-            <template slot-scope="t">
-              <span> {{ t }} </span>
-            </template>
-          </a-table-column>
-          <a-table-column title="所属流程" dataIndex="processName" :width="150" align="center">
-            <template slot-scope="t">
-              <span> {{ t }} </span>
-            </template>
-          </a-table-column>
-          <a-table-column title="委托代办人" dataIndex="owner" align="center" :width="150">
-            <template slot-scope="t">
-              <span> {{ t }} </span>
-            </template>
-          </a-table-column>
-          <a-table-column title="流程发起人" dataIndex="applyer" :width="150" align="center">
-            <template slot-scope="t">
-              <span> {{ t }} </span>
-            </template>
-          </a-table-column>
-
-          <!-- 优先级 -->
-          <a-table-column
-            title="优先级"
-            dataIndex="priority"
-            :width="150"
-            align="center"
-            key="so"
-            :sorter="(a, b) => a.priority - b.priority"
+      <a-row :gutter="24">
+        <a-col :md="24" :sm="24">
+          <!-- :scroll="scroll" -->
+          <a-table
+            bordered
+            :loading="loading"
+            rowKey="id"
+            :dataSource="data"
+            :pagination="ipagination"
+            @change="handleTableChange"
+            ref="table"
           >
-            <template slot-scope="t">
-              <span v-if="t == 0" style="color: green;"> 普通 </span>
-              <span v-else-if="t == 1" style="color: orange;"> 重要 </span>
-              <span v-else-if="t == 2" style="color: red;"> 紧急 </span>
-              <span v-else style="color: #999;"> 无 </span>
-            </template>
-          </a-table-column>
+            <a-table-column title="#" :width="50" align="center">
+              <template slot-scope="t, r, i">
+                <span> {{ i + 1 }} </span>
+              </template>
+            </a-table-column>
+            <a-table-column title="任务名称" dataIndex="name" :width="200" align="center">
+              <template slot-scope="t">
+                <span> {{ t }} </span>
+              </template>
+            </a-table-column>
+            <a-table-column title="所属流程" dataIndex="processName" :width="150" align="center">
+              <template slot-scope="t">
+                <span> {{ t }} </span>
+              </template>
+            </a-table-column>
+            <a-table-column title="委托代办人" dataIndex="owner" align="center" :width="150">
+              <template slot-scope="t">
+                <span> {{ t }} </span>
+              </template>
+            </a-table-column>
+            <a-table-column title="流程发起人" dataIndex="applyer" :width="150" align="center">
+              <template slot-scope="t">
+                <span> {{ t }} </span>
+              </template>
+            </a-table-column>
 
-          <!-- 状态 -->
-          <a-table-column
-            title="状态"
-            dataIndex="isSuspended"
-            :width="150"
-            align="center"
-            key="z"
-            :sorter="(a, b) => (Boolean(a.isSuspended) ? 0 : 1 - Boolean(b.isSuspended) ? 0 : 1)"
-          >
-            <template slot-scope="t">
-              <a-tag color="green" v-if="!Boolean(t)">已激活</a-tag>
-              <a-tag color="orange" v-if="Boolean(t)">已挂起</a-tag>
-            </template>
-          </a-table-column>
-          <a-table-column title="创建时间" dataIndex="createTime" :width="220" align="center">
-            <template slot-scope="t">
-              <span>{{ t }}</span>
-            </template>
-          </a-table-column>
-          <a-table-column title="操作" dataIndex="" align="center">
-            <template slot-scope="t, r, i">
-              <a href="javascript:void(0);" @click="detail(r)" style="color: blue">申请详情</a>
-              <a-divider type="vertical" />
-              <span
-                v-if="Boolean(r.isSuspended)"
-                style="cursor: no-drop;color: #999999;"
-                title="流程已被挂起，无法操作！"
-              >
-                通过 <a-divider type="vertical" /> 驳回 <a-divider type="vertical" /> 委托 <a-divider type="vertical" />
-              </span>
-              <span v-else>
-                <a href="javascript:void(0);" @click="passTask(r)" style="color: green">通过</a>
-                <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="backTask(r)" style="color: orange">驳回</a>
-                <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="delegateTask(r)" style="color: #00A0E9">委托</a>
+            <!-- 优先级 -->
+            <a-table-column
+              title="优先级"
+              dataIndex="priority"
+              :width="150"
+              align="center"
+              key="so"
+              :sorter="(a, b) => a.priority - b.priority"
+            >
+              <template slot-scope="t">
+                <span v-if="t == 0" style="color: green;"> 普通 </span>
+                <span v-else-if="t == 1" style="color: orange;"> 重要 </span>
+                <span v-else-if="t == 2" style="color: red;"> 紧急 </span>
+                <span v-else style="color: #999;"> 无 </span>
+              </template>
+            </a-table-column>
+
+            <!-- 状态 -->
+            <a-table-column
+              title="状态"
+              dataIndex="isSuspended"
+              :width="150"
+              align="center"
+              key="z"
+              :sorter="(a, b) => (Boolean(a.isSuspended) ? 0 : 1 - Boolean(b.isSuspended) ? 0 : 1)"
+            >
+              <template slot-scope="t">
+                <a-tag color="green" v-if="!Boolean(t)">已激活</a-tag>
+                <a-tag color="orange" v-if="Boolean(t)">已挂起</a-tag>
+              </template>
+            </a-table-column>
+            <a-table-column title="创建时间" dataIndex="createTime" :width="220" align="center">
+              <template slot-scope="t">
+                <span>{{ t }}</span>
+              </template>
+            </a-table-column>
+            <a-table-column title="操作" dataIndex="" align="center">
+              <template slot-scope="t, r, i">
+                <a href="javascript:void(0);" @click="detail(r)">表单数据</a>
                 <a-divider type="vertical" />
-              </span>
-              <a href="javascript:void(0);" @click="history(r)" style="color: #217dbb">审批历史</a>
-            </template>
-          </a-table-column>
-        </a-table>
+                <span
+                  v-if="Boolean(r.isSuspended)"
+                  style="cursor: no-drop;color: #999999;"
+                  title="流程已被挂起，无法操作！"
+                >
+                  通过 <a-divider type="vertical" /> 驳回 <a-divider type="vertical" /> 委托
+                  <a-divider type="vertical" />
+                </span>
+                <span v-else>
+                  <a href="javascript:void(0);" @click="passTask(r)" style="color: green">通过</a>
+                  <a-divider type="vertical" />
+                  <a href="javascript:void(0);" @click="backTask(r)" style="color: orange">驳回</a>
+                  <a-divider type="vertical" />
+                  <a href="javascript:void(0);" @click="delegateTask(r)" style="color: #00A0E9">委托</a>
+                  <a-divider type="vertical" />
+                </span>
+                <a href="javascript:void(0);" @click="history(r)" style="color: gray">审批历史</a>
+              </template>
+            </a-table-column>
+          </a-table>
+        </a-col>
       </a-row>
     </a-card>
 

src/views/dashboard/MyToDo.vue

@@ -365,15 +365,15 @@ export default {
             var annType = ''
             if (item.type == '人事') {
               annType =
-                '<span style="color:purple;border:1px solid purple;padding:0 4px;border-radius:3px;background:#f9f0ff;">人事</span>'
+                '<span style="color:rgba(128, 0, 128,.3);border:1px solid rgba(128, 0, 128,.3);padding:0 4px;border-radius:3px;">人事</span>'
             }
             if (item.type == '财务') {
               annType =
-                '<span style="color:#13c2c5;border:1px solid #13c2c5;padding:0 4px;border-radius:3px;background:#e6fffb;">财务</span>'
+                '<span style="color:rgba(19, 194, 197,.6);border:1px solid rgba(19, 194, 197,.6);padding:0 4px;border-radius:3px;">财务</span>'
             }
             if (item.type == '项目') {
               annType =
-                '<span style="color:orange;border:1px solid orange;padding:0 4px;border-radius:3px;background:#fff7e6;">项目</span>'
+                '<span style="color:rgba(255, 165, 0,.8);border:1px solid rgba(255, 165, 0,.8);padding:0 4px;border-radius:3px;">项目</span>'
             }
             var list = [item.id, annType, item.title, item.createBy, item.createTime]
 
@@ -462,9 +462,6 @@ export default {
           if (result.length > 0) {
             this.activeKeyAll = result
           }
-          if (result.length > 5) {
-            console.log('数据超过5条啦，需要隐藏')
-          }
         }
       })
     },

src/views/dashboard/MyoaTabs.vue

@@ -143,19 +143,20 @@ export default {
                     this.doneList = res.result
                     let scrollData = [] // 轮播表数据
                     this.doneList.map(item => {
-                        // var relResult = ''
-                        // if (item.deleteReason == '审批通过') {
-                        //     relResult = <span style="color:green;">审批通过</span>
-                        // } else {
-                        //     relResult = <span style="color:orange;">审批不通过</span>
-                        // }
-                        var list = [item.id, item.name, item.processName, item.applyer, item.deleteReason, item.createTime]
+                        var reallyResult = ''
+                        if (item.deleteReason == '审批通过') {
+                            reallyResult = '<span style="color:green">审批通过</span>'
+                        } else {
+                            reallyResult = '<span style="color:orange">审批驳回</span>'
+                        }
+
+                        var list = [item.id, item.name, item.processName, item.applyer, reallyResult, item.createTime]
                         scrollData.push(list)
                     })
                     this.doneConfig = {
                         oddRowBGC: 'white',
                         evenRowBGC: 'white',
-                        columnWidth: [150, 200, 200, 200, 150, 300],
+                        columnWidth: [150, 200, 200, 200, 300, 300],
                         align: ['center'],
                         rowNum: 5,
                         waitTime: 2000,

src/views/process-center/applyListByTableName.vue

@@ -1,15 +1,18 @@
+<style lang="less">
+@import '~@assets/less/common.less';
+</style>
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
+          <a-col :md="4" :sm="12">
             <a-form-item label="标题">
               <a-input placeholder="请输入搜索关键词" v-model="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8">
+          <a-col :md="4" :sm="12">
             <a-form-item label="状态">
               <a-select v-model="queryParam.status" placeholder="请选择" :allowClear="true">
                 <a-select-option value="0">草稿</a-select-option>
@@ -19,7 +22,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8">
+          <a-col :md="4" :sm="12">
             <a-form-item label="结果">
               <a-select v-model="queryParam.result" placeholder="请选择" :allowClear="true">
                 <a-select-option value="0">未提交</a-select-option>
@@ -29,10 +32,10 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="10">
+          <a-col :md="6" :sm="12">
             <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker
-                style="width: 210px"
+                style="width: 100%"
                 v-model="queryParam.createTimeRange"
                 format="YYYY-MM-DD"
                 :placeholder="['开始时间', '结束时间']"
@@ -42,153 +45,139 @@
             </a-form-item>
           </a-col>
 
-          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="6" :sm="12">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+          <!-- 查询 重置 -->
+          <a-col :md="6" :sm="12">
+            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px;">重置</a-button>
+            <a-dropdown
+              v-if="data.length > 0"
+              v-model="visible"
+              :trigger="['click']"
+              class="selectMenuCont"
+              placement="bottomLeft"
+            >
+              <a-menu slot="overlay">
+                <a-tree
+                  class="paperCheck"
+                  v-model="checkedColumn"
+                  checkable
+                  :tree-data="tableColumns"
+                  :default-expanded-keys="expandedKeys"
+                  draggable
+                  @dragenter="onDragEnter"
+                  @drop="onDrop"
+                  style="height:300px;overflow:auto"
+                />
+                <a-menu-divider />
+                <a-menu-item>
+                  <a-button style="margin: 0px 2px;" @click="handleMenuClickAll_comm">{{ selectText }}</a-button>
+                  <a-button style="margin: 0px 2px;" @click="handleMenuClick_comm">确定</a-button>
+                  <a-button style="margin: 0px 2px;" @click="colseMenuClick">取消</a-button>
+                </a-menu-item>
+              </a-menu>
               <a-button
-                type="primary"
-                @click="searchReset"
-                icon="reload"
                 style="margin-left: 8px;"
-              >重置</a-button>
-              <a-dropdown
-                v-if="data.length > 0"
-                v-model="visible"
-                :trigger="['click']"
-                class="selectMenuCont"
-                placement="bottomLeft"
+                @click="e => e.preventDefault()"
+                v-has="'applyListByTableName:display-column'"
               >
-                <a-menu slot="overlay">
-                  <a-tree
-                    class="paperCheck"
-                    v-model="checkedColumn"
-                    checkable
-                    :tree-data="tableColumns"
-                    :default-expanded-keys="expandedKeys"
-                    draggable
-                    @dragenter="onDragEnter"
-                    @drop="onDrop"
-                    style="height:300px;overflow:auto"
-                  />
-                  <a-menu-divider />
-                  <a-menu-item>
-                    <a-button
-                      style="margin: 0px 2px;"
-                      @click="handleMenuClickAll_comm"
-                    >{{ selectText }}</a-button>
-                    <a-button style="margin: 0px 2px;" @click="handleMenuClick_comm">确定</a-button>
-                    <a-button style="margin: 0px 2px;" @click="colseMenuClick">取消</a-button>
-                  </a-menu-item>
-                </a-menu>
-                <a-button style="margin-left: 8px;" @click="e => e.preventDefault()" v-has="'applyListByTableName:display-column'">
-                  显示列
-                  <a-icon type="down" />
-                </a-button>
-              </a-dropdown>
-            </a-col>
-          </span>
-          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="12" :sm="12">
-              <a-button
-                type="primary"
-                @click="addApply"
-                :loading="addApplyLoading"
-                style="left: 10px"
-                icon="plus-circle"
-              >发起申请</a-button>
-            </a-col>
-          </span>
+                显示列
+                <a-icon type="down" />
+              </a-button>
+            </a-dropdown>
+          </a-col>
         </a-row>
+
+        <!-- 发起申请 按钮 -->
+        <a-col :md="12" :sm="12">
+          <a-button
+            type="primary"
+            @click="addApply"
+            :loading="addApplyLoading"
+            style="margin:10px 0;"
+            icon="plus-circle"
+          >
+            发起申请
+          </a-button>
+        </a-col>
       </a-form>
     </div>
 
-    <!-- table区域-begin -->
-    <div class="card-container">
-      <div class="defineList">
-        <a-row>
-          <a-col :span="24"></a-col>
-        </a-row>
-        <div>
-          <!-- <a-table
-            bordered
-            :loading="loading"
-            ref="table"
-            :columns="selectedColumns"
-            :data-source="data"
-            :pagination="false"
-          ></a-table>-->
-          <a-table
-            bordered
-            ref="table"
-            size="small"
-            rowKey="id"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            @change="handleTableChange"
-            :columns="selectedColumns"
-          >
-            <template slot="status" slot-scope="t,r,i">
-              <span :style="{color:getStatus(t).color}">{{getStatus(t).text}}</span>
-            </template>
+    <!-- 表 -->
+    <a-row :gutter="24">
+      <a-col :md="24" :sm="24">
+        <a-table
+          bordered
+          ref="table"
+          rowKey="id"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          @change="handleTableChange"
+          :columns="selectedColumns"
+        >
+          <!-- 状态 -->
+          <template slot="status" slot-scope="t, r, i">
+            <span :style="{ color: getStatus(t).color }">{{ getStatus(t).text }}</span>
+          </template>
+
+          <!-- 结果 -->
+          <template slot="result" slot-scope="t, r, i">
+            <span :style="{ color: getResult(t).color }">{{ getResult(t).text }}</span>
+          </template>
 
-            <template slot="result" slot-scope="t,r,i">
-              <span :style="{color:getResult(t).color}">{{getResult(t).text}}</span>
+          <a-table-column title="创建时间" data-index="createTime" :width="150" align="center">
+            <template slot-scope="t, r, i">
+              <span>{{ t }}</span>
             </template>
-            <a-table-column title="创建时间" data-index="createTime" :width="150" align="center">
-              <template slot-scope="t,r,i">
-                <span>{{t}}</span>
-              </template>
-            </a-table-column>
-            <a-table-column title="提交申请时间" data-index="applyTime" :width="150" align="center">
-              <template slot-scope="t,r,i">
-                <span>{{t}}</span>
-              </template>
-            </a-table-column>
-            <!-- <a-table-column title="操作" data-index align="center" :width="200"></a-table-column> -->
-            <!-- <span  slot-scope="text, record"> -->
-            <template slot="action" slot-scope="t,r,i">
-              <template v-if="r.status == 0">
-                <a href="javascript:void(0);" style="color: #00A0E9" @click="apply(r)">提交申请</a>
-                <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑</a>
-                <a-divider type="vertical" />
-                <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
-                  <a href="javascript:void(0);" style="color: red">删除</a>
-                </a-popconfirm>
-              </template>
-              <template v-else-if="r.status == 1">
-                <a href="javascript:void(0);" @click="cancel(r)" style="color:#8000ff;">撤回</a>
-                <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="history(r)" style="color:blue;">查看进度</a>
-                <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="detail(r)" style="color:#999;">表单数据</a>
-              </template>
-              <template v-else-if="(r.status == 2 && r.result == 3) || r.status == 3">
-                <a-popconfirm title="确定提交申请吗?" @confirm="() => apply(r)">
-                  <a href="javascript:void(0);" style="color:#00A0E9;">重新申请</a>
-                </a-popconfirm>
-                <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;">编辑</a>
-                <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="history(r)" style="color:blue;">审批历史</a>
-                <a-divider type="vertical" />
-                <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
-                  <a href="javascript:void(0);" style="color: red">删除</a>
-                </a-popconfirm>
-              </template>
-              <template v-else>
-                <a href="javascript:void(0);" @click="detail(r)" style="color:#999;">表单数据</a>
-                <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="history(r)" style="color:blue;">审批历史</a>
-              </template>
+          </a-table-column>
+          <a-table-column title="提交申请时间" data-index="applyTime" :width="150" align="center">
+            <template slot-scope="t, r, i">
+              <span>{{ t }}</span>
             </template>
-            <!-- </span> -->
-          </a-table>
-        </div>
-      </div>
-    </div>
-    <!-- table区域-end -->
+          </a-table-column>
+          <!-- <a-table-column title="操作" data-index align="center" :width="200"></a-table-column> -->
+          <!-- <span  slot-scope="text, record"> -->
+          <template slot="action" slot-scope="t, r, i">
+            <template v-if="r.status == 0">
+              <a href="javascript:void(0);" style="color: #00A0E9" @click="apply(r)">提交申请</a>
+              <a-divider type="vertical" />
+              <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑</a>
+              <a-divider type="vertical" />
+              <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
+                <a href="javascript:void(0);" style="color: red">删除</a>
+              </a-popconfirm>
+            </template>
+            <template v-else-if="r.status == 1">
+              <a href="javascript:void(0);" @click="cancel(r)" style="color:orange;">撤回</a>
+              <a-divider type="vertical" />
+              <a href="javascript:void(0);" @click="history(r)" style="color:gray;">审批历史</a>
+              <a-divider type="vertical" />
+              <a href="javascript:void(0);" @click="detail(r)">详情</a>
+            </template>
+            <template v-else-if="(r.status == 2 && r.result == 3) || r.status == 3">
+              <a-popconfirm title="确定提交申请吗?" @confirm="() => apply(r)">
+                <a href="javascript:void(0);" style="color:#00A0E9;">再次申请</a>
+              </a-popconfirm>
+              <a-divider type="vertical" />
+              <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;">编辑</a>
+              <a-divider type="vertical" />
+              <a href="javascript:void(0);" @click="history(r)" style="color:gray;">审批历史</a>
+              <a-divider type="vertical" />
+              <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
+                <a href="javascript:void(0);" style="color: red">删除</a>
+              </a-popconfirm>
+            </template>
+            <template v-else>
+              <a href="javascript:void(0);" @click="detail(r)">详情</a>
+              <a-divider type="vertical" />
+              <a href="javascript:void(0);" @click="history(r)" style="color:blue;">审批历史</a>
+            </template>
+          </template>
+          <!-- </span> -->
+        </a-table>
+      </a-col>
+    </a-row>
+
     <!--流程申请选择-->
     <a-drawer
       title="选择流程"
@@ -198,35 +187,31 @@
       @close="processModalVisible = false"
       :visible="processModalVisible"
     >
-      <a-input-search
-        style="margin-bottom: 10px;width: 200px"
-        placeholder="输入流程名称"
-        @search="onSearchProcess"
-      />
-      <a-empty description="无流程可供选择" v-if="activeKeyAll.length==0" />
+      <a-input-search style="margin-bottom: 10px;width: 200px" placeholder="输入流程名称" @search="onSearchProcess" />
+      <a-empty description="无流程可供选择" v-if="activeKeyAll.length == 0" />
       <div v-else>
         <a-collapse v-model="activeKey">
           <a-collapse-panel
-            v-for="(value, index)  in activeKeyAll"
-            :header="filterDictText(dictOptions,value)||'未分类'"
+            v-for="(value, index) in activeKeyAll"
+            :header="filterDictText(dictOptions, value) || '未分类'"
             :key="value"
           >
-            <a-list :grid="{ gutter: 10,column:1}" :dataSource="processDataMap[value]">
+            <a-list :grid="{ gutter: 10, column: 1 }" :dataSource="processDataMap[value]">
               <a-list-item slot="renderItem" slot-scope="item">
                 <a-card>
                   <div slot="title">
                     <a-row>
-                      <a-col span="12" :title="item.name">{{item.name}}</a-col>
+                      <a-col span="12" :title="item.name">{{ item.name }}</a-col>
                       <a-col span="12" style="text-align: right;">
                         <a href="javascript:void (0)" @click="chooseProcess(item)">发起申请</a>
                       </a-col>
                     </a-row>
                   </div>
                   <b>版本：</b>
-                  v.{{item.version}}
+                  v.{{ item.version }}
                   <br />
                   <b>说明：</b>
-                  {{item.description}}
+                  {{ item.description }}
                 </a-card>
               </a-list-item>
             </a-list>
@@ -235,13 +220,7 @@
       </div>
     </a-drawer>
     <!--流程表单-->
-    <a-modal
-      :title="lcModa.title"
-      v-model="lcModa.visible"
-      :footer="null"
-      :maskClosable="false"
-      width="100%"
-    >
+    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%">
       <component
         :disabled="lcModa.disabled"
         v-if="lcModa.visible"
@@ -249,7 +228,7 @@
         :processData="lcModa.processData"
         :isNew="lcModa.isNew"
         @afterSubmit="afterSub"
-        @close="lcModa.visible=false,lcModa.disabled = false"
+        @close=";(lcModa.visible = false), (lcModa.disabled = false)"
       ></component>
     </a-modal>
     <!-- <onl-cgform-auto-modal ref="modal" code="b0bea65bfce141deb0ae3fcb18982d76" /> -->
@@ -257,30 +236,19 @@
     <a-modal title="提交申请" v-model="modalVisible" :mask-closable="false" :width="500" :footer="null">
       <div v-if="modalVisible">
         <a-form-item label="选择审批人" v-show="showAssign">
-          <a-select
-            style="width: 100%"
-            v-model="form.assignees"
-            placeholder="请选择"
-            mode="multiple"
-            :allowClear="true"
-          >
-            <a-select-option
-              v-for="(item, i) in assigneeList"
-              :key="i"
-              :value="item.username"
-            >{{item.realname}}</a-select-option>
+          <a-select style="width: 80%" v-model="form.assignees" placeholder="请选择" mode="multiple" :allowClear="true">
+            <a-select-option v-for="(item, i) in assigneeList" :key="i" :value="item.username">{{
+              item.realname
+            }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item label="下一审批人" v-show="isGateway">
-          <a-alert type="info" showIcon message="分支网关处不支持自定义选择下一审批人，将自动下发给所有可审批人。">，将发送给下一节点所有人</a-alert>
+          <a-alert type="info" showIcon message="分支网关处不支持自定义选择下一审批人，将自动下发给所有可审批人。"
+            >，将发送给下一节点所有人</a-alert
+          >
         </a-form-item>
         <a-form-item label="优先级" prop="priority">
-          <a-select
-            v-model="form.priority"
-            placeholder="请选择"
-            :allowClear="true"
-            style="width: 100%"
-          >
+          <a-select v-model="form.priority" placeholder="请选择" :allowClear="true" style="width: 100%">
             <a-select-option :value="0">普通</a-select-option>
             <a-select-option :value="1">重要</a-select-option>
             <a-select-option :value="2">紧急</a-select-option>
@@ -292,19 +260,13 @@
           <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>-->
         </a-form-item>
         <div slot="footer">
-          <a-button type="text" @click="modalVisible=false">取消</a-button>
+          <a-button type="text" @click="modalVisible = false">取消</a-button>
           <div style="display:inline-block;width: 20px;"></div>
           <a-button type="primary" :disabled="submitLoading" @click="applySubmit">提交</a-button>
         </div>
       </div>
     </a-modal>
-    <a-modal
-      title="审批历史"
-      v-model="modalLsVisible"
-      :mask-closable="false"
-      :width="'80%'"
-      :footer="null"
-    >
+    <a-modal title="审批历史" v-model="modalLsVisible" :mask-closable="false" :width="'80%'" :footer="null">
       <div v-if="modalLsVisible">
         <historicDetail :procInstId="procInstId"></historicDetail>
       </div>
@@ -316,7 +278,7 @@
         </a-form-item>
       </a-form>
       <div slot="footer">
-        <a-button type="text" @click="modalCancelVisible=false">取消</a-button>
+        <a-button type="text" @click="modalCancelVisible = false">取消</a-button>
         <a-button type="primary" :disabled="submitLoading" @click="handelSubmitCancel">提交</a-button>
       </div>
     </a-modal>
@@ -459,115 +421,7 @@ export default {
   },
 
   activated: function() {},
-  mounted() {
-    // this.columns = [
-    //   {
-    //     ellipsis: true,
-    //     title: '喜羊羊',
-    //     dataIndex: 'uuid',
-    //     key: 'uuid'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '懒羊羊',
-    //     dataIndex: 'name',
-    //     key: 'name'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '美羊羊',
-    //     dataIndex: 'code',
-    //     key: 'code'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '沸羊羊',
-    //     dataIndex: 'sortNum',
-    //     key: 'sortNum'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '慢羊羊',
-    //     dataIndex: 'squarePerPage',
-    //     key: 'squarePerPage'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '暖羊羊',
-    //     dataIndex: 'pathName',
-    //     key: 'pathName'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '灰太狼',
-    //     dataIndex: 'psPath',
-    //     key: 'psPath'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '红太狼',
-    //     dataIndex: 'Path',
-    //     key: 'Path'
-    //   }
-    // ]
-    // this.selectedColumns = this.columns
-    // this.tableColumns = [
-    //   {
-    //     ellipsis: true,
-    //     title: '标题',
-    //     dataIndex: 'title',
-    //     key: 'title'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '所属流程',
-    //     dataIndex: 'processName',
-    //     key: 'processName'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '当前审批环节',
-    //     dataIndex: 'currTaskName',
-    //     key: 'currTaskName'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '状态',
-    //     dataIndex: 'status',
-    //     key: 'status',
-    //     scopedSlots: { customRender: 'status' }
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '结果',
-    //     dataIndex: 'result',
-    //     key: 'result',
-    //     scopedSlots: { customRender: 'result' }
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '创建时间',
-    //     dataIndex: 'createTime',
-    //     key: 'createTime'
-    //   },
-    //   {
-    //     ellipsis: true,
-    //     title: '提交申请时间',
-    //     dataIndex: 'applyTime',
-    //     key: 'applyTime'
-    //   },
-    //   {
-    //     title: '操作',
-    //     key: 'action',
-    //     scopedSlots: { customRender: 'action' }
-    //   }
-    // ]
-    // this.selectedColumns = this.tableColumns
-    // //默认选中的列
-    // this.tableColumns.forEach(element => {
-    //   this.checkedColumn.push(element.key)
-    // })
-  },
+  mounted() {},
   computed: {},
   methods: {
     handleMenuClickAll_comm() {
@@ -685,7 +539,7 @@ export default {
       // }
     },
     colseMenuClick() {
-      this.checkedColumn=[]
+      this.checkedColumn = []
       this.tableColumns.forEach(t => {
         if (t.isShow == '2') {
           //默认显示列选择选中的列
@@ -1140,4 +994,4 @@ export default {
 </script>
 <style scoped>
 @import '~@assets/less/common.less';
-</style>
+</style>