bug

src/views/activity/Activity.vue

@@ -261,7 +261,17 @@ export default {
     },
   },
   created() {
+    if(this.$route.query.id){
+      this.form.journal_id=this.$route.query.id
+    }
     this.getData();
   },
+  beforeRouteEnter(to,from,next){
+        next(vm=>{
+            if(from.path.indexOf('add')>=0){
+                vm.getData()
+            }
+        })
+    }
 };
 </script>

src/views/activity/AddActivity.vue

@@ -77,7 +77,7 @@
     overflow: hidden;
     .avatar{
         width: 100%;
-        height: auto;
+        height: 100%;
     }
 }
 .avatar-uploader .el-upload:hover {
@@ -117,7 +117,7 @@
             <!-- <div class="title">新增会议</div> -->
             <el-form size="small" label-width="140px" class='over_y' ref="form" :model="form" :rules="rules">
               <el-form-item label="发布单位：" prop='journal_id' >
-                    <el-select placeholder="请选择发布单位" v-model="form.journal_id" filterable>
+                    <el-select :disabled='disabled' placeholder="请选择发布单位" v-model="form.journal_id" filterable>
                         <el-option
                             v-for="(item, index) in journalList"
                             :key="index"
@@ -223,7 +223,7 @@
                         :show-file-list="false"
                         :on-progress='handleAvatarProgress'
                         :on-success="handleAvatarSuccess">
-                        <img v-if="form.img" :src="form.img" class="avatar">
+                        <img v-if="form.img"   :src="form.img" class="avatar">
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                     </el-upload>
                     <span style='font-size:12px;color:#999999;'>建议图片尺寸比例为：210*160,单张图片小于10M,格式要求jpg,jpeg,png</span>
@@ -362,6 +362,7 @@ export default {
                 img: [{ required: true, message: "请上传封面图", trigger: "blur" }],
             },
             old:0,  //是否为回顾
+            disabled:false
         };
     },
     methods: {
@@ -397,7 +398,8 @@ export default {
                                     message: '修改成功',
                                     type: 'success'
                                 })
