y595705120 3 years ago
parent
commit
b26c4a3ee4
2 changed files with 22 additions and 11 deletions
  1. 15 8
      src/pages/other/file-search.vue
  2. 7 3
      src/pages/other/my-file.vue

+ 15 - 8
src/pages/other/file-search.vue

@@ -5,7 +5,9 @@
           <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="请选择"  @clear="selectDepartment({})" clearable>
+                <el-select v-model="searchInfo.department" collapse-tags placeholder="请选择"
+                 style="width: 160px;"
+                 @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>
@@ -20,14 +22,14 @@
               </el-form-item>
 
               <el-form-item label="选择分类">
-                <el-select v-model="searchInfo.category" collapse-tags placeholder="请选择"  clearable>
+                <el-select v-model="searchInfo.category" collapse-tags placeholder="请选择" style="width: 160px;"  clearable>
                   <el-option v-for="(item,index) in categorys"
                   :value="index" :key="index" :label="item"></el-option>
                 </el-select>
               </el-form-item>
 
               <el-form-item label="文件标题">
-                <el-input placeholder="" v-model="searchInfo.keyword" clearable></el-input>
+                <el-input placeholder="" v-model="searchInfo.keyword" clearable style="width: 320px;" ></el-input>
               </el-form-item>
 
 
@@ -78,13 +80,13 @@
                   v-if="isLeader(row.departmentId)"
                   style="color:darkorange"
                   type="text"
-                  @click="row.visible=true"
+                  @click="row._delete=true"
                 >删除</el-button>
 
-                <el-popover placement="top" width="160" v-model="row.visible">
+                <el-popover placement="top" width="160" v-model="row._delete">
                   <p>删除动作不可逆,你是否确认删除?</p>
                   <div style="text-align: right; margin: 0">
-                    <el-button size="mini" type="text" @click="row.visible = false">取消</el-button>
+                    <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>
@@ -196,7 +198,7 @@ export default {
     deleteArtical( row ){
       deleteArtical( {articalId: row.articalId}).then(res=>{
         if( res.code == 200){
-          row.visible = false
+          row._delete = false
           row.status = 4
           row.isOpen = 2
         }
@@ -216,7 +218,12 @@ export default {
       }
       getArticalList( param ).then( res=>{
         if( res.code == 200){
-          this.list = res.data.list;
+          let list = res.data.list||[];
+          this.list = list.map( item => {
+            item._delete = false;
+            return item
+           });
+
           this.total = res.data.total;
         }
       })

+ 7 - 3
src/pages/other/my-file.vue

@@ -22,7 +22,7 @@
           <div slot="header" class="clearfix">
             <el-form :inline="true" :model="searchInfo" class="demo-form-inline">
             	<el-form-item :label="selectName">
-                <el-input placeholder="" v-model="searchInfo.keyword" clearable></el-input>
+                <el-input placeholder="" v-model="searchInfo.keyword" style="width: 500px;" clearable></el-input>
               </el-form-item>
 
               <el-form-item>
@@ -64,7 +64,7 @@
 
                 <el-button v-if="selectId==5" type="text" style="color:darkorange"  @click="row._delete=true" >删除</el-button>
 
-                <el-popover placement="top-start" width="150" v-model="row._delete">
+                <el-popover placement="top" width="150" v-model="row._delete">
                   <p>删除动作不可逆,你是否确认删除?</p>
                   <div style="text-align: right; top: 0">
                     <el-button size="mini" type="text" @click="row._delete = false">取消</el-button>
@@ -198,7 +198,11 @@ export default {
       let param = {page,pageSize, keyword: this.searchInfo.keyword}
       this.listApi( param ).then( res=>{
         if( res.code == 200){
-          this.list = res.data.list||[]
+          let list = res.data.list||[];
+          this.list = list.map( item => {
+            item._delete = false;
+            return item
+           });
           this.total = res.data.total||0
         }
       })