栏舍配方编辑置空显示上次保存参数

src/views/formulationPlan/dhedFormula/index.vue

@@ -1757,41 +1757,49 @@ export default {
 
       if(row.isOneWeight || row.isTWoWeight || row.isThreeWeight || row.isFourWeight || row.isFiveWeight || row.isSixWeight){
         var sumr = 0
-        if(row.r1){ sumr += parseFloat(row.r1) }
-        if(row.r2){ sumr += parseFloat(row.r2) }
-        if(row.r3){ sumr += parseFloat(row.r3) }
-        if(row.r4){ sumr += parseFloat(row.r4) }
-        if(row.r5){ sumr += parseFloat(row.r5) }
-        if(row.r6){ sumr += parseFloat(row.r6) }
+        if(row.r1 && !isNaN(row.r1)){ sumr += parseFloat(row.r1) }
+        if(row.r2 && !isNaN(row.r2)){ sumr += parseFloat(row.r2) }
+        if(row.r3 && !isNaN(row.r3)){ sumr += parseFloat(row.r3) }
+        if(row.r4 && !isNaN(row.r4)){ sumr += parseFloat(row.r4) }
+        if(row.r5 && !isNaN(row.r5)){ sumr += parseFloat(row.r5) }
+        if(row.r6 && !isNaN(row.r6)){ sumr += parseFloat(row.r6) }
         this.$set(row, 'sumr', sumr.toFixed(this.decimalr))
       }else{
         // 总比例不变
         var sumr = 0
-        if(row.r1){ sumr += parseFloat(row.r1) }
-        if(row.r2){ sumr += parseFloat(row.r2) }
-        if(row.r3){ sumr += parseFloat(row.r3) }
-        if(row.r4){ sumr += parseFloat(row.r4) }
-        if(row.r5){ sumr += parseFloat(row.r5) }
-        if(row.r6){ sumr += parseFloat(row.r6) }
+        if(row.r1 && !isNaN(row.r1)){ sumr += parseFloat(row.r1) }
+        if(row.r2 && !isNaN(row.r2)){ sumr += parseFloat(row.r2) }
+        if(row.r3 && !isNaN(row.r3)){ sumr += parseFloat(row.r3) }
+        if(row.r4 && !isNaN(row.r4)){ sumr += parseFloat(row.r4) }
+        if(row.r5 && !isNaN(row.r5)){ sumr += parseFloat(row.r5) }
+        if(row.r6 && !isNaN(row.r6)){ sumr += parseFloat(row.r6) }
         this.$set(row, 'sumr', sumr.toFixed(this.decimalr))
       }
       // 饲喂投喂量 = 所有班次重量之和
       var sumw = 0
-      if(row.w1){ sumw += parseFloat(row.w1) }
-      if(row.w2){ sumw += parseFloat(row.w2) }
-      if(row.w3){ sumw += parseFloat(row.w3) }
-      if(row.w4){ sumw += parseFloat(row.w4) }
-      if(row.w5){ sumw += parseFloat(row.w5) }
-      if(row.w6){ sumw += parseFloat(row.w6) }
+      if(row.w1 && !isNaN(row.w1)){ sumw += parseFloat(row.w1) }
+      if(row.w2 && !isNaN(row.w2)){ sumw += parseFloat(row.w2) }
+      if(row.w3 && !isNaN(row.w3)){ sumw += parseFloat(row.w3) }
+      if(row.w4 && !isNaN(row.w4)){ sumw += parseFloat(row.w4) }
+      if(row.w5 && !isNaN(row.w5)){ sumw += parseFloat(row.w5) }
+      if(row.w6 && !isNaN(row.w6)){ sumw += parseFloat(row.w6) }
       this.$set(row, 'sumw', sumw.toFixed(this.decimal))
       // 日投喂量 = 饲喂投喂量+补料
-      if (row.bw1 == 'NaN' || row.bw1 == '') { this.$set(row, 'bw1', 0) }
-      if (row.bw2 == 'NaN' || row.bw2 == '') { this.$set(row, 'bw2', 0) }
-      if (row.bw3 == 'NaN' || row.bw3 == '') { this.$set(row, 'bw3', 0) }
-      if (row.bw4 == 'NaN' || row.bw4 == '') { this.$set(row, 'bw4', 0) }
-      if (row.bw5 == 'NaN' || row.bw5 == '') { this.$set(row, 'bw5', 0) }
-      if (row.bw6 == 'NaN' || row.bw6 == '') { this.$set(row, 'bw6', 0) }
-      var sumbw = (parseFloat(row.bw1) + parseFloat(row.bw2) + parseFloat(row.bw3) + parseFloat(row.bw4) + parseFloat(row.bw5) + parseFloat(row.bw6)).toFixed(this.decimal)
+      if (isNaN(row.bw1) || row.bw1 == '') { this.$set(row, 'bw1', 0) }
+      if (isNaN(row.bw2) || row.bw2 == '') { this.$set(row, 'bw2', 0) }
+      if (isNaN(row.bw3) || row.bw3 == '') { this.$set(row, 'bw3', 0) }
+      if (isNaN(row.bw4) || row.bw4 == '') { this.$set(row, 'bw4', 0) }
+      if (isNaN(row.bw5) || row.bw5 == '') { this.$set(row, 'bw5', 0) }
+      if (isNaN(row.bw6) || row.bw6 == '') { this.$set(row, 'bw6', 0) }
+      // var sumbw = (parseFloat(row.bw1) + parseFloat(row.bw2) + parseFloat(row.bw3) + parseFloat(row.bw4) + parseFloat(row.bw5) + parseFloat(row.bw6)).toFixed(this.decimal)
+      var sumbw = 0
+      if(row.bw1 && !isNaN(row.bw1)){ sumbw += parseFloat(row.bw1) }
+      if(row.bw2 && !isNaN(row.bw2)){ sumbw += parseFloat(row.bw2) }
+      if(row.bw3 && !isNaN(row.bw3)){ sumbw += parseFloat(row.bw3) }
+      if(row.bw4 && !isNaN(row.bw4)){ sumbw += parseFloat(row.bw4) }
+      if(row.bw5 && !isNaN(row.bw5)){ sumbw += parseFloat(row.bw5) }
+      if(row.bw6 && !isNaN(row.bw6)){ sumbw += parseFloat(row.bw6) }
+      this.$set(row, 'sumbw', sumbw.toFixed(this.decimal))
       var todayfeed = parseFloat(sumw) + parseFloat(sumbw)
       this.$set(row, 'todayfeed', todayfeed)
     },
