yusheng 10 mesi fa
parent
commit
9e68f73d5e
2 ha cambiato i file con 13 aggiunte e 6 eliminazioni
  1. 5 2
      src/views/bpm/done/index.vue
  2. 8 4
      src/views/bpm/todo/index.vue

+ 5 - 2
src/views/bpm/done/index.vue

@@ -73,7 +73,8 @@
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        cache-key="systemRoleTable5"
+        @columns-change="handleColumnChange"
+        :cache-key="cacheKeyUrl"
       >
         <template v-slot:result="{ row }">
           <el-tag
@@ -114,6 +115,7 @@
   import { getDoneTaskPage } from '@/api/bpm/task';
   import { getDate } from '@/utils/dateUtils';
   import detail from './detailDialog.vue';
+  import tabMixins from '@/mixins/tableColumnsMixin';
 
   // 默认表单数据
   const defaultParams = {
@@ -123,9 +125,10 @@
   export default {
     name: 'BpmDoneTask',
     components: { detail },
-    mixins: [dictMixins],
+    mixins: [dictMixins,tabMixins],
     data() {
       return {
+        cacheKeyUrl:'wt-done',
         // 遮罩层
         loading: true,
         params: { ...defaultParams },

+ 8 - 4
src/views/bpm/todo/index.vue

@@ -75,7 +75,8 @@
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        cache-key="systemRoleTable5"
+        @columns-change="handleColumnChange"
+        :cache-key="cacheKeyUrl"
       >
         <template v-slot:status="{ row }">
           <el-tag type="success" v-if="row.suspensionState === 1">激活</el-tag>
@@ -148,7 +149,8 @@
   import handleFormParserTask from '@/views/bpm/handleTask/formParser/formParserDialog.vue'; //处理
   import detail from '@/views/bpm/done/detailDialog.vue';
   import inOut from '../outgoingManagement/add.vue';
-  // import {getDate} from "@/utils/dateUtils";
+  import tabMixins from '@/mixins/tableColumnsMixin';
+
   // 默认表单数据
   const defaultParams = {
     status: '',
@@ -164,8 +166,11 @@
         return this.$store.state.theme.styleResponsive;
       }
     },
+    mixins: [tabMixins],
+
     data() {
       return {
+        cacheKeyUrl: 'wt-todo',
         dialogVisible: false,
         formParserDialogFlag: false,
         // 遮罩层
@@ -289,7 +294,7 @@
         // return
 
         if (type == 'audit') {
-          if (row.formJson&&Object.keys(row.formJson).length) {
+          if (row.formJson && Object.keys(row.formJson).length) {
             console.log('处理1');
             this.formParserDialogFlag = true;
             this.$nextTick(() => {
@@ -315,7 +320,6 @@
             });
           }
         } else {
-
           this.$refs.detailRef.open(row);
         }
       }