bug

src/enum/dict.js

@@ -49,4 +49,4 @@ export const secretLevelList = [
     value: 4,
     label: '绝密'
   }
-];
+];

src/views/doc/components/action.vue

@@ -30,7 +30,6 @@ export default {
           width: 55,
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left'
         },
 
         {
@@ -39,7 +38,6 @@ export default {
           align: 'center',
           slot: 'name',
           showOverflowTooltip: true,
-          fixed: 'left',
 
           minWidth: 200
         },
@@ -48,7 +46,6 @@ export default {
           label: '文件名称',
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
             return cellValue[0]?.name;

src/views/doc/components/bpm.vue

@@ -8,22 +8,32 @@
       tool-class="ele-toolbar-form"
       :needPage="false"
     >
+      <template v-slot:operation="{ row }">
+        <el-link type="primary" :underline="false" @click="openEdit(row)">
+          {{ row.operation }}
+        </el-link>
+      </template>
     </ele-pro-table>
+    <bpmOpen ref="bpmOpenRef"></bpmOpen>
   </div>
 </template>
 
 <script>
 import { queryProcess } from '@/api/doc-manage';
+import bpmOpen from './bpmOpen';
 
 export default {
   props: {
     // 上级id
     parentId: [Number, String]
   },
+  components: {
+    bpmOpen
+  },
   data() {
     return {
       // 表格列配置
-      tableList:[],
+      tableList: [],
       columns: [
         {
           columnKey: 'index',
@@ -31,8 +41,7 @@ export default {
           type: 'index',
           width: 55,
           align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
+          showOverflowTooltip: true
         },
         {
           prop: 'operation',
@@ -40,7 +49,6 @@ export default {
           align: 'center',
           slot: 'operation',
           showOverflowTooltip: true,
-          fixed: 'left',
           width: 200
         },
         {
@@ -48,7 +56,6 @@ export default {
           label: '发起人',
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left',
           width: 100
         },
         {
@@ -57,17 +64,15 @@ export default {
           align: 'center',
           slot: 'versionNum',
           showOverflowTooltip: true,
-          fixed: 'left',
           width: 100
         },
-        
+
         {
           prop: 'fileName',
           label: '文档名称',
           align: 'center',
           slot: 'fileName',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200
         },
         {
@@ -75,11 +80,10 @@ export default {
           label: '文件名称',
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
             // return '';
-            return cellValue[0]?.name
+            return cellValue[0]?.name;
           }
         },
         {
@@ -128,22 +132,25 @@ export default {
       ]
     };
   },
- watch:{
-  parentId(val){
-     if(val){
-         this.getList(val)
-     }
-  }
- },
+  watch: {
+    parentId(val) {
+      if (val) {
+        this.getList(val);
+      }
+    }
+  },
   methods: {
     async getList() {
       this.tableList = await queryProcess(this.parentId);
+    },
+    openEdit(row) {
+      this.$refs.bpmOpenRef.open(row.processInstanceId);
     }
   },
   init() {
-      this.$nextTick(() => {
-        this.$refs.table.reRenderTable()
-      });
-    }
+    this.$nextTick(() => {
+      this.$refs.table.reRenderTable();
+    });
+  }
 };
 </script>

src/views/doc/components/bpmOpen.vue

@@ -0,0 +1,56 @@
+<template>
+   <ele-modal
+      :visible.sync="showEditFlag"
+      :close-on-click-modal="false"
+      custom-class="ele-dialog-form"
+      append-to-body
+      :fullscreen="true"
+    >
+    <bpmDetail
+    
+      :id="businessId"
+    ></bpmDetail>
+</ele-modal>
+</template>
+
+<script>
+import bpmDetail from '@/views/bpm/processInstance/detail.vue';
+
+export default {
+  data() {
+    return {
+      businessId:'',
+      showEditFlag: false
+    };
+  },
+ components:{
+  bpmDetail
+ },
+  methods: {
+    open(businessId) {
+      this.showEditFlag=true
+      this.businessId=businessId
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.browse {
+  position: relative;
+  .fullscreen {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    cursor: pointer;
+    background: #fff;
+    i {
+      font-size: 16px;
+    }
+  }
+}
+</style>

src/views/doc/components/change.vue

@@ -31,7 +31,6 @@ export default {
           width: 55,
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left'
         },
      
         {
@@ -40,7 +39,6 @@ export default {
           align: 'center',
           slot: 'name',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200
         },
         {
@@ -49,7 +47,6 @@ export default {
           align: 'center',
           slot: 'name',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200
         },
         {

src/views/doc/components/file-edit.vue

@@ -39,14 +39,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col> -->
-        <el-col :span="24">
-          <el-form-item label="文档名称" prop="name">
-            <el-input
-              v-model="form.name"
-              placeholder="请输入文档名称"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="24">
           <el-form-item label="文档" prop="storagePath">
             <div style="display: flex; align-items: center">
@@ -70,6 +63,14 @@
             </div>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="文档名称" prop="name">
+            <el-input
+              v-model="form.name"
+              placeholder="请输入文档名称"
+            ></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <el-form-item label="文档位置" prop="directoryId">
             <el-cascader

src/views/doc/components/file-table-list.vue

@@ -300,9 +300,9 @@
       <el-tab-pane label="变更记录" name="变更记录" v-if="fileType === 0"
         ><Change :parentId="current.id"
       /></el-tab-pane>
-      <el-tab-pane label="打印记录" name="打印记录"
+      <!-- <el-tab-pane label="打印记录" name="打印记录"
         ><print></print
-      ></el-tab-pane>
+      ></el-tab-pane> -->
       <el-tab-pane label="工作流" name="bpmRef"
         ><bpm :parentId="current.id" ref="bpmRef"></bpm
       ></el-tab-pane>

src/views/doc/components/folder-edit.vue

@@ -159,7 +159,7 @@ export default {
           this.loading = false;
           // this.$message.success('新建成功');
           this.cancel();
-          this.$emit('done');
+          this.$emit('done', data);
         })
         .catch((e) => {
           this.loading = false;

src/views/doc/components/issue.vue

@@ -32,7 +32,6 @@ export default {
           width: 55,
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left'
         },
         {
           prop: 'versionNum',
@@ -40,7 +39,6 @@ export default {
           align: 'center',
           slot: 'versionNum',
           showOverflowTooltip: true,
-          fixed: 'left',
           width: 100
         },
 
@@ -50,7 +48,6 @@ export default {
           align: 'center',
           slot: 'fileName',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200
         },
         {
@@ -58,7 +55,6 @@ export default {
           label: '文件名称',
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
             // return '';

src/views/doc/components/main.vue

@@ -50,7 +50,7 @@
               :draggable="true"
               node-key="id"
               :props="{ label: 'name', children: 'sonDirectoryList' }"
-              :expand-on-click-node="true"
+              :expand-on-click-node="false"
               :default-expand-all="true"
               @node-click="onNodeClick"
               @node-drop="nodeDrop"
@@ -223,7 +223,7 @@ export default {
 
   methods: {
     /* 查询 */
-    async query() {
+    async query(row) {
       this.loading = true;
       let query = {
         type: this.fileType,
@@ -234,12 +234,15 @@ export default {
         await validationPersonal();
         await this.query();
       }
-      this.current = null;
+   
       this.$nextTick(() => {
         if (this.$route.params.row) {
           this.$refs.tree.setCurrentKey(this.$route.params.row.id);
           this.onNodeClick(this.$route.params.row);
-        } else {
+        }else if (row&&row.id) {
+          this.$refs.tree.setCurrentKey(row.id);
+          this.onNodeClick(row);
+        }else {
           this.$refs.tree.setCurrentKey(this.data[0].id);
 
           this.onNodeClick(this.data[0]);
@@ -249,6 +252,7 @@ export default {
     },
     /* 选择数据 */
     onNodeClick(row) {
+      console.log(row,'row')
       if (row) {
         this.current = row;
         this.$nextTick(() => {

src/views/doc/components/print.vue

@@ -31,7 +31,6 @@ export default {
           width: 55,
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left'
         },
         {
           prop: 'name1',
@@ -39,7 +38,6 @@ export default {
           align: 'center',
           slot: 'name',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200
         },
         {
@@ -48,7 +46,6 @@ export default {
           align: 'center',
           slot: 'name',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200
         },
         {

src/views/doc/components/receive.vue

@@ -32,7 +32,6 @@ export default {
           width: 55,
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left'
         },
         {
           prop: 'versionNum',
@@ -40,7 +39,6 @@ export default {
           align: 'center',
           slot: 'versionNum',
           showOverflowTooltip: true,
-          fixed: 'left',
           width: 100
         },
 
@@ -50,7 +48,6 @@ export default {
           align: 'center',
           slot: 'fileName',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200
         },
         {
@@ -58,7 +55,6 @@ export default {
           label: '文件名称',
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
             // return '';

src/views/doc/components/version.vue

@@ -32,7 +32,6 @@ export default {
           width: 55,
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left'
         },
         {
           prop: 'versionNum',
@@ -40,7 +39,6 @@ export default {
           align: 'center',
           slot: 'versionNum',
           showOverflowTooltip: true,
-          fixed: 'left',
           width: 100
         },
 
@@ -50,7 +48,6 @@ export default {
           align: 'center',
           slot: 'fileName',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200
         },
         {
@@ -58,7 +55,6 @@ export default {
           label: '文件名称',
           align: 'center',
           showOverflowTooltip: true,
-          fixed: 'left',
           minWidth: 200,
           formatter: (_row, _column, cellValue) => {
             // return '';

src/views/doc/issue_doc/components/edit.vue

@@ -467,7 +467,7 @@ export default {
     open(type, row, list,fileType) {
       this.title =
         type == 'add'
-          ? '新增'
+          ? '发布'
           : type == 'edit'
           ? '编辑'
           : type == 'power'