From ec2135fa1b5ef2886c496bc1d7f4e08e14a38850 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 7 Jun 2023 09:35:31 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E6=8B=92=E7=A8=BF=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Sidebar.vue           |   4 +
 src/components/common/TypeList.vue          |  66 ++++++
 src/components/common/langs/en.js           |   1 +
 src/components/common/langs/zh.js           |   1 +
 src/components/page/PB_formWork.vue         |   4 +-
 src/components/page/RejectedArticles.vue    | 210 ++++++++++++++++++++
 src/components/page/articleAdd.vue          |  47 ++++-
 src/components/page/articleDetailEditor.vue |  95 ++++++++-
 src/components/page/journallist.vue         |   2 +-
 src/router/index.js                         |   7 +
 vue.config.js                               |   2 +-
 11 files changed, 432 insertions(+), 7 deletions(-)
 create mode 100644 src/components/common/TypeList.vue
 create mode 100644 src/components/page/RejectedArticles.vue

diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index 6b4c889..36aea04 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -125,11 +125,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
diff --git a/src/components/common/TypeList.vue b/src/components/common/TypeList.vue
new file mode 100644
index 0000000..5da3b6a
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/components/common/langs/en.js b/src/components/common/langs/en.js
index 35b7608..58b85a7 100644
--- a/src/components/common/langs/en.js
+++ b/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',
diff --git a/src/components/common/langs/zh.js b/src/components/common/langs/zh.js
index ac78523..eeebe31 100644
--- a/src/components/common/langs/zh.js
+++ b/src/components/common/langs/zh.js
@@ -118,6 +118,7 @@ const zh = {
 		mailbox2: '邮件列表',
 		mailbox3: '模板管理',
 		tools: '辅助工具',
+		ReArticles: '被拒稿件',     // 被拒稿件
 	},
 	home: {
 		authortop: '用户指南',
diff --git a/src/components/page/PB_formWork.vue b/src/components/page/PB_formWork.vue
index 97028bf..d4244a2 100644
--- a/src/components/page/PB_formWork.vue
+++ b/src/components/page/PB_formWork.vue
@@ -78,9 +78,9 @@
 					value: '1',
 					label: 'Template 1'
 				}],
-				url: 'http://192.168.110.156:8080/static/img/output-1.png',
+				url: 'http://192.168.110.159:8080/static/img/output-1.png',
 				srcList: [
-					'http://192.168.110.156:8080/static/img/output-1.png'
+					'http://192.168.110.159:8080/static/img/output-1.png'
 				],
 				pageCount: 0,
 				pdfUrl: '',
