|
|
@@ -1572,7 +1572,7 @@ handleDelete(e) {
|
|
|
console.log('this.$refs.conditionList[0]',this.$refs.dynamiccomponent[0].conditionList);
|
|
|
let resMore=formatArrayMore(this.$refs.dynamiccomponent[0].conditionList);
|
|
|
const resJson=generateResult(this.$refs.dynamiccomponent[0].conditionList);
|
|
|
- let remark=this.$refs.dynamiccomponent[0].remark;
|
|
|
+ let remark=this.$refs.dynamiccomponent[0].result;
|
|
|
let method=this.$refs.dynamiccomponent[0].method;
|
|
|
console.log(method,'method');
|
|
|
|
|
|
@@ -1862,7 +1862,7 @@ console.log(remark,'remark');
|
|
|
this.isMore = true;
|
|
|
this.formulaDetailMap = detail.map;
|
|
|
this.method=detail.method;
|
|
|
- this.moreConditions = restoreArrayMore(detail.formulas,this.formulaDetailMap)
|
|
|
+ this.moreConditions = restoreArrayMore(detail.formulas,this.formulaDetailMap,detail.remark)
|
|
|
|
|
|
}else if(detail&&detail.formula.includes('FC.switchCase')){
|
|
|
//数据获取
|