-                                this.$router.push({path:this.$route.matched[0].path})
+                                this.$router.go(-1)
+                                
                             }else{
                                 this.$message({
                                     message: res.data.message,
@@ -412,7 +414,7 @@ export default {
                                     message: '发布成功',
                                     type: 'success'
                                 })
-                                this.$router.push({path:this.$route.matched[0].path})
+                                this.$router.go(-1)
                             }else{
                                 this.$message({
                                     message: res.data.message,
@@ -480,10 +482,13 @@ export default {
     },
     created() {
         this.getData()
-        // console.log(this.$route)
         if(this.$route.path.indexOf('old')>=0){
             this.old=1
         }
+        if(this.$route.query.jid){
+            this.form.journal_id=Number(this.$route.query.jid)
+            this.disabled=true
+        }
         if(this.$route.query.id){
             this.id=this.$route.query.id;
             this.$api.getActivity({id:this.id}).then(res=>{

src/views/activity/OldActivity.vue

@@ -107,6 +107,9 @@ a {
           <el-form-item style="float: right">
             <el-button @click="addActivity" type="primary">发布活动</el-button>
           </el-form-item>
+          <el-form-item style="float: right" v-if='form.journal_id'>
+            <el-button @click="$router.go(-1)" type="info">返回</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <el-table
@@ -160,6 +163,7 @@ a {
 import Page from "../../components/Page";
 import fuEditor from '../../components/fuEditor'
 export default {
+  name:'oldact',
   components: {
     Page,
     fuEditor
@@ -261,7 +265,18 @@ export default {
     },
   },
   created() {
+    if(this.$route.query.id){
+      this.form.journal_id=this.$route.query.id
+    }
     this.getData();
+    
   },
+  beforeRouteEnter(to,from,next){
+        next(vm=>{
+            if(from.path.indexOf('add')>=0){
+                vm.getData()
+            }
+        })
+  }
 };
 </script>

src/views/article/AddArticle.vue

@@ -77,7 +77,7 @@
   overflow: hidden;
   .avatar {
     width: 100%;
-    height: auto;
+    height: 100%;
   }
 }
 .avatar-uploader .el-upload:hover {
@@ -130,9 +130,9 @@
           ></el-input>
         </el-form-item>
         <el-row>
-          <el-col :span="5">
+          <el-col :span="10">
             <el-form-item label="文章来源：" prop="journal_id">
-              <el-select
+              <el-select :disabled='disabled'
                 placeholder="请选择"
                 v-model="form.journal_id"
                 filterable
@@ -146,16 +146,17 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="作者：" prop="author">
               <el-input v-model="form.author" placeholder=""> </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" :offset="2">
+          <el-col :span="8" >
             <el-form-item label="出版时间：" prop="publish_time">
               <el-date-picker
                 v-model="form.publish_time"
                 type="date"
+                value-format="yyyy-MM-dd"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
@@ -193,7 +194,8 @@
         <el-form-item style="position: fixed; bottom: 20px; right: 60px">
           <el-button type="primary" @click="view">预览</el-button>
           <el-button type="success" @click="save(2)">发布</el-button>
-          <el-button type="default" @click="save(1)">保存</el-button>
+          <!-- <el-button type="default" @click="save(1)">保存</el-button> -->
+          <el-button type='info' plain @click="$router.go(-1)">返回</el-button>
           <!-- <el-button type="danger" plain>删除</el-button> -->
         </el-form-item>
       </el-form>
@@ -248,6 +250,7 @@ export default {
         ],
         img: [{ required: true, message: "封面图", trigger: "blur" }],
       },
+      disabled:false
     };
   },
   methods: {
@@ -318,7 +321,8 @@ export default {
                   type: "success",
                   message: status==1?"保存成功!":"发布成功!",
                 });
-                this.$router.push({path:'/article/article'})
+                this.$router.go(-1)
+                
               } else {
                 this.$message.error(status==1?"保存失败!":"发布失败!");
               }
@@ -330,7 +334,7 @@ export default {
                   type: "success",
                   message: status==1?"保存成功!":"发布成功!",
                 });
-                this.$router.push({path:'/article/article'})
+                this.$router.go(-1)
               } else {
                 this.$message.error(status==1?"保存失败!":"发布失败!");
               }
@@ -356,6 +360,10 @@ export default {
     },
   },
   created() {
+    if(this.$route.query.jid){
+            this.form.journal_id=Number(this.$route.query.jid)
+            this.disabled=true
+    }
     this.getData();
   },
 };

src/views/article/Article.vue

@@ -116,12 +116,15 @@ a {
             >
             <el-button @click="addArticle" type="primary">发布文章</el-button>
           </el-form-item>
+          <el-form-item style="float: right" v-if='form.journal_id'>
+            <el-button @click="$router.go(-1)" type="info">返回</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <el-table
         class="table"
         :data="list"
-        height="50vh"
+        height="57vh"
         border
         v-loading="loading"
         default-expand-all
@@ -309,7 +312,17 @@ export default {
     },
   },
   created() {
+     if(this.$route.query.id){
+      this.form.journal_id=this.$route.query.id
+    }
     this.getData();
   },
+  beforeRouteEnter(to,from,next){
+        next(vm=>{
+            if(from.path.indexOf('add')>=0){
+                vm.getData()
+            }
+        })
+  }
 };
 </script>

src/views/journalQun/AddJournal.vue

@@ -163,6 +163,7 @@
             <el-form-item label="主办单位：" prop="organizer_id">
               <el-select
                 placeholder="请选择"
+                :disabled='disabled1'
                 v-model="form.organizer_id"
                 filterable
               >
@@ -179,6 +180,7 @@
             <el-form-item label="学科：" prop="subject_id">
               <el-select
                 placeholder="请选择"
+                :disabled='disabled2'
                 v-model="form.subject_id"
                 filterable
               >
@@ -310,6 +312,7 @@
         <el-form-item style="position: fixed; bottom: 20px; right: 60px">
           <el-button type="primary" @click="view">预览</el-button>
           <el-button type="success" @click="save">发布</el-button>
+          <el-button type='info' plain @click="$router.go(-1)">返回</el-button>
           <!-- <el-button type="default" @click="save">保存</el-button> -->
           <!-- <el-button type="danger" plain>删除</el-button> -->
         </el-form-item>
@@ -361,6 +364,8 @@ export default {
   },
   data() {
     return {
+      disabled1:false,
+      disabled2:false,
       loading:false,
       open:false,
       form: {},
@@ -369,7 +374,7 @@ export default {
       imageUrl: "",
       rules: {
         name: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        // wxcode: [{ required: true, message: "请输入微信号", trigger: "blur" }],
+        editor: [{ required: true, message: "请输入主编", trigger: "blur" }],
         organizer_id: [{ required: true, message: "请选择主办单位", trigger: "blur" }],
         subject_id: [{ required: true, message: "请选择学科", trigger: "change" }],
         img: [{ required: true, message: "封面图", trigger: "blur" }],
@@ -442,7 +447,8 @@ export default {
                   type: "success",
                   message: "保存成功!",
                 });
-                this.$router.push({path:this.$route.matched[0].path})
+                this.$router.go(-1)
+                
               } else {
                 this.$message.error("保存失败!");
               }
@@ -454,14 +460,14 @@ export default {
                   type: "success",
                   message: "保存成功!",
                 });
-                this.$router.push({path:this.$route.matched[0].path})
+                this.$router.go(-1)
               } else {
                 this.$message.error("保存失败!");
               }
             });
           }
         } else {
-            this.$message.error("有必填项没有填!");
+            // this.$message.error("有必填项没有填!");
         }
       });
     },