diff --git a/src/components/page/RejectedArticles.vue b/src/components/page/RejectedArticles.vue
new file mode 100644
index 0000000..6336f0e
--- /dev/null
+++ b/src/components/page/RejectedArticles.vue
@@ -0,0 +1,210 @@
+<template>
+	<div>
+		<div class="container">
+			<el-table :data="tableData" border stripe class="table" ref="multipleTable"
+			header-cell-class-name="table-header" empty-text="New messages (0)">
+			<el-table-column type="index" label="No." width="55" align="center"></el-table-column>
+			<el-table-column width="180" label="Manuscript ID" align="center">
+				<template slot-scope="scope">
+					<p style="margin-bottom: 5px;">
+						<span
+							style="background-color: #006699;width: 20px;color: #fff;margin: 0 2px 0 0;font-weight: bold;padding: 2px 4px;"
+							v-if="scope.row.special_num>0">S</span>
+						{{scope.row.accept_sn}}
+					</p>					
+					<!-- <el-button @click="huaGuest(scope.row)" size="mini" type="primary" plain style="margin-top: 10px;">
+						Put into special issue</el-button> -->
+				</template>
+			</el-table-column>
+			<el-table-column prop="title" label="Title" align="center">
+				<template slot-scope="scope">
+					<p style="text-align: left;">
+						<el-badge is-dot :hidden="scope.row.author_act==1?false:true" class="item">
+							{{scope.row.title}}
+						</el-badge>
+					</p>
+				</template>
+			</el-table-column>			
+			<el-table-column label="Type" align="center" width="300">
+				<template slot-scope="scope">
+                    <!-- {{scope.row.type}} -->
+                    <el-select v-model="scope.row.type" disabled style="width: 100%;">
+                        <el-option v-for="item in journal_type" :key="item.value" :label="item.name"
+									:value="item.value"></el-option>
+                    </el-select>
+					<!-- <div style="text-align: center;margin-bottom: 10px;" v-if="scope.row.emailh==1">
+						<el-button size="mini" type="primary" plain icon="el-icon-chat-dot-square"
+							@click="linkEmailist(scope.row)">History</el-button>
+					</div>
+					<div style="text-align: center;">
+						<el-button size="mini" type="primary" plain icon="el-icon-message"
+							@click="linkEmail(scope.row)">Email</el-button>
+					</div> -->
+				</template>
+			</el-table-column>			
+			<el-table-column label="Remarks" align="center">
+				<template slot-scope="scope">
+					<p style="margin-bottom: 5px;text-align: left;">{{scope.row.remarks}}</p>
+					<el-button @click="testedit(scope.row)" size="mini" type="primary" plain icon="el-icon-edit">Change
+					</el-button>                    
+				</template>
+			</el-table-column>
+			<el-table-column label="" align="center">
+				<template slot-scope="scope">					
+                    <el-button size="mini" type="primary" plain icon="el-icon-tickets"
+						@click="showdetaileditor(scope.row)">Detail</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+        <div class="pagination">
+			<el-pagination background layout="total, prev, pager, next" :current-page="query.pageIndex"
+				:page-size="query.pageSize" :total="Total" @current-change="handlePageChange"></el-pagination>
+		</div>
+		</div>
+        <!-- 标记弹窗 -->
+        <el-dialog title="Remarks" :visible.sync="editbox" width="550px">
+			<el-form ref="remark" :model="remark" label-width="85px">
+				<el-form-item label="Title :">
+					<p style="line-height: 20px;margin-top: 6px;">{{remark.title}}</p>
+				</el-form-item>
+				<el-form-item label="Content :">
+					<el-input type="textarea" rows="5" v-model="remark.content"></el-input>
+				</el-form-item>
+			</el-form>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="editbox = false">Cancel</el-button>
+				<el-button type="primary" @click="saveRemark">Save</el-button>
+			</span>
+		</el-dialog>
+
+	</div>
+</template>
+
+<script>	
+     // 引入公共文章type
+    import  journal_type1  from '../common/TypeList.vue'
+	export default {
+		name: 'RejectedArticles',
+		data() {
+			return {
+				Total: 0,
+                query: {
+					//username: localStorage.getItem('U_name'),					
+					pageIndex: 1,
+					pageSize: 50
+				},
+                tableData: [],
+                editbox:false,
+                remark: {
+					articleId: this.$route.query.id,
+					content: ''
+				},  
+                journal_type:[],
+                ss:''
+			};
+		},
+		components: {
+			
+		},
+		created() {
+			this.getData();
+			if (localStorage.getItem('U_point') != null) {
+				this.activeIndex = localStorage.getItem('U_point')
+				localStorage.removeItem('U_point')
+			}
+		},
+		activated() {
+			this.getData();
+		},
+		methods: {
+			// 获取数据
+			getData() {
+				// 被拒稿件列表
+				this.$api
+					.post('api/Article/getRejectArticles', this.query)
+					.then(res => {
+						if (res.data.count > 0) {
+							this.tableData = res.data.articles
+                            this.Total = res.data.count
+						}
+					})
+					.catch(err => {
+						console.log(err);
+					});
+			},
+            // 分页导航
+			handlePageChange(val) {
+				this.$set(this.query, 'pageIndex', val);
+				this.getData();
+			},
+            // 稿件信息展示
+			showdetaileditor(row) {
+				let stat_num = 'articleDetailEditor'
+				this.$router.push({
+					path: stat_num,
+					query: {
+						id: row.article_id,
+						mark:'rejectArticles'
+					}
+				});
+			},
+            // 标记弹出框
+			testedit(e) {
+				this.editbox = true;
+				this.remark.title = e.title;
+				this.remark.articleId = e.article_id;
+				this.remark.content = e.remarks;
+			},
+            // 修改标记
+			saveRemark() {
+				this.$api.post('api/Article/editArticleRemark', this.remark)
+					.then(res => {
+						if (res.code == 0) {
+							this.$message.success('success');
+							this.editbox = false;
+							this.getData();
+						} else {
+							this.$message.error(res.msg);
+						}
+					});
+			},
+						
+		},
+        mounted(){
+             this.journal_type = journal_type1.journal_type
+            // console.log(this.journal_type, this.journal_type1)
+        }
+	};
+</script>
+
+<style scoped>
+	.tab_all {
+		border-bottom: 1px solid #ddd;
+	}
+
+	.tab_Normal {
+		font-size: 15px;
+		border: 1px solid #fff;
+		border-top: 3px solid #fff;
+		border-bottom: none;
+		float: left;
+		margin: 10px 0 -1px 0;
+		padding: 20px 30px;
+		cursor: pointer;
+		background-color: #fafafa;
+	}
+
+	.tab_Normal:hover {
+		text-decoration: underline;
+
+	}
+
+	.tab_Select {
+		background-color: #fff;
+		border: 1px solid #ddd;
+		border-top: 3px solid #6dafcf;
+		border-bottom: 1px solid #fff;
+	}
+
+	.tab_Select:hover {}
+</style>
diff --git a/src/components/page/articleAdd.vue b/src/components/page/articleAdd.vue
index 53aa0ef..c652074 100644
--- a/src/components/page/articleAdd.vue
+++ b/src/components/page/articleAdd.vue
@@ -112,6 +112,14 @@
 							<el-input type="textarea" rows="5" v-model="form.abstrart"
 								placeholder="Please enter the abstract"></el-input>
 						</el-form-item>
