duy 2 днів тому
батько
коміт
f67f065828

+ 1 - 1
src/views/formula/component/funComponent/ifelse.vue

@@ -1659,7 +1659,7 @@ export default {
           this.formulainfo.arguments[0] = arr;
         }
       } else if(this.symbol == 'more'){
-        this.result=this.remark||'1'
+        // this.result=this.remark||'1'
         // 处理多条件情况
         this.formulainfo.arguments[0] = this.conditionList.map(condition => ({
           formulaIfElse: condition.formulaIfElse.map(inner => ({

+ 1 - 1
src/views/formula/edit.vue

@@ -1406,7 +1406,7 @@ export default {
         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;
 console.log(remark,'remark');
 
         console.log(resJson,'resJson');