@@ -480,6 +486,14 @@ export default {
     },
   },
   created() {
+    if(this.$route.query.oid){
+            this.form.organizer_id=Number(this.$route.query.oid)
+            this.disabled1=true
+    }
+    if(this.$route.query.sid){
+            this.form.subject_id=Number(this.$route.query.sid)
+            this.disabled2=true
+    }
     this.getData();
   },
 };

src/views/journalQun/Journal.vue

@@ -95,23 +95,23 @@
         <el-table-column prop="name" width="180" label="期刊名称">
         </el-table-column>
         <el-table-column prop="wxcode" label="微信号"> </el-table-column>
-        <el-table-column prop="subject_name" label="主办单位">
+        <el-table-column width="150" prop="organizer_name" label="主办单位">
         </el-table-column>
         <el-table-column prop="desc" width="300" label="简介">
         </el-table-column>
-        <el-table-column prop="name" label="中文名称"> </el-table-column>
-        <el-table-column prop="ename" label="外文名称"> </el-table-column>
+        <el-table-column width="150" prop="name" label="中文名称"> </el-table-column>
+        <el-table-column width="150" prop="ename" label="外文名称"> </el-table-column>
         <el-table-column prop="languages" label="语种"> </el-table-column>
         <el-table-column prop="editor" label="主编"> </el-table-column>
-        <el-table-column prop="corganizers" label="主管单位"> </el-table-column>
-        <el-table-column prop="publishingUnit" label="办刊单位">
+        <el-table-column width="150" prop="corganizers" label="主管单位"> </el-table-column>
+        <el-table-column width="150" prop="publishingUnit" label="办刊单位">
         </el-table-column>
-        <el-table-column prop="publishingTime" label="创刊时间">
+        <el-table-column width="150" prop="publishingTime" label="创刊时间">
         </el-table-column>
         <el-table-column prop="domestic" label="国内刊号"> </el-table-column>
         <el-table-column prop="issn" label="国际刊号"> </el-table-column>
