Merge branch 'xie-accept'

src/components/page/PreIngestedEditor.vue

@@ -47,7 +47,7 @@
 			<div :ref="tabsList[0].refName" class="scroll-item">
 				<div class="bor_style_onli">
 					<h4>{{tabsList[0].name}}</h4>
-					<div class="liter_ture">
+					<div class="liter_ture" v-if="0==2">
 						<div class="chanSelLef">
 							<!-- 1 -->
 							<div :class="showB_step ==1?'C_style':''">
@@ -171,6 +171,7 @@
 							</div>
 						</div>
 					</div>
+					<editPublicRefRdit ref="editPublicRefRdit" :chanFerForm = 'chanFerForm' :gridData = 'gridData' :p_article_id='p_article_id' @ChanFerMashUp="ChanFerMashUp" @refrashComp="refrashComp" @changeRefer="changeRefer"></editPublicRefRdit>					
 				</div>
 			</div>
 
@@ -285,14 +286,15 @@
 				{{msgform.title}}
 			</p> -->
 			<div class="talkDialog">
-				<timetalk :talkMsgs="talkMsgs" :msgform="msgform" @talksave="getTalkList"></timetalk>
+				<timetalk :talkMsgs="talkMsgs" :msgform="msgform" @talksave="getTalkList" ></timetalk>
 			</div>
 		</el-dialog>
 
 	</div>
 </template>
 
-<script>
+<script>    
+	import editPublicRefRdit from './editPublicRefRdit'        // 公共引用编辑页面
 	import 'quill/dist/quill.core.css';
 	import 'quill/dist/quill.snow.css';
 	import 'quill/dist/quill.bubble.css';
@@ -533,7 +535,7 @@
 				editFomauthor: {},
 				addFomschool: {},
 				editFomschool: {},
-				showB_step: 1,
+				
 				chanFerForm: [],
 				refProcess: 0,
 				refReal: 0,
@@ -700,7 +702,12 @@
 			// this.getWorldPdf();
 
 		},
-		methods: {            
+		methods: {  
+			// 刷新引用组件
+			refrashComp(){
+				this.$refs.editPublicRefRdit.$forceUpdate()
+				console.log('editPublicRefRdit')
+			},          
 			// 跳转邮件
 			linkEmail() {
 				this.$router.push({
@@ -886,6 +893,9 @@
 								this.showB_step = 2
 							}
 						}
+						this.$nextTick(()=>{ // 更新引用列表
+							this.$refs.editPublicRefRdit.init(this.chanFerForm)
+						})
 					})
 					.catch(err => {
 						console.log(err);
@@ -1396,6 +1406,7 @@
 
 			// 5----重新获取加载参考文献
 			changeRefer(val) {
+				console.log('重新获取参考文献')
 				this.$api
 					.post('api/Production/getReferList', {
 						'p_article_id': this.p_article_id
@@ -1410,6 +1421,7 @@
 					.catch(err => {
 						console.log(err);
 					});
+					
 			},
 
 
@@ -2175,7 +2187,8 @@
 		},
 		components: {
 			quillEditor,
-			timetalk
+			timetalk,
+			editPublicRefRdit
 		},
 	}
 </script>