18：02

src/components/page/Complete_profile.vue

@@ -14,21 +14,18 @@
     <!-- 内容 -->
     <el-row :gutter="20" class="content_box mt20">
         <!-- 文章引用 -->             
-        <el-col class="item borderBottom passStatus">
+        <el-col :class="['item', 'borderBottom', Ainfo.refer_state.state? 'passborder' : 'notPassborder']">            
-            <div class="" style="margin: 20px 0;">
+                <h5 :class="['statusTop', Ainfo.refer_state.state? 'passStatus' : 'notPassStatus']">
-                <h4>Add Reference <span class="el-icon-check pass status"> Pass</span></h4>
+                    <span v-if="Ainfo.refer_state.state" class="el-icon-check pass status"> Complete</span>
-               <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>
+                    <span v-else class="el-icon-pie-chart notPass status"> Pending</span>
-               <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> 
+                </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>         
-        <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-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">If you experience any problems, please contact us by <i class="tip">publisher@tmrjournals.com</i></p>                
-                <p class="mt20">- Way one</p>
-                <p class="mt10">- Way two</p>
-                <p class="mt10">- Way three</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{padding:15px 10px; border:3px dashed  #eff6ff;  } */
-    .content_box .item{position: relative; padding-left: 20px !important;}
+    .content_box .item{padding: 0 !important; border-radius: 20px 20px 0 0; overflow: hidden;}
-    .passStatus{ border-left:solid 5px #67C23A;}
+    .passStatus{ background:  #f0f9eb;}
-    .notPassStatus{border-left:solid 5px #e6a23c;}
+    .notPassStatus{background:  #fdf6ec;}
-    .content_box .item .status{ padding: 5px ; border-radius: 5px; font-size: 12px;}
+    .content_box .item .status{  font-size: 16px; padding:0 10px; line-height: 30px; }
-    .content_box .item .status.pass{background: #f0f9eb; color: #67C23A;}
+    .content_box .item .status.pass{ color: #67c23a;}
-    .content_box .item .status.notPass{background: #fdf6ec; color: #e6a23c;}
+    .content_box .item .status.notPass{ color: #e6a23c;}
     .flexbox{display: flex;}
     p{color: #333;}
     .mt10{margin-top: 10px;}

src/components/page/PreIngestedEditor.vue

@@ -9,17 +9,27 @@
 				</h5>
 				<p>{{item.rongCont}}</p>
 				<!-- <div class="line"></div> -->
-			</div>
+			</div>			
-			<!-- 作者联系 -->
-			<div class="contactAuthor">
-				
-			</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 = [
+			linkEmail() {
-			// 		'https://submission.tmrjournals.com/public/manuscirpt/20220831/c7d75d49bf25cf56906d56d07e00a31e.docx',
+				this.$router.push({
-			// 		'https://submission.tmrjournals.com/public/manuscirpt/20220925/d1106d60fbfa04e900e98aacb5fdf71a.docx'
+					path: 'articleDetailEmail',
-			// 	]
+					query: {
-			// 	for (let i = 0; i < excelList.length; i++) {
+						id: this.article_id
-			// 		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()
+			chatcommunication(){
-			// 			setTimeout(() => {
+				console.log(this.msgform)				
-			// 				a_b.remove();
+				this.communVisible = true				
-			// 			}, 1000);
+			},
-			// 		}
+			// 获取留言列表
-			// 		if (i == 1) {
+			getTalkList(){				
-			// 			setTimeout(() => {
+				this.$api
-			// 				const c_d = document.createElement('a');
+					.post('api/Article/getArticleDialogs', {
-			// 				c_d.href = excelList[i];
+						article_id: this.$route.query.id
-			// 				c_d.download = '2world.docx';
+					})
-			// 				console.log(c_d)
+					.then((res) => {
-			// 				c_d.click()
+						this.talkMsgs = res.data.dialogs;
-			// 				setTimeout(() => {
+					})
-			// 					c_d.remove();
+					.catch((err) => {
-			// 				}, 1000);
+						console.log(err);
-			// 			}, 2000);
+					});
-			// 		}
+			},
-			// 	}
+            // 获取p_article_id的值            
-			// },
-            // 获取p_article_id的值
-            
 			getArtcleDetails(){
 				// 获得文章详情
 				const loading = this.$loading({
@@ -1946,8 +1973,26 @@
 				confirmButtonText: 'Yes',
 				cancelButtonText: 'Cancle',
 				type: 'warning'
-				}).then(() => {
+				}).then(() => {					
-					this.$message.error('还没对接接口')
+					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;
 	}
 

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" style="line-height: 28px;">If you experience any problems, <br/>
-                    <p class="mt20">- Way one</p>
+                        please contact us by <i class="tip">publisher@tmrjournals.com</i></p>                    
-                    <p class="mt10">- Way two</p>
-                    <p class="mt10">- Way three</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;}

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: id
-						id: 3070
+						// id: 3070
 					}
 				});
 			},

src/components/page/articleListEditor_A.vue

@@ -966,8 +966,9 @@
 					});
 			},
 			// 跳入预收录编辑页面			
-			changeEnter(val) {				
+			changeEnter(val) {
-				this.$router.push('/PreIngestedEditor?id=' + val.article_id);
+				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

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.$message.success('Sent successfully');
-						this.$router.go(0);
+						this.$emit('talksave',true) // 传递成功信号
+						// setTimeout(()=>{
+						// 	this.$router.go(0);
+						// },1000)
+						
 					});
 			},
+
 		}
 	}
 </script>

src/router/index.js

@@ -900,9 +900,11 @@ export default new Router({
 						}
 				},
 				{
+					name:'PreIngestedEditor',
 					path: '/PreIngestedEditor', // 编辑端 - 预收录编辑页面
 						component: () => import('../components/page/PreIngestedEditor'),
 					meta: {
+						
 						title: 'PreIngestedEditor'
 						}
 				},