@@ -1826,12 +1834,12 @@ export default {
       // 总比例=所有比例之和
       // 饲喂投喂量 = 所有班次重量之和
       var sumr = 0
-      if(row.r1){ sumr += parseFloat(row.r1) }
-      if(row.r2){ sumr += parseFloat(row.r2) }
-      if(row.r3){ sumr += parseFloat(row.r3) }
-      if(row.r4){ sumr += parseFloat(row.r4) }
-      if(row.r5){ sumr += parseFloat(row.r5) }
-      if(row.r6){ sumr += parseFloat(row.r6) }
+      if(row.r1 && !isNaN(row.r1)){ sumr += parseFloat(row.r1) }
+      if(row.r2 && !isNaN(row.r2)){ sumr += parseFloat(row.r2) }
+      if(row.r3 && !isNaN(row.r3)){ sumr += parseFloat(row.r3) }
+      if(row.r4 && !isNaN(row.r4)){ sumr += parseFloat(row.r4) }
+      if(row.r5 && !isNaN(row.r5)){ sumr += parseFloat(row.r5) }
+      if(row.r6 && !isNaN(row.r6)){ sumr += parseFloat(row.r6) }
       this.$set(row, 'sumr', sumr.toFixed(this.decimalr))
       var sumw = 0
       if(row.w1 && !isNaN(row.w1)){ sumw += parseFloat(row.w1) }
@@ -1842,12 +1850,12 @@ export default {
       if(row.w6 && !isNaN(row.w6)){ sumw += parseFloat(row.w6) }
       this.$set(row, 'sumw', sumw.toFixed(this.decimal))
       // 日投喂量 = 饲喂投喂量+补料
-      if (row.bw1 == 'NaN' || row.bw1 == '') { this.$set(row, 'bw1', 0) }
-      if (row.bw2 == 'NaN' || row.bw2 == '') { this.$set(row, 'bw2', 0) }
-      if (row.bw3 == 'NaN' || row.bw3 == '') { this.$set(row, 'bw3', 0) }
-      if (row.bw4 == 'NaN' || row.bw4 == '') { this.$set(row, 'bw4', 0) }
-      if (row.bw5 == 'NaN' || row.bw5 == '') { this.$set(row, 'bw5', 0) }
-      if (row.bw6 == 'NaN' || row.bw6 == '') { this.$set(row, 'bw6', 0) }
+      if (isNaN(row.bw1)|| row.bw1 == '') { this.$set(row, 'bw1', 0) }
+      if (isNaN(row.bw2)|| row.bw2 == '') { this.$set(row, 'bw2', 0) }
+      if (isNaN(row.bw3)|| row.bw3 == '') { this.$set(row, 'bw3', 0) }
+      if (isNaN(row.bw4)|| row.bw4 == '') { this.$set(row, 'bw4', 0) }
+      if (isNaN(row.bw5)|| row.bw5 == '') { this.$set(row, 'bw5', 0) }
+      if (isNaN(row.bw6)|| row.bw6 == '') { this.$set(row, 'bw6', 0) }
       var sumbw = 0
       if(row.bw1 && !isNaN(row.bw1)){ sumbw += parseFloat(row.bw1) }
       if(row.bw2 && !isNaN(row.bw2)){ sumbw += parseFloat(row.bw2) }
@@ -1912,35 +1920,35 @@ export default {
       // 总比例=所有比例之和
       // 饲喂投喂量 = 所有班次重量之和
       var sumr = 0
-      if(row.r1){ sumr += parseFloat(row.r1) }
-      if(row.r2){ sumr += parseFloat(row.r2) }
-      if(row.r3){ sumr += parseFloat(row.r3) }
-      if(row.r4){ sumr += parseFloat(row.r4) }
-      if(row.r5){ sumr += parseFloat(row.r5) }
-      if(row.r6){ sumr += parseFloat(row.r6) }
+      if(row.r1 && !isNaN(row.r1)){ sumr += parseFloat(row.r1) }
+      if(row.r2 && !isNaN(row.r2)){ sumr += parseFloat(row.r2) }
+      if(row.r3 && !isNaN(row.r3)){ sumr += parseFloat(row.r3) }
+      if(row.r4 && !isNaN(row.r4)){ sumr += parseFloat(row.r4) }
+      if(row.r5 && !isNaN(row.r5)){ sumr += parseFloat(row.r5) }
+      if(row.r6 && !isNaN(row.r6)){ sumr += parseFloat(row.r6) }
       this.$set(row, 'sumr', sumr.toFixed(this.decimalr))
       var sumw = 0
-      if(row.w1){ sumw += parseFloat(row.w1) }
-      if(row.w2){ sumw += parseFloat(row.w2) }
-      if(row.w3){ sumw += parseFloat(row.w3) }
-      if(row.w4){ sumw += parseFloat(row.w4) }
-      if(row.w5){ sumw += parseFloat(row.w5) }
-      if(row.w6){ sumw += parseFloat(row.w6) }
+      if(row.w1 && !isNaN(row.w1)){ sumw += parseFloat(row.w1) }
+      if(row.w2 && !isNaN(row.w2)){ sumw += parseFloat(row.w2) }
+      if(row.w3 && !isNaN(row.w3)){ sumw += parseFloat(row.w3) }
+      if(row.w4 && !isNaN(row.w4)){ sumw += parseFloat(row.w4) }
+      if(row.w5 && !isNaN(row.w5)){ sumw += parseFloat(row.w5) }
+      if(row.w6 && !isNaN(row.w6)){ sumw += parseFloat(row.w6) }
       this.$set(row, 'sumw', sumw.toFixed(this.decimal))
       // 日投喂量 = 饲喂投喂量+补料
-      if (row.bw1 == 'NaN' || row.bw1 == '') { this.$set(row, 'bw1', 0) }
-      if (row.bw2 == 'NaN' || row.bw2 == '') { this.$set(row, 'bw2', 0) }
-      if (row.bw3 == 'NaN' || row.bw3 == '') { this.$set(row, 'bw3', 0) }
-      if (row.bw4 == 'NaN' || row.bw4 == '') { this.$set(row, 'bw4', 0) }
-      if (row.bw5 == 'NaN' || row.bw5 == '') { this.$set(row, 'bw5', 0) }
-      if (row.bw6 == 'NaN' || row.bw6 == '') { this.$set(row, 'bw6', 0) }
+      if (isNaN(row.bw1)|| row.bw1 == '') { this.$set(row, 'bw1', 0) }
+      if (isNaN(row.bw2)|| row.bw2 == '') { this.$set(row, 'bw2', 0) }
+      if (isNaN(row.bw3)|| row.bw3 == '') { this.$set(row, 'bw3', 0) }
+      if (isNaN(row.bw4)|| row.bw4 == '') { this.$set(row, 'bw4', 0) }
+      if (isNaN(row.bw5)|| row.bw5 == '') { this.$set(row, 'bw5', 0) }
+      if (isNaN(row.bw6)|| row.bw6 == '') { this.$set(row, 'bw6', 0) }
       var sumbw = 0
-      if(row.bw1){ sumbw += parseFloat(row.bw1) }
-      if(row.bw2){ sumbw += parseFloat(row.bw2) }
-      if(row.bw3){ sumbw += parseFloat(row.bw3) }
-      if(row.bw4){ sumbw += parseFloat(row.bw4) }
-      if(row.bw5){ sumbw += parseFloat(row.bw5) }
-      if(row.bw6){ sumbw += parseFloat(row.bw6) }
+      if(row.bw1 && !isNaN(row.bw1)){ sumbw += parseFloat(row.bw1) }
+      if(row.bw2 && !isNaN(row.bw2)){ sumbw += parseFloat(row.bw2) }
+      if(row.bw3 && !isNaN(row.bw3)){ sumbw += parseFloat(row.bw3) }
+      if(row.bw4 && !isNaN(row.bw4)){ sumbw += parseFloat(row.bw4) }
+      if(row.bw5 && !isNaN(row.bw5)){ sumbw += parseFloat(row.bw5) }
+      if(row.bw6 && !isNaN(row.bw6)){ sumbw += parseFloat(row.bw6) }
       this.$set(row, 'sumbw', sumbw.toFixed(this.decimal))
       // var sumbw = (parseFloat(row.bw1) + parseFloat(row.bw2) + parseFloat(row.bw3) + parseFloat(row.bw4) + parseFloat(row.bw5) + parseFloat(row.bw6)).toFixed(this.decimal)
       var todayfeed = parseFloat(sumw) + parseFloat(sumbw)
@@ -1984,24 +1992,24 @@ export default {
       this.table.temp.ptsfname = row.ptsfname
     },
     updateData(row) {
-      if (row.r1 == 'NaN') { this.$set(row, 'r1', 0) }
-      if (row.r2 == 'NaN') { this.$set(row, 'r2', 0) }
-      if (row.r3 == 'NaN') { this.$set(row, 'r3', 0) }
-      if (row.r4 == 'NaN') { this.$set(row, 'r4', 0) }
-      if (row.r5 == 'NaN') { this.$set(row, 'r5', 0) }
-      if (row.r6 == 'NaN') { this.$set(row, 'r6', 0) }
-      if (row.w1 == 'NaN') { this.$set(row, 'w1', 0) }
-      if (row.w2 == 'NaN') { this.$set(row, 'w2', 0) }
-      if (row.w3 == 'NaN') { this.$set(row, 'w3', 0) }
-      if (row.w4 == 'NaN') { this.$set(row, 'w4', 0) }
-      if (row.w5 == 'NaN') { this.$set(row, 'w5', 0) }
-      if (row.w6 == 'NaN') { this.$set(row, 'w6', 0) }
-      if (row.bw1 == 'NaN') { this.$set(row, 'bw1', 0) }
-      if (row.bw2 == 'NaN') { this.$set(row, 'bw2', 0) }
-      if (row.bw3 == 'NaN') { this.$set(row, 'bw3', 0) }
-      if (row.bw4 == 'NaN') { this.$set(row, 'bw4', 0) }
-      if (row.bw5 == 'NaN') { this.$set(row, 'bw5', 0) }
-      if (row.bw6 == 'NaN') { this.$set(row, 'bw6', 0) }
+      if (isNaN(row.r1)) { this.$set(row, 'r1', 0) }
+      if (isNaN(row.r2)) { this.$set(row, 'r2', 0) }
+      if (isNaN(row.r3)) { this.$set(row, 'r3', 0) }
+      if (isNaN(row.r4)) { this.$set(row, 'r4', 0) }
+      if (isNaN(row.r5)) { this.$set(row, 'r5', 0) }
+      if (isNaN(row.r6)) { this.$set(row, 'r6', 0) }
+      if (isNaN(row.w1)) { this.$set(row, 'w1', 0) }
+      if (isNaN(row.w2)) { this.$set(row, 'w2', 0) }
+      if (isNaN(row.w3)) { this.$set(row, 'w3', 0) }
+      if (isNaN(row.w4)) { this.$set(row, 'w4', 0) }
+      if (isNaN(row.w5)) { this.$set(row, 'w5', 0) }
+      if (isNaN(row.w6)) { this.$set(row, 'w6', 0) }
+      if (isNaN(row.bw1)) { this.$set(row, 'bw1', 0) }
+      if (isNaN(row.bw2)) { this.$set(row, 'bw2', 0) }
+      if (isNaN(row.bw3)) { this.$set(row, 'bw3', 0) }
+      if (isNaN(row.bw4)) { this.$set(row, 'bw4', 0) }
+      if (isNaN(row.bw5)) { this.$set(row, 'bw5', 0) }
+      if (isNaN(row.bw6)) { this.$set(row, 'bw6', 0) }
       var arr = []
       for (let i = 1; i <= this.table.RWLength; i++) {
         var obj = {}
@@ -2023,11 +2031,15 @@ export default {
           obj['supplement'] = row['bw' + i]
         }
         obj['tratio'] = (parseFloat(row['r' + i])).toFixed(parseInt(Cookies.get('decimalr')))
-        // obj['tratio'] = Math.round(row['r' + i])
         obj['todaysupplement'] = row.todaysupplement
         obj['todayweight'] = row.todayweight
         arr.push(obj)
       }
+      arr.forEach((item)=>{
+        if(isNaN(item.tratio)){
+          item.tratio = 0
+        }
+      })
       if (this.table.isPtsfname == 0) {
         row.ptsfid = '-1'
         row.ptsfname = ''
@@ -2043,7 +2055,6 @@ export default {
       if (this.table.isPtsfname == false) {
         row.supplyweight = '0'
       }
-      console.log(row, '============')
       this.$set(row, 'ratio', Math.floor(parseFloat(row.ratio) * 100) / 100)
       this.$set(row, 'ccountratio', Math.floor(parseFloat(row.ccountratio) * 100) / 100)
       row.ccountratio = String(row.ccountratio)