+						<!-- 话题 -->
+						<el-form-item label="Topics :" prop="topics">
+							<el-cascader disabled class="formTopics" @change="topicsChange"
+							v-model="form.topics"
+							:options="topicsList"
+							:props="topicsProps"
+							clearable></el-cascader>
+						</el-form-item>
 						<el-form-item label="Key words :">
 							<el-input v-for="(item, index) in keywordsList" :key="index" :name="index + 1"
 								v-model="item.ke" :placeholder="'Key words' + (index + 1)"
@@ -615,7 +623,8 @@
 					coverLetter: '',
 					picturesAndTables: '',
 					totalpage: '',
-					manuscirpt: ''
+					manuscirpt: '',
+					topics:null
 				},
 				journal_type: [{
 					name: 'ARTICLE',
@@ -831,6 +840,14 @@
 				},
 				mj_jour: [],
 				jour_name: '',
+				topicsList:null,  // 话题列表
+				topicsProps:{
+					multiple: true,
+					emitPath: false, // 只返回该节点的值
+					value: "journal_topic_id", // 自定义要映射的键名
+					label: "title",
+					children: "children",
+				}
 			};
 		},
 		watch: {
@@ -848,6 +865,7 @@
 				this.Temporary()
 			} else {
 				this.initMajor();
+				this.getTopics()
 			}
 		},
 		computed: {
@@ -1528,6 +1546,7 @@
 				this.form.istransfer = false
 				this.form.becomeRev = false
 				this.initMajor();
+				this.getTopics()
 			},
 
 			// 点击tab变化
