Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/reportForms/cost-allocation-table/tabs.vue

@@ -310,7 +310,8 @@ export default {
           className: 'replacecolor',
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(2)
+              var num = (Number(text)*100).toFixed(2)
+              return num+'%'
             }
           },
         },
@@ -429,7 +430,8 @@ export default {
           className: 'replacecolor',
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              var num = (Number(text)*100).toFixed(2)
+              return num+'%'
             }
           },
         },
@@ -450,7 +452,7 @@ export default {
           width: '6%',
           className: 'replacecolor',
           customRender: (text, record, index) => {
-            if(text!==''&&text){
+            if(text!==''&&text&&text!=='Infinity'){
               return Number(text).toFixed(2)
             }
           },