公式 保留小数 特殊公式

src/api/formula/formula.js

@@ -10,7 +10,7 @@ export const getTypeMap = (params) => {
   })
 }
 
-export const saveFormula = ({formula,remark,wbsId,elementId,map}) => {
+export const saveFormula = ({formula,remark,wbsId,elementId,scale,number,map}) => {
   return request({
     url: '/api/blade-manager/formula/save',
     method: 'post',
@@ -19,12 +19,14 @@ export const saveFormula = ({formula,remark,wbsId,elementId,map}) => {
       remark,
       wbsId,
       elementId,
+      scale,
+      number,
       map
     }
   })
 }
 
-export const updateFormula = ({id,formula,remark,wbsId,elementId,map}) => {
+export const updateFormula = ({id,formula,remark,wbsId,elementId,scale,number,map}) => {
   return request({
     url: '/api/blade-manager/formula/update',
     method: 'post',
@@ -34,6 +36,8 @@ export const updateFormula = ({id,formula,remark,wbsId,elementId,map}) => {
       remark,
       wbsId,
       elementId,
+      scale,
+      number,
       map
     }
   })

src/views/formula/edit.vue

@@ -993,6 +993,38 @@ export default {
     //保存公式
     saveFormula(){
       let obj = formulaArrayToString(this.processFormula,this.resultFormula);
+
+      //特殊公式会有number
+      let number = '';
+      for (let i = 0; i < this.processFormula.length; i++) {
+        if(this.processFormula[i].children){
+          for (let j = 0; j < this.processFormula[i].children.length; j++) {
+            if(this.processFormula[i].children[j].number){
+              number = this.processFormula[i].children[j].number;
+              break;
+            }
+          }
+        }
+        if(number){
+          break;
+        }
+      }
+      if(number === ''){
+        for (let i = 0; i < this.resultFormula.length; i++) {
+          if(this.resultFormula[i].children){
+            for (let j = 0; j < this.resultFormula[i].children.length; j++) {
+              if(this.resultFormula[i].children[j].number){
+                number = this.resultFormula[i].children[j].number;
+                break;
+              }
+            }
+          }
+          if(number){
+            break;
+          }
+        }
+      }
+      
       //console.log(obj)
       //console.log(text);
       if(this.formulaid){
@@ -1002,6 +1034,8 @@ export default {
           remark:'',
           wbsId:this.wbsid,
           elementId:this.eleid,
+          scale:this.isRetain?this.retainNum:'',
+          number:number,
           map:JSON.stringify(obj.eleMap)
         }).then(()=>{
           this.$message({
@@ -1015,6 +1049,8 @@ export default {
           remark:'',
           wbsId:this.wbsid,
           elementId:this.eleid,
+          scale:this.isRetain?this.retainNum:'',
+          number:number,
           map:JSON.stringify(obj.eleMap)
         }).then((res)=>{
           if(res.data.data){
@@ -1032,7 +1068,7 @@ export default {
     //把公式文本还原数组
     async formulaStringToArray(){
       let detail = (await formulaDetail({elementId:this.eleid})).data.data;
-      //console.log(detail);
+      console.log(detail);
       if(detail.id){
         this.formulaid = detail.id;
         //let formula = formulaStringToArray('FC.sum(FC.repeat(E[测试测试_222]))+FC.ifelse(3<E[测试测试_333]&&E[测试测试_333]<10,E[测试测试_222]+E[测试测试_333],E[测试测试_333])',detail.map,this.formulaMap);
@@ -1043,6 +1079,11 @@ export default {
         formula.resultFormula[0].tableElementKey = this.resultFormula[0].tableElementKey;
         this.resultFormula[0].children = formula.resultFormula[0].children;
       }
+
+      if(detail.scale > -1){
+        this.isRetain = true;
+        this.retainNum = detail.scale;
+      }
     },