Merge branch 'master' of http://git.cc-lotus.info/smart-jobs/web-common

src/layout/master/index/company.vue

@@ -13,7 +13,7 @@
         <el-col :span="24" class="info">
           <el-col :span="12" class="companylist" v-for="(item, index) in companylist" :key="index">
             <el-col :span="24">
-              <p class="title">{{ item.title }}({{ item.date }})</p>
+              <p class="title">{{ item.corpname }}</p>
             </el-col>
           </el-col>
         </el-col>

src/layout/master/index/notice.vue

@@ -12,7 +12,7 @@
           </el-col>
           <el-col :span="24" class="infolist">
             <el-col :span="24" class="button">
-              <el-button class="icon" style="margin: 0 43px 0 0;"><i class="el-icon-plus"></i></el-button>
+              <el-button class="icon" style="margin: 0 43px 0 0;"><i class="el-icon-plus" @click="turnTo()"></i></el-button>
               <!-- <el-button class="icon" style="margin: 0 10px;"><i class="el-icon-arrow-right"></i></el-button> -->
             </el-col>
             <el-col :span="24" class="noticelist">
@@ -64,6 +64,14 @@ export default {
       }
       this.$emit('search', { skip: this.skip, limit: this.limit });
     },
+    turnTo() {
+      if (this.noticelist.length > 0) {
+        if (this.noticelist[0].children.length > 0) {
+          let column = this.noticelist[0].children[0].id;
+          this.$router.push({ path: `/master/notice/${column}`, query: { news_type: '0', title: '最新公告' } });
+        }
+      }
+    },
   },
 };
 </script>