-        <el-table-column prop="website" label="期刊官网"> </el-table-column>
-        <el-table-column prop="editorialAddress" label="编辑部地址">
+        <el-table-column width="150" prop="website" label="期刊官网"> </el-table-column>
+        <el-table-column width="150" prop="editorialAddress" label="编辑部地址">
         </el-table-column>
         <el-table-column prop="zip" width="150" align="center"  label="操作" fixed="right">
           <template slot-scope="scope">
@@ -339,5 +339,12 @@ export default {
   created() {
     this.getData();
   },
+  beforeRouteEnter(to,from,next){
+        next(vm=>{
+            if(from.path.indexOf('add')>=0){
+                vm.getData()
+            }
+        })
+  }
 };
 </script>

src/views/journalQun/Organizer.vue

@@ -394,11 +394,11 @@ export default {
                   type: "success",
                   message: "保存成功!",
                 });
+                this.getData();
+                this.dialogVisible = false;
               } else {
                 this.$message.error(res.data.message);
               }
-              this.getData();
-              this.dialogVisible = false;
             });
           } else {
             this.$api.addOrganizer(parm).then((res) => {
@@ -407,11 +407,12 @@ export default {
                   type: "success",
                   message: "保存成功!",
                 });
+                this.getData();
+                this.dialogVisible = false;
               } else {
                 this.$message.error(res.data.message);
               }
-              this.getData();
-              this.dialogVisible = false;
+              
             });
           }
         }

src/views/journalQun/ShowJournal.vue

@@ -83,8 +83,8 @@
       <!-- 活动回顾 -->
       <div class="journalItem overActivity">
         <div class="title">活动回顾</div>
-        <div @click="$router.push({path:'/learning/oldactivity'})" class="title more">查看更多>></div>
-        <el-button @click="$router.push({path:'/learning/oldactivity/add',query:{type:1}})" type="primary" class="add" size="mini">发布活动回顾</el-button>
+        <div @click="$router.push({path:'/learning/oldactivity',query:{id:form.id}})" class="title more">查看更多>></div>
+        <el-button @click="$router.push({path:'/learning/oldactivity/add',query:{type:1,jid:form.id}})" type="primary" class="add" size="mini">发布活动回顾</el-button>
       </div>
       <div>
         <el-table
@@ -118,8 +118,8 @@
       <!-- 活动预告 -->
       <div class="journalItem preActivity">
         <div class="title">活动预告</div>
-        <div @click="$router.push({path:'/learning/activity'})" class="title more">查看更多>></div>
-        <el-button @click="$router.push({path:'/learning/activity/add'})" type="primary" class="add" size="mini">发布活动预告</el-button>
+        <div @click="$router.push({path:'/learning/activity',query:{id:form.id}})" class="title more">查看更多>></div>
+        <el-button @click="$router.push({path:'/learning/activity/add',query:{jid:form.id}})" type="primary" class="add" size="mini">发布活动预告</el-button>
       </div>
       <div>
         <el-table
@@ -153,8 +153,8 @@
       <!-- 精品文章 -->
       <div class="journalItem preActivity">
         <div class="title">精品文章</div>
-        <div @click="$router.push({path:'/article/article'})" class="title more">查看更多>></div>
-        <el-button @click="$router.push({path:'/article/article/add'})" type="primary" class="add" size="mini">发布精品文章</el-button>
+        <div @click="$router.push({path:'/article/article',query:{id:form.id}})" class="title more">查看更多>></div>
+        <el-button @click="$router.push({path:'/article/article/add',query:{jid:form.id}})" type="primary" class="add" size="mini">发布精品文章</el-button>
       </div>
       <div>
         <el-table
