step 4 major数据变更

src/components/page/articleAdd.vue

@@ -487,8 +487,8 @@
 								</el-select>
 							</el-form-item>
 							<el-form-item label="Major :" prop="major_all">
-								<el-cascader :options="jl_major" v-model="item.major_all" :props="defaultParams"
-									placeholder="Please select major" style="width: 270px;" clearable></el-cascader>
+								<el-cascader :options="step4MajorList" v-model="item.major_all" :props="default4Params"
+									placeholder="Please select major" style="width: 270px;" clearable ></el-cascader>
 							</el-form-item>
 							<el-button :disabled="tuiJianForm.length==1" @click="onDeleteTuijian(item, index)"
 								type="danger" icon="el-icon-delete" class="shanchu_tj"></el-button>
@@ -665,7 +665,7 @@
 					manuscirpt: '',
 					supplementary: '',
 					code: '',
-					topics:null
+					// topics:null
 				},
 				journal_type: [{
 					name: 'ARTICLE',
@@ -874,12 +874,18 @@
 				companyList: [],
 				countrys: [],
 				majorList: [],
+				step4MajorList:[], // 第四步的major数据
 				jl_major: [],
 				defaultParams: {
 					label: 'title',
 					value: 'major_id',
 					children: 'children'
 				},
+				default4Params:{
+					label: 'major_title',
+					value: 'major_id',
+					children: 'children'
+				},
 				mj_jour: [],
 				jour_name: '',
 				topicsList:null,  // 话题列表
@@ -907,7 +913,7 @@
 				this.Temporary()
 			} else {
 				this.initMajor();
-				this.getTopics()
+				// this.getTopics()  获取话题列表
 			}
 		},
 		computed: {
@@ -1023,8 +1029,9 @@
 								this.$refs.tuiJianForm[i].validate(vali => {
 									if (vali) {
 										tuijian_yanzheng += 0
-										this.tuiJianForm[i].major = this.tuiJianForm[i].major_all[0]
-										this.tuiJianForm[i].cmajor = this.tuiJianForm[i].major_all[1]
+										//this.tuiJianForm[i].major = this.tuiJianForm[i].major_all[0]
+										this.tuiJianForm[i].major = this.tuiJianForm[i].major_all[this.tuiJianForm[i].major_all.length - 1]  
+										//this.tuiJianForm[i].cmajor = this.tuiJianForm[i].major_all[1]
 									} else {
 										tuijian_yanzheng += 1
 									}
@@ -1186,7 +1193,6 @@
 							})
 						}
 					});					
-
 				this.$api
 					.post('/api/Reviewer/getMajorForReviewer', {
 						username: localStorage.getItem('U_name'),
@@ -1196,6 +1202,7 @@
 								.post('api/User/getMajorList')
 								.then(res => {
 									this.majorList = res.data;
+									
 								})
 						}
 					})
@@ -1211,6 +1218,14 @@
 
 				this.checkReviewer()
 
+				this.$api
+				.post('api/Major/getMajorList')
+				.then(res => {
+					console.log(res,99)
+					 this.step4MajorList = res.data.majors;
+									
+				})
+
 			},
 
 			// 机构模糊搜索
@@ -1634,7 +1649,7 @@
 				this.form.istransfer = false
 				this.form.becomeRev = false
 				this.initMajor();
-				this.getTopics()
+				// this.getTopics()
 			},
 
 			// 点击tab变化
@@ -1951,7 +1966,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.form.topics = res.data.base.topics							
 							// 领域
 							this.$api
 								.post('api/Major/getMajorForAddArticle', {
@@ -2055,7 +2070,7 @@
 				.then((res) => {
 					if (res.code == 0) {
 						this.topicsList = res.data.topics
-						console.log(res.data.topics,'话题')
+						// console.log(res.data.topics,'话题')
 					} else {
 						this.$message.error(res.msg);
 					}
@@ -2063,7 +2078,7 @@
 			},
 			// 选中值变化
 			topicsChange(e){
-				console.log(this.form.topics,'选中的话题id')
+				// console.log(this.form.topics,'选中的话题id')
 			}
 
 		}