From b230e61de9c23301887b83e47bdf82953b5f0124 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 29 Jun 2023 18:02:21 +0800
Subject: [PATCH] =?UTF-8?q?18=EF=BC=9A02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/Complete_profile.vue    |  80 +++++++----
 src/components/page/PreIngestedEditor.vue   | 140 ++++++++++++++------
 src/components/page/ReferenceEditor.vue     |   7 +-
 src/components/page/articleList.vue         |   6 +-
 src/components/page/articleListEditor_A.vue |   9 +-
 src/components/page/time_talk.vue           |  11 +-
 src/router/index.js                         |   2 +
 7 files changed, 174 insertions(+), 81 deletions(-)

diff --git a/src/components/page/Complete_profile.vue b/src/components/page/Complete_profile.vue
index 3395ddd..5ba1ce2 100644
--- a/src/components/page/Complete_profile.vue
+++ b/src/components/page/Complete_profile.vue
@@ -14,21 +14,18 @@
     <!-- 内容 -->
     <el-row :gutter="20" class="content_box mt20">
         <!-- 文章引用 -->             
-        <el-col class="item borderBottom passStatus">
-            <div class="" style="margin: 20px 0;">
-                <h4>Add Reference <span class="el-icon-check pass status"> Pass</span></h4>
-               <p class="mt20">Please proofread against the reference documents identified by the system, you can modify the content of existing documents, you can modify the ordering of adjacent items, and you can add your reference entries.</p>
-               <p class="mt10"><img src="../../assets/img/icon_9.png" alt="" class="icon_img"> <el-link @click="goAddReferences(thisArtcleId)" type="primary" >&nbsp; &nbsp;Click here to edit</el-link> </p> 
+        <el-col :class="['item', 'borderBottom', Ainfo.refer_state.state? 'passborder' : 'notPassborder']">            
+                <h5 :class="['statusTop', Ainfo.refer_state.state? 'passStatus' : 'notPassStatus']">
+                    <span v-if="Ainfo.refer_state.state" class="el-icon-check pass status"> Complete</span>
+                    <span v-else class="el-icon-pie-chart notPass status"> Pending</span>
+                </h5>
+            <div class="con">
+                <h4>References </h4>
+               <p class="mt20">The references for this article have been compiled <i class="tip">{{Ainfo.refer_state.num}}</i> entries recorded in total.</p>
+               <!-- <p class="mt10"><img src="../../assets/img/icon_9.png" alt="" class="icon_img"> <el-link @click="goAddReferences(thisArtcleId)" type="primary" >&nbsp; &nbsp;Click here to edit</el-link> </p>  -->
+               <p class="mt10"><el-button @click="goAddReferences(thisArtcleId)" icon="el-icon-edit" type="text">Edit</el-button></p>
             </div>              
-        </el-col> 
-        <el-col class="item notPassStatus">
-            <div class="" style="margin: 20px 0;">
-                <h4>Add Reference  <span class="el-icon-pie-chart notPass status"> Some information needs to be improved</span>   </h4>
-               <p class="mt20">Please proofread against the reference documents identified by the system, you can modify the content of existing documents, you can modify the ordering of adjacent items, and you can add your reference entries.</p>
-               <p class="mt10"><img src="../../assets/img/icon_9.png" alt="" class="icon_img"> <el-link @click="goAddReferences(thisArtcleId)" type="primary" >&nbsp; &nbsp;Click here to edit</el-link> </p> 
-            </div>
-                   
-        </el-col>    
+        </el-col>         
     </el-row>
     <!-- 答疑 -->
     <div class="mt20 helpcontent">
@@ -36,10 +33,7 @@
             <span class="el-icon-info help"></span>
             <div>
                 <h4>Any questions/Help</h4>
-                <p class="mt20">If you do not understand the operation items on this page or need help, you can find us in the following ways:</p>
-                <p class="mt20">- Way one</p>
-                <p class="mt10">- Way two</p>
-                <p class="mt10">- Way three</p>
+                <p class="mt20">If you experience any problems, please contact us by <i class="tip">publisher@tmrjournals.com</i></p>                
             </div>
         </div>
     </div>
@@ -53,10 +47,17 @@
             user_name: localStorage.getItem('U_relname'),
             thisArtcleId: this.$route.query.id,
             // 引用表单数据
-            ReferenceList:[]
+            ReferenceList:[],
+            Ainfo:{
+                refer_state:{
+                    state:null,
+                    num: null
+                }
+            }
         }
       },
       created() {
+        this.getInfoStatu()
       },
       methods:{
         // 跳转到引用编辑页面
@@ -67,23 +68,50 @@
                           id: id
                       }
                   });
