Merge branch 'develop' into xuxiaoming

src/views/plan/workbench/homePage/beta/predict/predictEdit.vue

@@ -165,6 +165,7 @@ export default {
 				AriId:undefined
 			},
 			getCreateModeArray: [], // 获取关联模型数据
+			CustDemandVerDetail: {},
 		}
 	},
 	mounted() {
@@ -181,8 +182,10 @@ export default {
 		/** 新增属性 */
     handleAddValst() {
       this.formData['AP_CustDemandVerHead-CustomerItem'].push({
-				Item: JSON.parse(JSON.stringify(this.defaultItem))
+				Item: JSON.parse(JSON.stringify(this.defaultItem)),
+				CustDemandVerDetail: this.CustDemandVerDetail
 			})
+			console.log(this.formData['AP_CustDemandVerHead-CustomerItem'])
     },
     /** 删除属性 */
     handleDeleteValst(index) {
@@ -208,6 +211,7 @@ export default {
 				if (res.code === 200) {
 					let formNewData = res.data
 					this.formData = formNewData
+					this.CustDemandVerDetail = res.data['CustDemandVerDetail']
 					if (formNewData['AP_CustDemandVerHead-CustomerItem'].length > 0) {
 						this.headers = (formNewData['AP_CustDemandVerHead-CustomerItem'][0].SortKeys)
 						this.headers.forEach(e=>{
@@ -223,6 +227,7 @@ export default {
 				if (res.code === 200) {
 					let formNewData = res.data
 					this.formData = formNewData
+					this.CustDemandVerDetail = res.data['CustDemandVerDetail']
 					if (formNewData['AP_CustDemandVerHead-CustomerItem'].length > 0) {
 						this.headers = (formNewData['AP_CustDemandVerHead-CustomerItem'][0].SortKeys)
 						this.headers.forEach(e=>{
@@ -324,7 +329,6 @@ export default {
 		},
 		completeCallBack(data) {
 			this.isShowDialog = ''
-			console.log(data)
 			if (data) {
 				this.handleUpdate(this.item.CustomerId, this.item.VersionId)
 			}