@@ -218,7 +218,6 @@ export default {
       let id = this.$route.query.id;
       if (id) {
         this.$api.showJournal({ id: id }).then((res) => {
-          console.log(res)
           this.form = res.data.data;
           this.oldActivityList = res.data.data.old_activity;
           this.newActivityList = res.data.data.new_activity;
@@ -256,5 +255,12 @@ export default {
   created() {
     this.getData();
   },
+  beforeRouteEnter(to,from,next){
+        next(vm=>{
+            if(from.path.indexOf('add')>=0){
+                vm.getData()
+            }
+        })
+  }
 };
 </script>

src/views/journalQun/Subject.vue

@@ -303,7 +303,7 @@ export default {
     add() {
       this.form1 = {};
       this.dialogVisible = true;
-      this.dialogTitle = "添加主办单位";
+      this.dialogTitle = "添加学科";
     },
     addArticle(){
           this.$router.push({path:'/article/article/add'})
@@ -354,11 +354,12 @@ export default {
                   type: "success",
                   message: "保存成功!",
                 });
+                this.getData();
+                this.dialogVisible = false;
               } else {
                 this.$message.error(res.data.message);
               }
-              this.getData();
-              this.dialogVisible = false;
+              
             });
           } else {
             this.$api.addSubject(parm).then((res) => {
@@ -367,11 +368,12 @@ export default {
                   type: "success",
                   message: "保存成功!",
                 });
+                this.getData();
+                this.dialogVisible = false;
               } else {
                 this.$message.error(res.data.message);
               }
-              this.getData();
-              this.dialogVisible = false;
+              
             });
           }
         }

src/views/journalQun/SubjectDetail.vue

@@ -4,6 +4,7 @@
             display: inline-block;
             margin-bottom: 10px;
             vertical-align: top;
+            width: 75%;
             .name{
                 font-size: 16px;
                 color: #333;
@@ -29,7 +30,8 @@
                 <p class="name">{{form.name}}</p>
                  <p class="desc">{{form.desc}}</p>
             </h1>
-           <el-button @click='$router.push({ path: "/journal/journal/add" })' style="float:right;margin-bottom:10px;" type='primary' size="small">添加期刊</el-button>
+            <el-button v-if='type==1' @click='$router.push({ path: "/journal/journal/add",query:{oid:form.id} })' style="float:right;margin-bottom:10px;" type='primary' size="small">添加期刊</el-button>
+           <el-button v-if='type==2' @click='$router.push({ path: "/journal/journal/add",query:{sid:form.id} })' style="float:right;margin-bottom:10px;" type='primary' size="small">添加期刊</el-button>
             <el-table
                 class="table"
                 :data="list"
@@ -155,5 +157,12 @@ export default {
             
         }
     },
+    beforeRouteEnter(to,from,next){
+        next(vm=>{
+            if(from.path.indexOf('add')>=0){
+                vm.getData()
+            }
+        })
+    }
 };
 </script>

src/views/system/Account.vue

@@ -141,8 +141,8 @@
                 </el-form-item>
                 <el-form-item label="账户状态" prop='is_active'>
                     <el-radio-group v-model="form1.is_active">
-                        <el-radio label="1">启用</el-radio>
-                        <el-radio label="0">禁用</el-radio>
+                        <el-radio :label="1">启用</el-radio>
+                        <el-radio :label="0">禁用</el-radio>
                     </el-radio-group>
                 </el-form-item>
         </el-form>
@@ -206,7 +206,7 @@ export default {
         editPerson(row){
             this.dialogTitle = "编辑管理员";
             this.dialogVisible = true;
-            this.form1 = row ;
+            this.form1 = {...row} ;
             this.form1.rePassword = this.form1.password
         },
         gopage(size){
@@ -291,11 +291,12 @@ export default {
                                     message:"成功",
                                     type:"success"
                                 })
+                                this.getData()
+                                this.dialogVisible = false
                             }else{
                                 this.$message.error(res.data.message);
                             }
-                            this.getData()
-                            this.dialogVisible = false
+                            
                         })
                     }else{
                         this.$api.addUser(this.form1).then(res=>{
@@ -304,11 +305,12 @@ export default {
                                     message:"成功!",
                                     type:"success"
                                 })
+                                this.getData()
+                                this.dialogVisible = false
                             }else{
                                 this.$message.error(res.data.message);
                             }
-                            this.getData()
-                            this.dialogVisible = false
+                            
                         })
                     }
                 }