@@ -1815,6 +1834,7 @@
 						'article_id': this.stagingID
 					})
 					.then((res) => {
+						console.log(res, '已经保存的值')
 						if (res.code == 0) {
 							// 基本信息
 							this.form.journal = res.data.base.journal_id
@@ -1823,6 +1843,7 @@
 							this.form.approval = res.data.base.approval
 							this.form.abstrart = res.data.base.abstrart
 							this.form.fund = res.data.base.fund
+							this.form.topics = res.data.base.topics							
 							// 领域
 							this.$api
 								.post('api/Major/getMajorForAddArticle', {
@@ -1913,12 +1934,36 @@
 			// 选择
 			chanSelt() {
 				this.$forceUpdate()
+			},
+
+			// 获取话题
+			getTopics(){
+				this.$api	
+				.post('api/Article/getJournalTopics', {'journal_id': this.Reviewerof.journal})
+				.then((res) => {
+					if (res.code == 0) {
+						this.topicsList = res.data.topics
+						console.log(res.data.topics,'话题')
+					} else {
+						this.$message.error(res.msg);
+					}
+				});
+			},
+			// 选中值变化
+			topicsChange(e){
+				console.log(this.form.topics,'选中的话题id')
 			}
 
 		}
 	};
 </script>
 
+<style scoped>
+	.formTopics{
+		width: 100%;
+	}
+</style>
+
 <style>
 	.author-box {
 		width: 150%;
diff --git a/src/components/page/articleDetailEditor.vue b/src/components/page/articleDetailEditor.vue
index 705fe05..d1cb877 100644
--- a/src/components/page/articleDetailEditor.vue
+++ b/src/components/page/articleDetailEditor.vue
@@ -189,7 +189,26 @@
 							</el-row>
 						</div>
 					</div>
-					<div class="art_caozuo_">
+					<!-- 被拒稿件操作 -->					
+					<div class="art_caozuo_" v-if="opname == 'rejectArticles'">
+						<p>
+							<span>Status : </span>
+							<b>{{articleState}}</b>							
+						</p>
+						<p>
+							<span>Remarks : </span>
+							<b>{{form.remarks}}</b>							
+						</p>
+						<p>
+							<span>Repetition : </span>
+							<b>{{form.repetition}}%</b>							
+						</p>
+						<!--<br clear="both">
+							 <el-button type="primary" @click="showResubmit" style="margin: 15px 0 0 0;">Resubmit the manuscript
+						</el-button>						 -->
+					</div>
+					<!-- 常规稿件操作 -->	
+					<div class="art_caozuo_" v-else>
 						<p>
 							<span>Status : </span>
 							<b>{{articleState}}</b>
@@ -349,6 +368,24 @@
 				<el-button type="primary" @click="saveRepe">Save</el-button>
 			</span>
 		</el-dialog>
+		<el-dialog title="Resubmit the manuscript" :visible.sync="resubmitVisible" width="550px" v-loading="loading4">
+			<el-form ref="resubmitJournal" :model="resubmitJournal" label-width="120" :rules="Resubmitrules">
+				<el-form-item label="journal"  prop="journalId">
+					<el-select v-if="editorJournalList.length > 0" v-model="resubmitJournal.journalId" filterable placeholder="Please select a manuscript">
+						<el-option
+						v-for="item in editorJournalList"
+						:key="item.journal_id"
+						:label="item.title"
+						:value="item.journal_id">
+						</el-option>
+					</el-select>
+				</el-form-item>	
+			</el-form>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="closeResubmit">Cancel</el-button>
+				<el-button type="primary" @click="saveResubmit">Save</el-button>
+			</span>
+		</el-dialog>
 	</div>
 </template>
 
@@ -368,8 +405,10 @@
 				loading1: false,
 				loading2: false,
 				loading3: false,
+				loading4: false,
 				editVisible: false,
 				editbox: false,
+				resubmitVisible:false,
 				repebox: false,
 				HEditVisible: false,
 				HIxForm: {
@@ -458,7 +497,19 @@
 					user_id: '',
 					ad_content: ''
 				},
-				talkMsgs: []
+				talkMsgs: [],
+				opname:'',        // 稿件详细类型
+				editorJournalList:[],  // 编辑期刊列表
+				resubmitJournal:{
+					journalId:null   , // 转投期刊的id
+					manuscriptId:null,  // article id
+				},
+				Resubmitrules:{					
+					journalId: [
+						{ required: true, message: 'Please select the name of the journal to be forwarded to' }
+					]
+				}
+				 
 			};
 		},
 		created: function() {
@@ -944,7 +995,47 @@
 					.catch(err => {
 						console.log(err);
 					});
+			},
+			// 显示转投稿件弹窗
+			showResubmit(){
+				this.loading4 = true
+				
+				this.$api.post('api/Journal/getJournalByeditor', {'user_id':localStorage.getItem('U_id')})
+					.then(res => {
+						this.loading4 = false;
+						this.editorJournalList = res.data.journals
+						console.log(res)
+						this.resubmitVisible = true
+					})
+					.catch(err => {
+						console.log(err);
+					});
+				
+				
+			},
+			// 提交转投稿件
+			saveResubmit(){
+				// 验证表单
+				this.$refs['resubmitJournal'].validate((valid) => {
+					if (valid) {
+						alert('submit!');
+						console.log(this.resubmitJournal)
+					} else {
+						console.log('error submit!!');
+						return false;
+					}
+				});
+			},
+			// 关闭弹窗
+			closeResubmit(){
+				this.resubmitVisible = false,
+				this.$refs['resubmitJournal'].resetFields()
 			}
+						
+		},
+		mounted(){
+			this.opname = this.$route.query.mark
+			this.resubmitJournal.manuscriptId = this.$route.query.id			
 		}
 	};
 </script>
diff --git a/src/components/page/journallist.vue b/src/components/page/journallist.vue
index bfeeb09..61d4364 100644
--- a/src/components/page/journallist.vue
+++ b/src/components/page/journallist.vue
@@ -10,7 +10,7 @@
 		<div class="container">
 			<div class="handle-box">
 				<el-button type="primary" icon="el-icon-plus" @click="addJournal">Add Journal</el-button>
-			</div>
+			</div>			
 			<el-table :data="tableData" border stripe class="table" ref="multipleTable"
 				header-cell-class-name="table-header" empty-text="New messages (0)">
 				<el-table-column prop="journal_id" label="ID" align="center" width="50"></el-table-column>
