bug

src/views/doc/recycleBin/index.vue

@@ -2,7 +2,13 @@
   <div class="ele-body">
     <el-card shadow="never">
       <search ref="search" @search="search"></search>
-      <ele-pro-table ref="table" :columns="columns" :datasource="datasource">
+      <ele-pro-table
+        ref="table"
+        :columns="columns"
+        :datasource="datasource"
+        height="calc(100vh - 380px)"
+        full-height="calc(100vh - 116px)"
+      >
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-popconfirm
@@ -49,149 +55,154 @@
   </div>
 </template>
 <script>
-import search from './components/search.vue';
-import { mapGetters } from 'vuex';
-import dictMixins from '@/mixins/dictMixins';
-import { recycleBinPage, getDocTreeListAPI, revoke,recycleDeleteAPI } from '@/api/doc-manage';
-export default {
-  mixins: [dictMixins],
-  components: {
-    search
-  },
-  data() {
-    return {
-      folderList: [],
-      columns: [
-        {
-          width: 45,
-          type: 'index',
-          columnKey: 'index',
-          align: 'center'
-        },
+  import search from './components/search.vue';
+  import { mapGetters } from 'vuex';
+  import dictMixins from '@/mixins/dictMixins';
+  import {
+    recycleBinPage,
+    getDocTreeListAPI,
+    revoke,
+    recycleDeleteAPI
+  } from '@/api/doc-manage';
+  export default {
+    mixins: [dictMixins],
+    components: {
+      search
+    },
+    data() {
+      return {
+        folderList: [],
+        columns: [
+          {
+            width: 45,
+            type: 'index',
+            columnKey: 'index',
+            align: 'center'
+          },
 
-        {
-          label: '名称',
-          align: 'center',
-          prop: 'fileName',
-          width: 220,
-          showOverflowTooltip: true
-        },
-        {
-          align: 'center',
-          label: '原位置',
-          prop: 'directoryId',
-          slot: 'directoryId'
-        },
+          {
+            label: '名称',
+            align: 'center',
+            prop: 'fileName',
+            width: 220,
+            showOverflowTooltip: true
+          },
+          {
+            align: 'center',
+            label: '原位置',
+            prop: 'directoryId',
+            slot: 'directoryId'
+          },
 
-        {
-          align: 'center',
-          label: '删除时间',
-          prop: 'delTime',
-          width: 180
-        },
-        {
-          prop: 'delUserName',
-          align: 'center',
-          label: '删除人',
-          width: 100,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'createTime',
-          align: 'center',
-          label: '创建时间',
-          width: 180
-        },
-        {
-          align: 'center',
-          label: '创建人',
-          prop: 'fileCreateUserName',
-          width: 100,
-          showOverflowTooltip: true
-        },
+          {
+            align: 'center',
+            label: '删除时间',
+            prop: 'delTime',
+            width: 180
+          },
+          {
+            prop: 'delUserName',
+            align: 'center',
+            label: '删除人',
+            width: 100,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'createTime',
+            align: 'center',
+            label: '创建时间',
+            width: 180
+          },
+          {
+            align: 'center',
+            label: '创建人',
+            prop: 'fileCreateUserName',
+            width: 100,
+            showOverflowTooltip: true
+          },
 
-        {
-          prop: 'fileType',
-          label: '类型',
-          align: 'center',
-          width: 80,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue == 1 ? '文档' : '文件夹';
-          }
-        },
-        {
-          columnKey: 'action',
-          label: '操作',
-          width: 200,
+          {
+            prop: 'fileType',
+            label: '类型',
+            align: 'center',
+            width: 80,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 1 ? '文档' : '文件夹';
+            }
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 200,
 
-          align: 'center',
-          resizable: false,
-          slot: 'action'
-        }
-      ]
-    };
-  },
-  created() {
-    this.getDocTreeListAPI();
-  },
-  computed: {
-    ...mapGetters(['user'])
-  },
-  methods: {
-    async getDocTreeListAPI() {
-      let query = {
-        type: 0,
-        currentUserId: this.user.info.userId
+            align: 'center',
+            resizable: false,
+            slot: 'action'
+          }
+        ]
       };
-      this.folderList = await getDocTreeListAPI(query);
-      console.log(this.folderList);
     },
-    datasource({ page, where, limit }) {
-      return recycleBinPage({
-        ...where,
-        pageNum: page,
-        size: limit
-      });
+    created() {
+      this.getDocTreeListAPI();
     },
-    search(where) {
-      this.$refs.table.reload({
-        where: where,
-        page: 1
-      });
+    computed: {
+      ...mapGetters(['user'])
     },
+    methods: {
+      async getDocTreeListAPI() {
+        let query = {
+          type: 0,
+          currentUserId: this.user.info.userId
+        };
+        this.folderList = await getDocTreeListAPI(query);
+        console.log(this.folderList);
+      },
+      datasource({ page, where, limit }) {
+        return recycleBinPage({
+          ...where,
+          pageNum: page,
+          size: limit
+        });
+      },
+      search(where) {
+        this.$refs.table.reload({
+          where: where,
+          page: 1
+        });
+      },
 
-    remove(row) {
-      recycleDeleteAPI(row.id)
-        .then((message) => {
-          this.$message.success(message);
-          this.done();
-        })
-        .catch((e) => {});
-    },
-    revoke(row) {
-      revoke({
-        fileId: row.fileId,
-        id: row.id
-      })
-        .then((message) => {
-          this.$message.success(message);
-          this.done();
+      remove(row) {
+        recycleDeleteAPI(row.id)
+          .then((message) => {
+            this.$message.success(message);
+            this.done();
+          })
+          .catch((e) => {});
+      },
+      revoke(row) {
+        revoke({
+          fileId: row.fileId,
+          id: row.id
         })
-        .catch((e) => {});
-    },
+          .then((message) => {
+            this.$message.success(message);
+            this.done();
+          })
+          .catch((e) => {});
+      },
 
-    done() {
-      this.$refs.search.search();
+      done() {
+        this.$refs.search.search();
+      }
     }
-  }
-};
+  };
 </script>
 <style scoped lang="scss">
-:deep(.el-input.is-disabled .el-input__inner) {
-  border: none;
-  background: none;
-}
-:deep(.el-input__suffix) {
-  display: none;
-}
-</style>
+  :deep(.el-input.is-disabled .el-input__inner) {
+    border: none;
+    background: none;
+  }
+  :deep(.el-input__suffix) {
+    display: none;
+  }
+</style>

src/views/doc/sendReceive/receive/myReceive.vue

@@ -6,6 +6,8 @@
       :selection.sync="selection"
       :columns="columns"
       :datasource="datasource"
+      height="calc(100vh - 420px)"
+      full-height="calc(100vh - 116px)"
     >
       <!-- 表头工具栏 -->
       <!-- <template v-slot:toolbar>

src/views/doc/sendReceive/receive/receive.vue

@@ -6,6 +6,8 @@
       :selection.sync="selection"
       :columns="columns"
       :datasource="datasource"
+      height="calc(100vh - 420px)"
+      full-height="calc(100vh - 116px)"
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>

src/views/doc/sendReceive/send/mySend.vue

@@ -6,12 +6,14 @@
       :selection.sync="selection"
       :columns="columns"
       :datasource="datasource"
+      height="calc(100vh - 420px)"
+      full-height="calc(100vh - 116px)"
     >
-    <template v-slot:name="{ row }">
+      <template v-slot:name="{ row }">
         <el-link
           type="primary"
           :underline="false"
-          @click="openEdit('view',row)"
+          @click="openEdit('view', row)"
         >
           {{ row.name }}
         </el-link>
@@ -32,148 +34,147 @@
       </template>
     </ele-pro-table>
     <edit ref="editRef" @done="done"></edit>
-
   </div>
 </template>
 <script>
-import search from './components/search.vue';
-import edit from '@/views/doc/issue_doc/components/edit.vue';
+  import search from './components/search.vue';
+  import edit from '@/views/doc/issue_doc/components/edit.vue';
 
-import { mapGetters } from 'vuex';
-import dictMixins from '@/mixins/dictMixins';
-import { releasePage, signFor,allSignFor } from '@/api/doc-manage';
-export default {
-  mixins: [dictMixins],
-  components: {
-    search,edit
-  },
-  data() {
-    return {
-      selection: [],
-      columns: [
-        {
-          width: 45,
-          type: 'selection',
-          columnKey: 'selection',
-          align: 'center',
-          selectable: (row, index) => {
-            let data = row.userAuthority.find(
-              (item) => item.id == this.user.info.userId
-            );
-            return data.signFor != 1;
-          }
-        },
-        {
-          width: 45,
-          type: 'index',
-          columnKey: 'index',
-          align: 'center'
-        },
+  import { mapGetters } from 'vuex';
+  import dictMixins from '@/mixins/dictMixins';
+  import { releasePage, signFor, allSignFor } from '@/api/doc-manage';
+  export default {
+    mixins: [dictMixins],
+    components: {
+      search,
+      edit
+    },
+    data() {
+      return {
+        selection: [],
+        columns: [
+          {
+            width: 45,
+            type: 'selection',
+            columnKey: 'selection',
+            align: 'center',
+            selectable: (row, index) => {
+              let data = row.userAuthority.find(
+                (item) => item.id == this.user.info.userId
+              );
+              return data.signFor != 1;
+            }
+          },
+          {
+            width: 45,
+            type: 'index',
+            columnKey: 'index',
+            align: 'center'
+          },
 
-        {
-          label: '主题',
-          align: 'center',
-          slot: 'name',
-          prop: 'name',
-          showOverflowTooltip: true
-        },
-        {
-          align: 'center',
-          label: '我已签收',
-          prop: 'userAuthority',
-          formatter: (_row, _column, cellValue) => {
-            let data = cellValue.find(
-              (item) => item.id == this.user.info.userId
-            );
-            return data.signFor == 1 ? '是' : '否';
-          }
-        },
+          {
+            label: '主题',
+            align: 'center',
+            slot: 'name',
+            prop: 'name',
+            showOverflowTooltip: true
+          },
+          {
+            align: 'center',
+            label: '我已签收',
+            prop: 'userAuthority',
+            formatter: (_row, _column, cellValue) => {
+              let data = cellValue.find(
+                (item) => item.id == this.user.info.userId
+              );
+              return data.signFor == 1 ? '是' : '否';
+            }
+          },
 
-        {
-          align: 'center',
-          label: '是否回收权限',
-          prop: 'isAuthority',
-          width: 120,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue == 1 ? '是' : '否';
-          }
-        },
-        {
-          align: 'center',
-          label: '回收权限时间',
-          prop: 'isAuthorityTime',
-          width: 180,
-          showOverflowTooltip: true
-        },
-        {
-          align: 'center',
-          label: '失效时间',
-          prop: 'failureTime',
-          width: 180,
-          showOverflowTooltip: true
-        },
+          {
+            align: 'center',
+            label: '是否回收权限',
+            prop: 'isAuthority',
+            width: 120,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 1 ? '是' : '否';
+            }
+          },
+          {
+            align: 'center',
+            label: '回收权限时间',
+            prop: 'isAuthorityTime',
+            width: 180,
+            showOverflowTooltip: true
+          },
+          {
+            align: 'center',
+            label: '失效时间',
+            prop: 'failureTime',
+            width: 180,
+            showOverflowTooltip: true
+          },
 
-        {
-          align: 'center',
-          label: '发布人',
-          prop: 'releaseUserName',
-          width: 180
-        },
+          {
+            align: 'center',
+            label: '发布人',
+            prop: 'releaseUserName',
+            width: 180
+          },
 
-        {
-          prop: 'releaseTime',
-          align: 'center',
-          label: '发布时间',
-          width: 180
-        }
-      ]
-    };
-  },
-  created() {},
-  computed: {
-    ...mapGetters(['user'])
-  },
-  methods: {
-    datasource({ page, where, limit }) {
-      return releasePage({
-        ...where,
-        pageNum: page,
-        size: limit
-      });
-    },
-    openEdit(type, row) {
-      console.log(row,'row')
-      this.$refs.editRef.open(type, row);
-    },
-    search(where) {
-      this.$refs.table.reload({
-        where: where,
-        page: 1
-      });
-    },
-    signFor() {
-      let ids = this.selection.map((item) => item.id);
-      signFor(ids)
-        .then((message) => {
-          this.$message.success(message);
-          this.done();
-        })
-        .catch((e) => {});
+          {
+            prop: 'releaseTime',
+            align: 'center',
+            label: '发布时间',
+            width: 180
+          }
+        ]
+      };
     },
-    allSignFor() {
-      allSignFor()
-        .then((message) => {
-          this.$message.success(message);
-          this.done();
-        })
-        .catch((e) => {});
+    created() {},
+    computed: {
+      ...mapGetters(['user'])
     },
+    methods: {
+      datasource({ page, where, limit }) {
+        return releasePage({
+          ...where,
+          pageNum: page,
+          size: limit
+        });
+      },
+      openEdit(type, row) {
+        console.log(row, 'row');
+        this.$refs.editRef.open(type, row);
+      },
+      search(where) {
+        this.$refs.table.reload({
+          where: where,
+          page: 1
+        });
+      },
+      signFor() {
+        let ids = this.selection.map((item) => item.id);
+        signFor(ids)
+          .then((message) => {
+            this.$message.success(message);
+            this.done();
+          })
+          .catch((e) => {});
+      },
+      allSignFor() {
+        allSignFor()
+          .then((message) => {
+            this.$message.success(message);
+            this.done();
+          })
+          .catch((e) => {});
+      },
 
-    done() {
-      this.$refs.search.search();
+      done() {
+        this.$refs.search.search();
+      }
     }
-  }
-};
+  };
 </script>
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

src/views/doc/sendReceive/send/send.vue

@@ -6,6 +6,8 @@
       :selection.sync="selection"
       :columns="columns"
       :datasource="datasource"
+      height="calc(100vh - 420px)"
+      full-height="calc(100vh - 116px)"
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar v-if="!isPop">
@@ -34,7 +36,7 @@
         <el-link
           type="primary"
           :underline="false"
-          @click="openEdit('view',row)"
+          @click="openEdit('view', row)"
         >
           {{ row.name }}
         </el-link>
@@ -84,197 +86,196 @@
   </div>
 </template>
 <script>
-import search from './components/search.vue';
-import edit from '@/views/doc/issue_doc/components/edit.vue';
-import receiveEdit from '@/views/doc/sendReceive/receive/components/edit.vue';
-import { mapGetters } from 'vuex';
-import dictMixins from '@/mixins/dictMixins';
-import { sendPage, sendDeleteAPI } from '@/api/doc-manage';
-import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
+  import search from './components/search.vue';
+  import edit from '@/views/doc/issue_doc/components/edit.vue';
+  import receiveEdit from '@/views/doc/sendReceive/receive/components/edit.vue';
+  import { mapGetters } from 'vuex';
+  import dictMixins from '@/mixins/dictMixins';
+  import { sendPage, sendDeleteAPI } from '@/api/doc-manage';
+  import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
 
-export default {
-  mixins: [dictMixins],
-  components: {
-    search,
-    edit,
-    receiveEdit,
-    processSubmitDialog
-  },
-  props: {
-    isPop: {
-      default: false
+  export default {
+    mixins: [dictMixins],
+    components: {
+      search,
+      edit,
+      receiveEdit,
+      processSubmitDialog
     },
-    disabledList: {
-      //已选择列表
-      default: () => []
-    }
-  },
-  data() {
-    return {
-      selection: [],
-      processSubmitDialogFlag: false,
-      columns: [
-        {
-          width: 45,
-          type: 'selection',
-          columnKey: 'selection',
-          align: 'center',
-          selectable: (row, index) => {
-            return (
-              !this.disabledList.map((item) => item.id).includes(row.id) &&
-              row.reviewStatus == 2
-            );
-          }
-        },
-        {
-          width: 45,
-          type: 'index',
-          columnKey: 'index',
-          align: 'center'
-        },
+    props: {
+      isPop: {
+        default: false
+      },
+      disabledList: {
+        //已选择列表
+        default: () => []
+      }
+    },
+    data() {
+      return {
+        selection: [],
+        processSubmitDialogFlag: false,
+        columns: [
+          {
+            width: 45,
+            type: 'selection',
+            columnKey: 'selection',
+            align: 'center',
+            selectable: (row, index) => {
+              return (
+                !this.disabledList.map((item) => item.id).includes(row.id) &&
+                row.reviewStatus == 2
+              );
+            }
+          },
+          {
+            width: 45,
+            type: 'index',
+            columnKey: 'index',
+            align: 'center'
+          },
 
-        {
-          label: '主题',
-          align: 'center',
-          prop: 'name',
-          width: 220,
-          slot: 'name',
-          showOverflowTooltip: true
-        },
+          {
+            label: '主题',
+            align: 'center',
+            prop: 'name',
+            width: 220,
+            slot: 'name',
+            showOverflowTooltip: true
+          },
 
-        {
-          align: 'center',
-          label: '是否回收权限',
-          prop: 'isAuthority',
-          width: 120,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue == 1 ? '是' : '否';
-          }
-        },
-        {
-          align: 'center',
-          label: '回收权限时间',
-          prop: 'isAuthorityTime',
-          width: 180,
-          showOverflowTooltip: true
-        },
-        {
-          align: 'center',
-          label: '失效时间',
-          prop: 'failureTime',
-          width: 180,
-          showOverflowTooltip: true
-        },
+          {
+            align: 'center',
+            label: '是否回收权限',
+            prop: 'isAuthority',
+            width: 120,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 1 ? '是' : '否';
+            }
+          },
+          {
+            align: 'center',
+            label: '回收权限时间',
+            prop: 'isAuthorityTime',
+            width: 180,
+            showOverflowTooltip: true
+          },
+          {
+            align: 'center',
+            label: '失效时间',
+            prop: 'failureTime',
+            width: 180,
+            showOverflowTooltip: true
+          },
 
-        {
-          prop: 'userAuthority',
-          label: '通知用户',
-          align: 'center',
-          minWidth:300,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue.map((item) => item.name).toString();
-          }
-        },
-        {
-          align: 'center',
-          label: '发布人',
-          prop: 'releaseUserName',
-          width: 180
-        },
+          {
+            prop: 'userAuthority',
+            label: '通知用户',
+            align: 'center',
+            minWidth: 300,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue.map((item) => item.name).toString();
+            }
+          },
+          {
+            align: 'center',
+            label: '发布人',
+            prop: 'releaseUserName',
+            width: 180
+          },
 
-        {
-          prop: 'releaseTime',
-          align: 'center',
-          label: '发布时间',
-          width: 180
-        },
-        {
-          align: 'center',
-          label: '审核状态',
-          prop: 'reviewStatus',
-          width: 100,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue == 0
-              ? '未提交'
-              : cellValue == 1
-              ? '审核中'
-              : cellValue == 2
-              ? '已审核'
-              : '审核不通过';
+          {
+            prop: 'releaseTime',
+            align: 'center',
+            label: '发布时间',
+            width: 180
+          },
+          {
+            align: 'center',
+            label: '审核状态',
+            prop: 'reviewStatus',
+            width: 100,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 0
+                ? '未提交'
+                : cellValue == 1
+                ? '审核中'
+                : cellValue == 2
+                ? '已审核'
+                : '审核不通过';
+            }
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 200,
+            align: 'center',
+            resizable: false,
+            slot: 'action'
           }
-        },
-        {
-          columnKey: 'action',
-          label: '操作',
-          width: 200,
-          align: 'center',
-          resizable: false,
-          slot: 'action'
-        }
-      ]
-    };
-  },
-  created() {},
-  computed: {
-    ...mapGetters(['user'])
-  },
-  methods: {
-    openEdit(type, row) {
-      console.log(row,'row')
-      this.$refs.editRef.open(type, row);
-    },
-
-    datasource({ page, where, limit }) {
-      return sendPage({
-        ...where,
-        pageNum: page,
-        size: limit
-      });
+        ]
+      };
     },
-    search(where) {
-      this.$refs.table.reload({
-        where: where,
-        page: 1
-      });
+    created() {},
+    computed: {
+      ...mapGetters(['user'])
     },
-    processSubmit(row) {
-      this.processSubmitDialogFlag = true;
-      this.$nextTick(() => {
-        row['businessKey']='fm_file_release_approve'
+    methods: {
+      openEdit(type, row) {
+        console.log(row, 'row');
+        this.$refs.editRef.open(type, row);
+      },
 
-        this.$refs.processSubmitDialogRef.init(row, {
-          pcHandle: '/bpm/handleTask/components/doc/submit.vue',
-          pcView: '/bpm/handleTask/components/doc/send/sendDialog.vue'
+      datasource({ page, where, limit }) {
+        return sendPage({
+          ...where,
+          pageNum: page,
+          size: limit
         });
-      });
-    },
-    remove(row) {
-      sendDeleteAPI([row.id])
-        .then((message) => {
-          this.$message.success(message);
-          this.done();
-        })
-        .catch((e) => {});
-    },
+      },
+      search(where) {
+        this.$refs.table.reload({
+          where: where,
+          page: 1
+        });
+      },
+      processSubmit(row) {
+        this.processSubmitDialogFlag = true;
+        this.$nextTick(() => {
+          row['businessKey'] = 'fm_file_release_approve';
 
-    done() {
-      this.$refs.search.search();
-    },
-    receive() {
-      if (this.selection.length == 0) {
-        this.$message.warning('请选择一条数据');
-        return;
+          this.$refs.processSubmitDialogRef.init(row, {
+            pcHandle: '/bpm/handleTask/components/doc/submit.vue',
+            pcView: '/bpm/handleTask/components/doc/send/sendDialog.vue'
+          });
+        });
+      },
+      remove(row) {
+        sendDeleteAPI([row.id])
+          .then((message) => {
+            this.$message.success(message);
+            this.done();
+          })
+          .catch((e) => {});
+      },
+
+      done() {
+        this.$refs.search.search();
+      },
+      receive() {
+        if (this.selection.length == 0) {
+          this.$message.warning('请选择一条数据');
+          return;
+        }
+        this.$refs.receiveEditRef.open(
+          'add',
+          JSON.parse(JSON.stringify(this.selection))
+        );
+      },
+      getTableList() {
+        return JSON.parse(JSON.stringify(this.selection));
       }
-      this.$refs.receiveEditRef.open(
-        'add',
-        JSON.parse(JSON.stringify(this.selection))
-      );
-    },
-    getTableList() {
-      return JSON.parse(JSON.stringify(this.selection));
     }
-  }
-};
+  };
 </script>
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>