'normal'

src/pages/data/data.js

@@ -21,10 +21,24 @@ export default {
     3: '分管领导'
   },
   statusMap: {
-    0: '经办人提交',
-    1: '负责人审核中',
-    2: '分管确认中',
-    3: '发布中'
+    0: '经办提交',
+    1: '科长审核',
+    2: '分管确认',
+    3: '发布中',
+    4: '管理删除'
+  },
+  actions:{
+    "add":'新增',
+    "admin":'后台编辑',
+    "confirm":'确认',
+    'publish':'发布',
+    'delete':'删除',
+    'back':'拒绝'
+  },
+  openMap: {
+    0: '私',
+    1: '公',
+    2: '删'
   },
   getDepart: (id, departs)=> {
     for (let i in departs) {

src/pages/other/file-info.vue

@@ -28,8 +28,8 @@
             </el-col>
 
             <el-col :span="8">
-              <el-form-item label="是否公开">
-                <span class="pl10 nowrap span-tit">{{info.isOpen?'是':'否' }}</span>
+              <el-form-item label="文件属性">
+                <span class="pl10 nowrap span-tit">{{openMap[info.isOpen] }}</span>
               </el-form-item>
             </el-col>
 
@@ -37,13 +37,12 @@
             <el-col :span="8">
               <el-form-item label="文件状态">
                 <span class="pl10 nowrap span-tit">{{statusMap[info.status] }}</span>
-                <span class="ml20">
+                <span class="ml20" v-if="info.isOpen<2">
                   <el-button  type="text"  v-if="isLeader==2 && info.status==1"
                     @click="dialogConfirm=true">审核</el-button>
                   <el-button  type="text"  v-if="isLeader==3 && info.status==2"
                     @click="dialogPublish=true">发布</el-button>
                 </span>
-
               </el-form-item>
             </el-col>
 
@@ -69,12 +68,11 @@
           </div>
         </div> -->
         <div class="p20">
-          <el-button v-if="!isLike" icon="el-icon-star-off" @click="likeArtical"> 收藏</el-button>
-          <el-button v-else icon="el-icon-star-on" type="info" @click="unLikeArtical">取消</el-button>
-
-          <el-button icon="el-icon-download" v-if="isLeader>0 || info.isOpen" @click="download"> 下载</el-button>
-          <el-button icon="el-icon-download" v-else @click="applyDownload">申请下载</el-button>
+          <el-button v-if="!isLike" icon="el-icon-star-off" @click="likeArtical"> 收藏文件</el-button>
+          <el-button v-else icon="el-icon-star-on" type="info" @click="unLikeArtical">取消收藏</el-button>
 
+          <el-button icon="el-icon-download" v-if="isLeader>0 || info.isOpen==1" @click="download"> 下载文件</el-button>
+          <el-button icon="el-icon-download" v-else-if="info.isOpen==0" @click="applyDownload">申请下载</el-button>
         </div>
 
 
@@ -86,7 +84,10 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作人" prop="nickname">
+            <el-table-column label="操作人" prop="nickname" align="center">
+              <template slot-scope="{ row }">
+                {{row.nickname}} - {{actions[row.action]}}
+              </template>
             </el-table-column>
 
             <el-table-column label="备注"  prop="content" align="center">
@@ -94,24 +95,15 @@
             </el-table-column>
 
 
-            <el-table-column label="状态"  prop="status" align="center">
+            <el-table-column label="操作前"  prop="status" align="center">
               <template slot-scope="{ row }">
-                {{statusMap[row.oldStatus] }} -> {{statusMap[row.newStatus] }}
+                {{statusMap[row.oldStatus] }}
               </template>
             </el-table-column>
 
-            <el-table-column label="操作"  prop="status" align="center" width="80">
-              <template slot-scope="{ row, $index }">
-                <div v-if="$index==0">
-                  <el-button  type="text" size="small" v-if="info.status==3" >已发布</el-button>
-                  <el-button  type="text" size="small" v-else-if="isLeader==2 && info.status==1" @click="dialogConfirm=true">审核</el-button>
-                  <el-button  type="text" size="small" v-else-if="isLeader==3 && info.status==2" @click="dialogPublish=true" >发布</el-button>
-                  <el-button  type="text" size="small" v-else >无权限</el-button>
-                </div>
-                <div v-else>
-                  <el-button  type="text" size="small" >已经处理</el-button>
-                </div>
-
+            <el-table-column label="操作后"  prop="status" align="center" >
+              <template slot-scope="{ row }">
+                {{statusMap[row.newStatus] }}
               </template>
             </el-table-column>
 
@@ -259,6 +251,8 @@
         apply_list: [],
         logs:[],
         isLike: 0,
+        actions: data.actions,
+        openMap: data.openMap,
         statusMap: data.statusMap,
         owners: data.owners,
         categorys: data.categorys,

src/pages/other/file-search.vue

@@ -5,7 +5,7 @@
           <div slot="header" class="clearfix" >
             <el-form :inline="true" :model="searchInfo" class="demo-form-inline">
               <el-form-item label="选择部门">
-                <el-select v-model="searchInfo.department" collapse-tags placeholder="请选择"  clearable>
+                <el-select v-model="searchInfo.department" collapse-tags placeholder="请选择"  @clear="selectDepartment({})" clearable>
                   <div class="el-input" style="width:90%;margin-left:5%;">
                     <input type="text" placeholder="请输入" class="el-input__inner" v-model="dropDownValue">
                   </div>
@@ -39,12 +39,18 @@
 
           <el-table :data="list"  border stripe>
             <el-table-column label="序号" min-width="50" prop="articalId">
+              <template v-slot="{row}">
+                <span> 【{{openMap[row.isOpen]}}】{{row.articalId}}</span>
+              </template>
             </el-table-column>
 
             <el-table-column label="文件标题" min-width="200" prop="title">
             </el-table-column>
 
             <el-table-column label="科室" min-width="50" prop="department">
+              <template v-slot="{row}">
+                <span> {{departmentMap[row.departmentId]}}</span>
+              </template>
             </el-table-column>
 
             <el-table-column label="分类" min-width="50" prop="category">
@@ -107,9 +113,9 @@ export default {
       page:1,
       total:0,
       dropDownValue:'',
-      departments:data.departs,
       showDepartments:data.departs,
       categorys:data.categorys,
+      openMap:data.openMap,
       searchInfo:{
         keyword: '',
         department:'',
@@ -119,14 +125,14 @@ export default {
     }
   },
    computed: {
-  	...mapGetters("user", ["userDepartments"])
+  	...mapGetters("user", ["userDepartments","departmentMap"])
   },
   mounted(){
     this.getArticalList()
   },
   watch:{
     dropDownValue(val){
-      this.showDepartments = this.departments.filter( item=>{
+      this.showDepartments = this.userDepartments.filter( item=>{
         return item.department.indexOf( val  )>-1
       })
     },

src/pages/other/my-file.vue

@@ -34,9 +34,14 @@
 
 
           <el-table :data="list"  border stripe>
-            <el-table-column label="序号" width="50" prop="articalId">
+
+            <el-table-column label="序号" width="100" prop="articalId" align="center">
+              <template v-slot="{row}">
+                <span> 【{{openMap[row.isOpen]}}】{{row.articalId}}</span>
+              </template>
             </el-table-column>
 
+
             <el-table-column label="标题" min-width="200" prop="title">
             </el-table-column>
 
@@ -102,6 +107,7 @@ export default {
       pageSize: 10,
       page:1,
       searchDepartId: "",
+      openMap:data.openMap,
       listApi: getMyArticalList,
       restaurants: [],
       searchInfo:{

src/store/modules/user.js

@@ -161,6 +161,14 @@ const getters=  {
   },
   userDepartments(state){
     return state.departments
+  },
+  departmentMap(){
+    let departments = {}
+    for (let i in state.departments ) {
+      let item = state.departments[i]
+      departments[item.departmentId] = item.department;
+    }
+    return departments
   }
 }