diff --git a/src/router/index.js b/src/router/index.js
index 5a7c384..c1876ef 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -871,6 +871,13 @@ export default new Router({
 						title: 'Mailbox template'
 					}
 				},
+				{
+					path: '/RejectedArticles', //被拒稿件汇总
+					component: () => import('../components/page/RejectedArticles'),
+					meta: {
+						title: 'Rejected Manuscripts'
+					}
+				},
 				{
 					path: '/404',
 					component: () => import( /* webpackChunkName: "404" */
diff --git a/vue.config.js b/vue.config.js
index 852995e..d5f5f32 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,7 +4,7 @@ module.exports = {
 	assetsDir: 'static',
 	productionSourceMap: false,
 	devServer: {
-		public: 'http://192.168.110.156:8080/', // 你自己本地的ip地址:端口号
+		public: 'http://192.168.110.159:8080/', // 你自己本地的ip地址:端口号
 		// port: '8080',
 		// open: true,
 		// overlay: {

From 3f5e9a0502b0b5d399f3054e45ba68b192c835c8 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 7 Jun 2023 09:47:55 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E6=8B=92=E7=A8=BF=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/comment.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/page/comment.vue b/src/components/page/comment.vue
index 58791ee..3b2e3c7 100644
--- a/src/components/page/comment.vue
+++ b/src/components/page/comment.vue
@@ -20,7 +20,7 @@
 					<i class="iconfont icon-comment"></i>
 					<span>回复</span>
 				</span>
-			</div> -->
+			</div> --->
 			<!-- <div class="reply">
 				<div class="item" v-for="reply in item.reply">
 					<div class="reply-content">

From 3ff7b783aef7d47e1c113e0a87241f91604516ff Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 7 Jun 2023 09:52:16 +0800
Subject: [PATCH 03/11] 09.52

---
 src/components/page/RejectedArticles.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/page/RejectedArticles.vue b/src/components/page/RejectedArticles.vue
index 6336f0e..243dcd9 100644
--- a/src/components/page/RejectedArticles.vue
+++ b/src/components/page/RejectedArticles.vue
@@ -39,7 +39,7 @@
 					<div style="text-align: center;">
 						<el-button size="mini" type="primary" plain icon="el-icon-message"
 							@click="linkEmail(scope.row)">Email</el-button>
-					</div> -->
+					</div> --->
 				</template>
 			</el-table-column>			
 			<el-table-column label="Remarks" align="center">

From 70dcce2570b8e46780f59a065831baef997b669e Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 7 Jun 2023 09:54:59 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E6=8B=92=E7=A8=BF=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/RejectedArticles.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/page/RejectedArticles.vue b/src/components/page/RejectedArticles.vue
index 243dcd9..ab01ea6 100644
--- a/src/components/page/RejectedArticles.vue
+++ b/src/components/page/RejectedArticles.vue
@@ -32,7 +32,7 @@
                         <el-option v-for="item in journal_type" :key="item.value" :label="item.name"
 									:value="item.value"></el-option>
                     </el-select>
-					<!-- <div style="text-align: center;margin-bottom: 10px;" v-if="scope.row.emailh==1">
+					<!--- <div style="text-align: center;margin-bottom: 10px;" v-if="scope.row.emailh==1">
 						<el-button size="mini" type="primary" plain icon="el-icon-chat-dot-square"
 							@click="linkEmailist(scope.row)">History</el-button>
 					</div>

From 997bbaacc5ad0400506b29173e0f5db84ee43563 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 7 Jun 2023 09:59:28 +0800
Subject: [PATCH 05/11] 09.59

---
 src/components/page/articleDetailEditor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/page/articleDetailEditor.vue b/src/components/page/articleDetailEditor.vue
index d1cb877..4382c7e 100644
--- a/src/components/page/articleDetailEditor.vue
+++ b/src/components/page/articleDetailEditor.vue
@@ -189,7 +189,7 @@
 							</el-row>
 						</div>
 					</div>
-					<!-- 被拒稿件操作 -->					
+					<!-- 被拒稿件操作 --->					
 					<div class="art_caozuo_" v-if="opname == 'rejectArticles'">
 						<p>
 							<span>Status : </span>

From 6746dbea5dd179219226b7aa0984ad5001111b12 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 7 Jun 2023 11:06:51 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AF=9D=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                         | 1 +
 src/components/page/articleAdd.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d4cc40c..abdb8e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 /dist
 example.html
+.vue.config
 favicon.ico
 # local env files
 .env.local
diff --git a/src/components/page/articleAdd.vue b/src/components/page/articleAdd.vue
index c652074..3c8ebbc 100644
--- a/src/components/page/articleAdd.vue
+++ b/src/components/page/articleAdd.vue
@@ -113,13 +113,13 @@
 								placeholder="Please enter the abstract"></el-input>
 						</el-form-item>
 						<!-- 话题 -->
-						<el-form-item label="Topics :" prop="topics">
+						<!-- <el-form-item label="Topics :" prop="topics">
 							<el-cascader disabled class="formTopics" @change="topicsChange"
 							v-model="form.topics"
 							:options="topicsList"
 							:props="topicsProps"
 							clearable></el-cascader>
-						</el-form-item>
+						</el-form-item> -->
 						<el-form-item label="Key words :">
 							<el-input v-for="(item, index) in keywordsList" :key="index" :name="index + 1"
 								v-model="item.ke" :placeholder="'Key words' + (index + 1)"

From ff3625eac24f4bd1979d8a30fe259780b7f07bf1 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 7 Jun 2023 11:37:23 +0800
Subject: [PATCH 07/11] 1

---
 .gitignore        |  1 +
 package-lock.json | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/.gitignore b/.gitignore
index abdb8e3..00ed383 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ yarn-error.log*
 *.sln
 *.sw*
 node_modules
+/package-lock.json
diff --git a/package-lock.json b/package-lock.json
index 7fb98cc..9d228f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2421,6 +2421,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -5440,6 +5449,12 @@
         "node": ">= 4"
       }
     },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "optional": true
+    },
     "node_modules/filesize": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -7768,6 +7783,12 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "node_modules/nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "optional": true
+    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -15213,6 +15234,15 @@
       "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
       "optional": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -17777,6 +17807,12 @@
         }
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "optional": true
+    },
     "filesize": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -19659,6 +19695,12 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "optional": true
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",

