1.1.7-暂存

src/views/report_manage/reportEn/reportEditor.vue

@@ -114,6 +114,9 @@
 							<el-cascader
 								@change="userclassidreportdetail"
 								:options="optionsArr"
+								:props="{
+									children:'Child'
+								}"
 								v-model="aeForm.classifynameArr"
 								placeholder="类型筛选"
 								size="medium"
@@ -563,9 +566,10 @@ export default {
 		},
 
 		userclassidreportdetail() {
+			console.log(this.aeForm.classifynameArr,'this.aeForm.classifynameArr');
 			if (this.aeForm.add_type == 1) {
-				if (this.aeForm.classifynameArr.length == 2) {
-					this.aeForm.title = JSON.parse(this.aeForm.classifynameArr[1]).l;
+				if (this.aeForm.classifynameArr.length == 3) {
+					this.aeForm.title = JSON.parse(this.aeForm.classifynameArr[2]).l;
 				}else{
           this.aeForm.title = ''
         }
@@ -575,11 +579,11 @@ export default {
 				return false;
 			} 
 			let params = {
-				ClassifyIdFirst: JSON.parse(this.aeForm.classifynameArr[0]).v,
+				ClassifyIdFirst: JSON.parse(this.aeForm.classifynameArr[1]).v,
 			};
-			if (this.aeForm.classifynameArr.length === 2) {
+			if (this.aeForm.classifynameArr.length === 3) {
 				params.ClassifyIdSecond = JSON.parse(
-					this.aeForm.classifynameArr[1]
+					this.aeForm.classifynameArr[2]
 				).v;
 			} else {
 				params.ClassifyIdSecond = 0;
@@ -885,35 +889,61 @@ export default {
 			let params = { CurrentIndex: 1, PageSize: 1000, KeyWord: '' };
 			reportEnInterface.classifyList(params).then((res) => {
 				if (res.Ret == 200 && Array.isArray(res.Data.List)) {
-					this.optionsArr = [];
-					res.Data.List.forEach(item => {
-						let newitem = {
-							label: item.ClassifyName,
-							value: JSON.stringify({
-								l: item.ClassifyName,
-								v: parseInt(item.Id),
-							}),
-							HasTeleconference:item.HasTeleconference
-						};
-						if (item.Child&&item.Child.length > 0) {
-							let childnode = [];
-							item.Child.forEach((itemchild, i) => {
-								childnode.push({
-									label: itemchild.ClassifyName,
-									value: JSON.stringify({
-										l: itemchild.ClassifyName,
-										v: parseInt(itemchild.Id),
-									}),
-									HasTeleconference:itemchild.HasTeleconference
-								});
-							});
-							newitem.children = childnode;
-						} else {
-							newitem.children = undefined;
-							newitem.disabled=true
+					this.optionsArr = res.Data.List|| []
+					// res.Data.List.forEach(item => {
+					// 	let newitem = {
+					// 		label: item.ClassifyName,
+					// 		value: JSON.stringify({
+					// 			l: item.ClassifyName,
+					// 			v: parseInt(item.Id),
+					// 		}),
+					// 		HasTeleconference:item.HasTeleconference
+					// 	};
+					// 	if (item.Child&&item.Child.length > 0) {
+					// 		let childnode = [];
+					// 		item.Child.forEach((itemchild, i) => {
+					// 			childnode.push({
+					// 				label: itemchild.ClassifyName,
+					// 				value: JSON.stringify({
+					// 					l: itemchild.ClassifyName,
+					// 					v: parseInt(itemchild.Id),
+					// 				}),
+					// 				HasTeleconference:itemchild.HasTeleconference
+					// 			});
+					// 		});
+					// 		newitem.children = childnode;
+					// 	} else {
+					// 		newitem.children = undefined;
+					// 		newitem.disabled=true
+					// 	}
+					// 	this.optionsArr.push(newitem);
+					// });
+					this.optionsArr.map(itemOne =>{
+						itemOne.label = itemOne.ClassifyName
+						itemOne.value = JSON.stringify({
+							l: itemOne.ClassifyName,
+							v: parseInt(itemOne.Id),
+						})
+						itemOne.disabled = !(itemOne.Child && itemOne.Child.length>0)
+						if(itemOne.Child){
+							itemOne.Child.map(itemTwo =>{
+								itemTwo.label = itemTwo.ClassifyName
+								itemTwo.value = JSON.stringify({
+									l: itemTwo.ClassifyName,
+									v: parseInt(itemTwo.Id),
+								})
+								if(itemTwo.Child){
+									itemTwo.Child.map(itemThree =>{
+										itemThree.label = itemThree.ClassifyName
+										itemThree.value = JSON.stringify({
+											l: itemThree.ClassifyName,
+											v: parseInt(itemThree.Id),
+										})
+									})
+								}
+							})
 						}
-						this.optionsArr.push(newitem);
-					});
+					})
 				}
 			});
 		},

src/views/report_manage/reportEn/reportlist.vue

@@ -59,6 +59,11 @@
           <el-form-item label="">
             <el-cascader
               :options="optionsArr"
+              :props="{
+                value:'Id',
+                label:'ClassifyName',
+                children:'Child'
+              }"
               v-model="searchform.classifynameArr"
               clearable
               placeholder="类型筛选"
@@ -135,9 +140,9 @@
 								<span style="cursor:pointer; color:#4099ef;">{{row.Title}}</span>
 							  <span style="cursor:pointer; color:#4099ef;" v-if="row.CreateTime">({{row.CreateTime.substring(5,7)}}{{row.CreateTime.substring(8,10)}})</span>
 							</span>
-              <span v-else-if="item.key==='ClassifyNameFirst'">
-                {{row.ClassifyNameFirst}} 
-                <span v-if="row.ClassifyNameSecond">/ {{row.ClassifyNameSecond}}</span>
+              <span v-else-if="item.key==='FullClassifyName'">
+                {{row.FullClassifyName}} 
+                <!-- <span v-if="row.ClassifyNameSecond">/ {{row.ClassifyNameSecond}}</span> -->
               </span>
               <span v-else-if="item.key==='State'" :style="row.State===2 && 'color:#46C371;'">
                 {{row.State===2 ? '已发布' : '未发布'}}
@@ -424,7 +429,7 @@ export default {
 				},
         {
 					label: '报告类型',
-					key: 'ClassifyNameFirst',
+					key: 'FullClassifyName',
           minwidthsty: 120
 				},
         {
@@ -503,17 +508,18 @@ export default {
 			let params={CurrentIndex:0,PageSize:1000,KeyWord:''};
 			reportEnInterface.classifyList(params).then((res) => {
 				if( res.Ret==200&&Array.isArray(res.Data.List) ){
-					res.Data.List.forEach((item,index)=>{
-						let newitem={label:item.ClassifyName,value:item.ClassifyName};
-						if( item.Child ){
-							let childnode=[];
-							item.Child.forEach((itemchild,i)=>{
-								childnode.push({label:itemchild.ClassifyName,value:itemchild.ClassifyName});
-							});
-							newitem.children=childnode;
-						}
-						this.optionsArr.push(newitem);
-					});
+					// res.Data.List.forEach((item,index)=>{
+					// 	let newitem={label:item.ClassifyName,value:item.ClassifyName};
+					// 	if( item.Child ){
+					// 		let childnode=[];
+					// 		item.Child.forEach((itemchild,i)=>{
+					// 			childnode.push({label:itemchild.ClassifyName,value:itemchild.ClassifyName});
+					// 		});
+					// 		newitem.children=childnode;
+					// 	}
+					// 	this.optionsArr.push(newitem);
+					// });
+          this.optionsArr= res.Data.List || []
 				}
 			});
 		},
@@ -524,8 +530,8 @@ export default {
 				CurrentIndex:this.page_no,
         PageSize:15,
         Frequency:this.searchform.frequency,
-        ClassifyNameFirst:this.searchform.classifynameArr?this.searchform.classifynameArr[0]:'',
-        ClassifyNameSecond:this.searchform.classifynameArr&&this.searchform.classifynameArr.length>1?this.searchform.classifynameArr[1]:'',
+        ClassifyIdFirst:this.searchform.classifynameArr&&this.searchform.classifynameArr.length>1?this.searchform.classifynameArr[1]:'',
+        ClassifyIdSecond:this.searchform.classifynameArr&&this.searchform.classifynameArr.length>1?this.searchform.classifynameArr[2]:'',
         State:this.searchform.state?this.searchform.state:null,
         KeyWord:this.searchform.key_word,
         StartDate: this.searchform.dateValue ? this.searchform.dateValue[0] : '',