Merge branch 'master' into cygx_14.6

src/views/custom_manage/customList/updateServe.vue

@@ -894,24 +894,39 @@ export default {
 				})
 			} else {
 				console.log(this.authList);
-				 this.authList.forEach(item => {
-					 if(item.ClassifyName == '宏观经济') {
-						 item.CheckList = [1]
-						 item.isIndeterminate = true
-						 item.disabled=false
-						 item.Items[1].disabled=false
-						 item.Items[0].disabled=false
-					 }else {
-						 item.Items.forEach(key => {		
-							item.CheckList = []
-							key.Checked = false
-							key.disabled = false
-						})
-						item.isIndeterminate = false
-						item.checkAll = false
-						item.disabled = false	
-					 }
+				// 根据是否为公共品种来设置选中态
+				this.authList.forEach(item=>{
+					const publicIds=[]
+					item.Items.forEach(_item=>{
+						if(_item.IsPublic===1){
+							publicIds.push(_item.ChartPermissionId)
+						}
+						_item.Checked = false
+						_item.disabled = false
+					})
+					item.CheckList=publicIds
+					item.disabled = false
+					item.isIndeterminate = item.CheckList.length===item.Items.length||item.CheckList.length===0?false:true
+					item.checkAll = item.CheckList.length===item.Items.length?true:false
 				})
+				//  this.authList.forEach(item => {
+				// 	 if(item.ClassifyName == '宏观经济') {
+				// 		 item.CheckList = [1]
+				// 		 item.isIndeterminate = true
+				// 		 item.disabled=false
+				// 		 item.Items[1].disabled=false
+				// 		 item.Items[0].disabled=false
+				// 	 }else {
+				// 		 item.Items.forEach(key => {		
+				// 			item.CheckList = []
+				// 			key.Checked = false
+				// 			key.disabled = false
+				// 		})
+				// 		item.isIndeterminate = false
+				// 		item.checkAll = false
+				// 		item.disabled = false	
+				// 	 }
+				// })
 				this.$message.warning('请勾选品种')
 			}
 		},

src/views/roadshow_manage/statistics/mixin.js

@@ -111,7 +111,7 @@ export default {
 				{
 					key: '试用路演',
 					value: item.TryOutNum,
-					askNum:item.AskNum,
+					askNum:item.AskTryOutNum,
 					startDate: item.StartDate,
 					endDate: item.EndDate,
 					userid
@@ -119,7 +119,7 @@ export default {
 				{
 					key: '正式路演',
 					value: item.FormalNum,
-					askNum:item.AskNum,
+					askNum:item.AskFormalNum,
 					startDate: item.StartDate,
 					endDate: item.EndDate,
 					userid