From da4acd8831c3c02a0cc3e9cf3d9aaebe2a51a97f Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 7 Jun 2023 13:35:10 +0800
Subject: [PATCH 08/11] test

---
 src/components/page/articleAdd.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/page/articleAdd.vue b/src/components/page/articleAdd.vue
index 1387684..a2f7194 100644
--- a/src/components/page/articleAdd.vue
+++ b/src/components/page/articleAdd.vue
@@ -76,6 +76,7 @@
 								<el-option v-for="item in journal_type" :key="item.value" :label="item.name"
 									:value="item.value"></el-option>
 							</el-select>
+							
 						</el-form-item>
 						<el-form-item label="Major :" :required="true" prop="major_a">
 							<el-select v-model="form.major_a" placeholder="Please select major" @change="majorChange(1)"

From c06db333db33462022525de8e08180e0d5ae770f Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 7 Jun 2023 13:43:35 +0800
Subject: [PATCH 09/11] 1

---
 src/components/page/articleAdd.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/page/articleAdd.vue b/src/components/page/articleAdd.vue
index a2f7194..cc0815b 100644
--- a/src/components/page/articleAdd.vue
+++ b/src/components/page/articleAdd.vue
@@ -662,12 +662,9 @@
 					picturesAndTables: '',
 					totalpage: '',
 					manuscirpt: '',
-<<<<<<< HEAD
 					supplementary: '',
 					code: ''
-=======
 					topics:null
->>>>>>> remotes/origin/xie
 				},
 				journal_type: [{
 					name: 'ARTICLE',

From 2f2dfde66666c4d1429d51c3cbd18626782b56a5 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 7 Jun 2023 13:47:41 +0800
Subject: [PATCH 10/11] 1

---
 src/components/page/articleAdd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/page/articleAdd.vue b/src/components/page/articleAdd.vue
index cc0815b..1e54af0 100644
--- a/src/components/page/articleAdd.vue
+++ b/src/components/page/articleAdd.vue
@@ -663,7 +663,7 @@
 					totalpage: '',
 					manuscirpt: '',
 					supplementary: '',
-					code: ''
+					code: '',
 					topics:null
 				},
 				journal_type: [{

From 9bafd3ce93acff20e7906dcc32e2a2f1cfa96efe Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 7 Jun 2023 13:49:02 +0800
Subject: [PATCH 11/11] 1

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 00ed383..259f788 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ yarn-error.log*
 *.sw*
 node_modules
 /package-lock.json
+/vue.config.js