Merge remote-tracking branch 'remotes/origin/xie'

# Conflicts:
#	src/components/page/articleAdd.vue

src/components/common/Sidebar.vue

@@ -129,11 +129,15 @@
 					</a>
 				</el-menu-item>
 			</template>
+			<!-- 编辑 -->
 			<template v-if="this.userrole == 1">
 				<el-submenu index="5">
 					<template slot="title">
 						<i class="el-icon-paperclip"></i> {{$t('sidebar.tools')}}
 					</template>
+					<el-menu-item index="RejectedArticles">
+						{{$t('sidebar.ReArticles')}}
+					</el-menu-item>
 					<el-menu-item index="1" key="1">
 						<a href="http://master.tmrjournals.com" target="_blank" style="color: #fff;">
 							Management System

src/components/common/TypeList.vue

@@ -0,0 +1,66 @@
+<script>
+var journal_type = [{
+					name: 'ARTICLE',
+					value: 'A'
+				}, {
+					name: 'REVIEW',
+					value: 'B'
+				}, {
+					name: 'CASE REPORT',
+					value: 'C'
+				}, {
+					name: 'RESEARCH PROPOSAL',
+					value: 'P'
+				}, {
+					name: 'NEWS',
+					value: 'N'
+				}, {
+					name: 'COMMENT',
+					value: 'T'
+				}, {
+					name: 'CORRECTION',
+					value: 'CT'
+				}, {
+					name: 'HYPOTHESIS',
+					value: 'HT'
+				}, {
+					name: 'PREFACE',
+					value: 'PF'
+				}, {
+					name: 'EDITORIAL',
+					value: 'ET'
+				}, {
+					name: 'REPORT',
+					value: 'RP'
+				}, {
+					name: 'LETTER',
+					value: 'LR'
+				}, {
+					name: 'EMPIRICAL FORMULA',
+					value: 'EF'
+				}, {
+					name: 'EXPERT CONSENSUS',
+					value: 'EC'
+				}, {
+					name: 'LETTER TO EDITOR',
+					value: 'LTE'
+				}, {
+					name: 'QUESTIONNAIRE INVESTIGATION',
+					value: 'QI'
+				}, {
+					name: 'CASE SERIES',
+					value: 'CS',
+				}, {
+					name: 'RETRACTION',
+					value: 'RT',
+				}, {
+					name: 'MINI REVIEW',
+					value: 'MR',
+				}, {
+					name: 'OTHERS',
+					value: 'O',
+				}]
+    export default {
+        journal_type 
+    }			
+</script>

src/components/common/langs/en.js

@@ -119,6 +119,7 @@ const en = {
 		mailbox2: 'Mailbox list',
 		mailbox3: 'Mailbox template',
 		tools: 'Assistant tools',
+		ReArticles: 'Rejected Manuscripts',     // 被拒稿件
 	},
 	home: {
 		authortop: 'Author guide',

src/components/common/langs/zh.js

@@ -118,6 +118,7 @@ const zh = {
 		mailbox2: '邮件列表',
 		mailbox3: '模板管理',
 		tools: '辅助工具',
+		ReArticles: '被拒稿件',     // 被拒稿件
 	},
 	home: {
 		authortop: '用户指南',