Merge branch 'nb' of yinet2020/YinetOASystemWeb into master

src/views/system/files/column.vue

@@ -55,6 +55,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-row v-if="scope.row.parentId != 0">
           <el-button
             size="mini"
             type="text"
@@ -65,6 +66,7 @@
             size="mini"
             type="text"
             icon="el-icon-plus"
+            v-if="scope.row.children.length !== 0"
             @click="handleAdd(scope.row)"
           >新增</el-button>
           <el-button
@@ -74,6 +76,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
+          </el-row>
         </template>
       </el-table-column>
     </el-table>

src/views/system/files/file.vue

@@ -18,8 +18,9 @@
             :props="defaultProps"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
+            node-key="deptId"
+            :default-expanded-keys="idArr"
             ref="tree"
-            default-expand-all
             @node-click="handleNodeClick"
           />
         </div>
@@ -70,12 +71,19 @@
         </el-row>
         <el-table border v-loading="loading" :data="archivesList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" type="index" align="center">
+            <template slot-scope="scope">
+              <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
           <!--      <el-table-column label="主键" align="center" prop="id" />-->
+          <el-table-column label="所属部门" width="120" align="center" prop="deptName" />
           <el-table-column label="档案编号" align="center" prop="archivesNum" />
           <el-table-column label="档案名称" align="center" prop="archivesName" />
-          <el-table-column label="流程名称" align="center" prop="archivesType" />
+          <el-table-column label="流程名称" align="center" prop="processName" />
+          <el-table-column label="所属分类" align="center" prop="archivesType" />
           <el-table-column label="归档人" align="center" prop="rematk" />
-          <el-table-column label="归档日期" align="center" prop="archivesTime" width="180">
+          <el-table-column label="归档日期"  align="center" prop="archivesTime" width="120">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.archivesTime, '{y}-{m}-{d}') }}</span>
             </template>
@@ -140,6 +148,7 @@
     },
     data() {
       return {
+        idArr:[100,101],
         data:undefined,
         // 遮罩层
         loading: true,
@@ -200,8 +209,6 @@
       this.getList();
       this.getListtable();
       // this.getTreeselect();
-
-
     },
     methods: {