Merge branch 'master' of http://git.ndjsxh.cn:10080/smgov/smoa_web

src/pages/other/my-file.vue

@@ -42,21 +42,35 @@
             </el-table-column>
 
 
-            <el-table-column label="标题" min-width="200" prop="title">
+            <el-table-column label="标题" min-width="180" prop="title">
             </el-table-column>
 
-            <el-table-column label="时间" min-width="90" prop="createAt" align="center">
+            <el-table-column label="部门" width="110" prop="department" align="center">
+            </el-table-column>
+
+
+           <el-table-column label="时间" width="100" prop="createAt" align="center">
               <template slot-scope="{row}">
-                <span> {{row.createAt|toDatetime}}</span>
+                <span> {{row.createAt|toDate}}</span>
               </template>
             </el-table-column>
 
-            <el-table-column label="备注" width="110" align="center">
+            <el-table-column label="操作" width="150" align="center">
               <template v-slot="{row}">
                 <el-button  type="text" @click="gotoDetail(row)"> 详情 </el-button>
 
                 <el-button  type="text" @click="download(row)" v-if="selectId==1"> 下载 </el-button>
                 <el-button  type="text" @click="editFile(row)" v-else-if="selectId==5"> 编辑 </el-button>
+
+                <el-button v-if="selectId==5" type="text" style="color:darkorange"  @click="row._delete=true" >删除</el-button>
+
+                <el-popover placement="top" width="150" v-model="row._delete">
+                  <p>删除动作不可逆，你是否确认删除？</p>
+                  <div style="text-align: right; margin: 0">
+                    <el-button size="mini" type="text" @click="row._delete = false">取消</el-button>
+                    <el-button type="primary" size="mini" @click="deleteArtical(row)">确定</el-button>
+                  </div>
+                </el-popover>
               </template>
             </el-table-column>
 
@@ -83,10 +97,10 @@
 <script>
 import IHeader from "./components/IHeader";
 import IFooter from "./components/IFooter";
-import {getArticalList,getApplyArticalList}  from '@/api/article'
+import {getArticalList,getApplyArticalList, deleteArtical}  from '@/api/article'
 import {getEditArticalList,downloadFile}  from '@/api/article'
 import {download} from '@/utils/download.js'
-import {toDatetime} from '@/utils/date.js'
+import {toDatetime, toDate} from '@/utils/date.js'
 import data from '../data/data.js'
 import { mapActions } from "vuex";
 
@@ -123,7 +137,8 @@ export default {
     }
   },
   filters:{
-    toDatetime
+    toDatetime,
+    toDate
   },
   created() {
     console.log("created", this.$route.keepAlive)
@@ -138,6 +153,14 @@ export default {
       this.$router.push( {path: '/file-info', query})
       // window.open( `http://smoa.ndjsxh.cn:8888/api/downloadFile/${articalId}`)
     },
+    deleteArtical( row ){
+      deleteArtical( {articalId: row.articalId}).then(res=>{
+        if( res.code == 200){
+          row.status = 4
+          row.isOpen = 2
+        }
+      })
+    },
     editFile( row ){
       let path = "/file-add"
       let query = {articalId: row.articalId}