+        },
+
+        // 获取资料状态
+        getInfoStatu(){
+            this.$api
+            .post('/api/Article/getPreacceptStatus', {
+						'article_id': this.$route.query.id
+					})
+					.then(res => {
+                        if(res.code == 0){
+						    // console.log(res, 'res')
+                            this.Ainfo = {
+                                refer_state:{
+                                    state: res.data.refer_state.state,
+                                    num:res.data.refer_state.num
+                                }
+                            }
+                        }
+					})
+					.catch(err => {
+						console.log(err);
+					});
         }
       }
   }
   </script>
   
   <style  scoped>
+  .tip{background: #e6effb; padding: 4px; font-style: normal; border-radius:10px ;}
+  .passborder{border:1px solid #f0f9eb;}
+  .notPassborder{border:1px solid #fdf6ec;}
+  .con{padding: 20px;}
+  .statusTop{height:30px;}
     .borderBottom{ border-bottom:1px solid  #f1f1f1; margin-bottom: 20px; }    
     .help{font-size: 22px; margin-right: 10px;}
     .el-alert__title{font-size: 26px;}
     .mt20{margin-top: 20px;}
-    .content_box{padding:15px 10px; border:3px dashed  #eff6ff;  }
-    .content_box .item{position: relative; padding-left: 20px !important;}
-    .passStatus{ border-left:solid 5px #67C23A;}
-    .notPassStatus{border-left:solid 5px #e6a23c;}
-    .content_box .item .status{ padding: 5px ; border-radius: 5px; font-size: 12px;}
-    .content_box .item .status.pass{background: #f0f9eb; color: #67C23A;}
-    .content_box .item .status.notPass{background: #fdf6ec; color: #e6a23c;}
+    /* .content_box{padding:15px 10px; border:3px dashed  #eff6ff;  } */
+    .content_box .item{padding: 0 !important; border-radius: 20px 20px 0 0; overflow: hidden;}
+    .passStatus{ background:  #f0f9eb;}
+    .notPassStatus{background:  #fdf6ec;}
+    .content_box .item .status{  font-size: 16px; padding:0 10px; line-height: 30px; }
+    .content_box .item .status.pass{ color: #67c23a;}
+    .content_box .item .status.notPass{ color: #e6a23c;}
     .flexbox{display: flex;}
     p{color: #333;}
     .mt10{margin-top: 10px;}
diff --git a/src/components/page/PreIngestedEditor.vue b/src/components/page/PreIngestedEditor.vue
index 81c2584..35f6845 100644
--- a/src/components/page/PreIngestedEditor.vue
+++ b/src/components/page/PreIngestedEditor.vue
@@ -9,17 +9,27 @@
 				</h5>
 				<p>{{item.rongCont}}</p>
 				<!-- <div class="line"></div> -->
-			</div>
-			<!-- 作者联系 -->
-			<div class="contactAuthor">
-				
-			</div>
+			</div>			
 			<div style="margin: 30px 0 0 0;">
 				<el-button type="primary" @click="pushToAccept(detailMes)" style="width: 220px;">
 					<i class="el-icon-finished"></i>
 					Push To Accept
 				</el-button>
 			</div>
+			<!-- 作者联系 -->
+			<div class="contactAuthor">
+				<h4>Contact author</h4>
+				<p>→  Send email
+					<b @click="linkEmail" class="btnCliArt" style="margin-left: 15px;">
+						<i class="el-icon-message"></i>
+					</b>	
+				</p>
+				<p style=" margin-top: 10px;">→  Chat width communication
+					<b @click="chatcommunication" class="btnCliArt" style="margin-left: 15px;">
+						<i class="el-icon-chat-line-square"></i>
+					</b>	
+				</p>				
+			</div>
 		</div>
 
 		<div class="scroll-content guanSty" @scroll="onScroll"
@@ -268,6 +278,16 @@
 			</span>
 		</el-dialog>
 
+		<el-dialog  title="" :visible.sync="communVisible" width="800px" >
+			<!-- <p
+				style="word-break: normal;margin-bottom: 20px;font-size: 15px;font-weight: bold;letter-spacing: -0.5px;line-height: 22px;">
+				{{msgform.title}}
+			</p> -->
+			<div class="talkDialog">
+				<timetalk :talkMsgs="talkMsgs" :msgform="msgform" @talksave="getTalkList"></timetalk>
+			</div>
+		</el-dialog>
+
 	</div>
 </template>
 
@@ -281,9 +301,18 @@
 	import {
 		Loading
 	} from 'element-ui';
+	import timetalk from './time_talk'
 	export default {
 		data() {
 			return {
+				talkMsgs: [],
+				communVisible:false,
+				msgform: {
+					username: localStorage.getItem('U_name'),
+					article_id: this.$route.query.id,
+					user_id: this.$route.query.uid,
+					ad_content: '',					
+				},				
 				baseUrl: this.Common.baseUrl,
 				mediaUrl: this.Common.mediaUrl,
                 article_id: this.$route.query.id,   // 文章id
@@ -664,44 +693,42 @@
 			window.addEventListener('resize', this.getHight);
 			// this.getData();
 			this.getArtcleDetails()
+			this.getTalkList()
 			// this.getAuthorJG();
 			// this.getCount();
 			// this.getWorldPdf();
 
 		},
 		methods: {            
-			// allLoad() {
-			// 	let excelList = [
-			// 		'https://submission.tmrjournals.com/public/manuscirpt/20220831/c7d75d49bf25cf56906d56d07e00a31e.docx',
-			// 		'https://submission.tmrjournals.com/public/manuscirpt/20220925/d1106d60fbfa04e900e98aacb5fdf71a.docx'
-			// 	]
-			// 	for (let i = 0; i < excelList.length; i++) {
-			// 		if (i == 0) {
-			// 			const a_b = document.createElement('a');
-			// 			a_b.href = excelList[i];
-			// 			a_b.download = '1world.docx';
-			// 			console.log(a_b)
-			// 			a_b.click()
-			// 			setTimeout(() => {
-			// 				a_b.remove();
-			// 			}, 1000);
-			// 		}
-			// 		if (i == 1) {
-			// 			setTimeout(() => {
-			// 				const c_d = document.createElement('a');
-			// 				c_d.href = excelList[i];
-			// 				c_d.download = '2world.docx';
-			// 				console.log(c_d)
-			// 				c_d.click()
-			// 				setTimeout(() => {
-			// 					c_d.remove();
-			// 				}, 1000);
-			// 			}, 2000);
-			// 		}
-			// 	}
-			// },
-            // 获取p_article_id的值
-            
+			// 跳转邮件
+			linkEmail() {
+				this.$router.push({
+					path: 'articleDetailEmail',
+					query: {
+						id: this.article_id
+					}
+				});
+			},			
+			
+			// 显示即时聊天创口
+			chatcommunication(){
+				console.log(this.msgform)				
+				this.communVisible = true				
+			},
+			// 获取留言列表
+			getTalkList(){				
+				this.$api
+					.post('api/Article/getArticleDialogs', {
+						article_id: this.$route.query.id
+					})
+					.then((res) => {
+						this.talkMsgs = res.data.dialogs;
+					})
+					.catch((err) => {
+						console.log(err);
+					});
+			},
+            // 获取p_article_id的值            
 			getArtcleDetails(){
 				// 获得文章详情
 				const loading = this.$loading({
@@ -1946,8 +1973,26 @@
 				confirmButtonText: 'Yes',
 				cancelButtonText: 'Cancle',
 				type: 'warning'
-				}).then(() => {
-					this.$message.error('还没对接接口')
+				}).then(() => {					
+					this.$api
+            		.post('api/Article/articleAccept', {
+						'article_id': this.$route.query.id
+					})
+					.then(res => {
+                        if(res.code == 0){
+						    // console.log(res, 'res')
+                           this.$message.success('successed!')
+						   setTimeout(()=>{
+							this.$router.push({
+								path: 'articleListEditor',
+								params: { state: 6 }
+                  			});
+						   },1000)
+                        }
+					})
+					.catch(err => {
+						console.log(err);
+					});
 				}).catch(() => {				         
 				});
                 
@@ -2128,12 +2173,25 @@
 			},
 		},
 		components: {
-			quillEditor
+			quillEditor,
+			timetalk
 		},
 	}
 </script>
 
+<style scoped>
+	.tab_post {width: 260px !important;}
+	.scroll-item{margin: 0 30px 50px 276px;}
+</style>
 <style>
+	.talkDialog{height: 500px; overflow-y: scroll;}
+
+	.contactAuthor{
+		margin-top: 50px; color: #8c939d; 
+	}
+	.contactAuthor>p{font-size: 12px; margin-left: 0 !important;}
+	.contactAuthor>p>.btnCliArt{color: #409EFF;}
+	.contactAuthor>h4{margin-bottom: 10px;}
 	.handle-box {
 		margin-bottom: 20px;
 	}
@@ -2147,7 +2205,7 @@
 		position: absolute;
 		left: 25px;
 		top: 60px;
-		width: 220px;
+		/* width: 220px; */
 		z-index: 50;
 	}
 
diff --git a/src/components/page/ReferenceEditor.vue b/src/components/page/ReferenceEditor.vue
index ea5fe80..d16a3cf 100644
--- a/src/components/page/ReferenceEditor.vue
+++ b/src/components/page/ReferenceEditor.vue
@@ -175,10 +175,8 @@
         <!-- 帮助信息 -->
         <el-dialog title="Any questions or Help" :visible.sync="helpVisible" width="500px">          
             <div>
-                    <p class="mt20">If you do not understand the operation items on this page or need help, you can find us in the following ways:</p>
-                    <p class="mt20">- Way one</p>
-                    <p class="mt10">- Way two</p>
-                    <p class="mt10">- Way three</p>
+                    <p class="mt20" style="line-height: 28px;">If you experience any problems, <br/>
+                        please contact us by <i class="tip">publisher@tmrjournals.com</i></p>                    
                 </div>
               <span slot="footer" class="dialog-footer">
                   <el-button @click="helpVisible = false" type="primary">OK</el-button>                  
@@ -640,6 +638,7 @@
   </script>
   
   <style  scoped> 
+ .tip{background: #e6effb; padding: 2px; font-style: normal; border-radius:10px ;}
   .wrongLine{ color: #f15f44;}
   .doiLink{color: #409EFF;}
   .editForm{background-color:#f9f9f9; padding: 20px 0; padding-right: 20px;}
diff --git a/src/components/page/articleList.vue b/src/components/page/articleList.vue
index 0b95cbd..4fb5e7c 100644
--- a/src/components/page/articleList.vue
+++ b/src/components/page/articleList.vue
@@ -92,7 +92,7 @@
 						<span @click="esy_deta(item.article_id)">
 							<i class="el-icon-paperclip"></i>My Manuscript
 						</span>
-						<span v-if="item.state == 3" style="text-decoration: none;">
+						<span v-if="item.state == 6" style="text-decoration: none;">
 							<font> | </font>
 							<span @click="goPre_ingested(item.article_id)" class="preButton">
 								<!-- <el-badge is-dot class="item" > -->
@@ -448,8 +448,8 @@
 				this.$router.push({
 					path: 'PreIngested',
 					query: {
-						// id: id
-						id: 3070
+						 id: id
+						// id: 3070
 					}
 				});
 			},
diff --git a/src/components/page/articleListEditor_A.vue b/src/components/page/articleListEditor_A.vue
index 109a4b3..50c8677 100644
--- a/src/components/page/articleListEditor_A.vue
+++ b/src/components/page/articleListEditor_A.vue
@@ -966,8 +966,9 @@
 					});
 			},
 			// 跳入预收录编辑页面			
-			changeEnter(val) {				
-				this.$router.push('/PreIngestedEditor?id=' + val.article_id);
+			changeEnter(val) {
+				console.log(val,'val')
+				this.$router.push({name: 'PreIngestedEditor', query: {id: val.article_id, uid:val.user_id}})
 			},
 			// 改变期刊
 			chageJour() {
@@ -1439,11 +1440,11 @@
 					});
 			},
 			// 留言板弹出层
-			articleCommun(e) {
+			articleCommun(e) {				
 				this.msgform.user_id = e.user_id
 				this.msgform.article_id = e.article_id
 				this.msgform.title = e.title
-				this.talkMsgs = []
+				this.talkMsgs = []				
 				this.$api
 					.post('api/Article/getArticleDialogs', {
 						article_id: e.article_id
diff --git a/src/components/page/time_talk.vue b/src/components/page/time_talk.vue
index 1b09ea6..a4b9906 100644
--- a/src/components/page/time_talk.vue
+++ b/src/components/page/time_talk.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-	import Vue from 'vue'
+	import Vue from 'vue'	
 	export default {
 		props: {
 			talkMsgs: {
@@ -85,10 +85,15 @@
 					.post('api/Article/pushArticleDialog', this.msgform)
 					.then((res) => {
 						this.loading = false;
-						this.$message.success('Sent successfully');
-						this.$router.go(0);
+						// this.$message.success('Sent successfully');
+						this.$emit('talksave',true) // 传递成功信号
+						// setTimeout(()=>{
+						// 	this.$router.go(0);
+						// },1000)
+						
 					});
 			},
+
 		}
 	}
 </script>
diff --git a/src/router/index.js b/src/router/index.js
index 67f73db..6546b0f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -900,9 +900,11 @@ export default new Router({
 						}
 				},
 				{
+					name:'PreIngestedEditor',
 					path: '/PreIngestedEditor', // 编辑端 - 预收录编辑页面
 						component: () => import('../components/page/PreIngestedEditor'),
 					meta: {
+						
 						title: 'PreIngestedEditor'
 						}
 				},