更新6-17

src/views/formulationPlan/dhedFormula/index.vue

@@ -2174,37 +2174,106 @@ export default {
         }
         // 2班3班4班未锁
         if (row.isTwoWeight == false && row.isThreeWeight == false && row.isFourWeight == false) {
-          if(isNaN(row.w1) || row.w1 == '' || row.w1 <= 0){
-            row.w1 = 0
-          }
+          // 一班重量失去焦点
           if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
             row.w2 = 0
+            row.r2 = 0
           }
           if(isNaN(row.w3) || row.w3 == '' || row.w3 <= 0){
             row.w3 = 0
+            row.r3 = 0
           }
           if(isNaN(row.w4) || row.w4 == '' || row.w4 <= 0){
             row.w4 = 0
-          }
-          if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
-            row.r1 = 0
+            row.r4 = 0
           }
           if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
             row.r2 = 0
+            row.w2 = 0
           }
           if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
             row.r3 = 0
+            row.w3 = 0
           }
           if(isNaN(row.r4) || row.r4 == '' || row.r4 <= 0){
             row.r4 = 0
+            row.w4 = 0
+          }
+          if(isNaN(row.w1) || row.w1 == '' || row.w1 <= 0){
+            row.w1 = 0
+          }
+          if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
+            row.r1 = 0
+          }
+          let a = 0
+          if(parseFloat(this.focusWRow.r1) !== 0){
+            a = 1 / (parseFloat(row.r1) / 100) * parseFloat(row.w1)
+            if(parseFloat(row.w1)== 0){
+              row.r1 = 0
+              a = (parseFloat(this.focusWRow.dailyWeight) / parseFloat(this.focusWRow.sumr)*100).toFixed(2)
+              if(row.r2 === 0 && row.r3 === 0 && row.r4 === 0){
+                row.r2 = 0
+                row.r3 = 0
+                row.r4 = 0
+                console.log('234班比例都为0')
+              }else if(row.r2 === 0 && row.r3 === 0 && row.r4 !== 0){
+                row.r2 = 0
+                row.r3 = 0
+                row.r4 = parseFloat(this.focusWRow.r1) + parseFloat(this.focusWRow.r4)
+                console.log('23班比例为0,4班不为0')
+              }else if(row.r2 === 0 && row.r4 === 0 && row.r3 !== 0){
+                row.r2 = 0
+                row.r4 = 0
+                row.r3 = parseFloat(this.focusWRow.r1) + parseFloat(this.focusWRow.r3)
+                console.log('24班比例为0,3班不为0')
+              }else if(row.r3 === 0 && row.r4 === 0 && row.r2 !== 0){
+                row.r3 = 0
+                row.r4 = 0
+                row.r2 = parseFloat(this.focusWRow.r1) + parseFloat(this.focusWRow.r2)
+                console.log('34班比例为0,2班不为0')
+              }else if(row.r4 === 0 && row.r2 !== 0 && row.r3 !== 0){
+                row.r4 = 0
+                row.r2 = parseFloat(this.focusWRow.r1) / 2 + parseFloat(this.focusWRow.r2)
+                row.r3 = parseFloat(this.focusWRow.r1) / 2 + parseFloat(this.focusWRow.r3)
+                console.log('4班比例为0,23班不为0')
+              }else if(row.r2 === 0 && row.r4 !== 0 && row.r3 !== 0){
+                row.r2 = 0
+                row.r3 = parseFloat(this.focusWRow.r1) / 2 + parseFloat(this.focusWRow.r3)
+                row.r4 = parseFloat(this.focusWRow.r1) / 2 + parseFloat(this.focusWRow.r4)
+                console.log('2班比例为0,34班不为0')
+              }else if(row.r3 === 0 && row.r4 !== 0 && row.r3 !== 0){
+                row.r3 = 0
+                row.r2 = parseFloat(this.focusWRow.r1) / 2 + parseFloat(this.focusWRow.r2)
+                row.r4 = parseFloat(this.focusWRow.r1) / 2 + parseFloat(this.focusWRow.r4)
+                console.log('3班比例为0,24班不为0')
+              }else{
+                console.log('234班不为0')
+                let average1 = (parseFloat(this.focusWRow.r1) /3 ).toFixed(2)
+                let average2 = (parseFloat(this.focusWRow.r1) - average1*2).toFixed(2)
+                row.r2 = parseFloat(average1) + parseFloat(this.focusWRow.r2)
+                row.r3 = parseFloat(average1) + parseFloat(this.focusWRow.r3)
+                row.r4 = parseFloat(average2) + parseFloat(this.focusWRow.r4)
+              }
+            }
+          }else{
+            a = (parseFloat(this.focusWRow.dailyWeight) / parseFloat(this.focusWRow.sumr)*100).toFixed(2)
+            row.r1 = parseFloat(row.w1) / a * 100
           }
-          let a = (1/ (parseFloat(row.r1) / 100) * parseFloat(row.w1)).toFixed(2)
           let b = (a * parseFloat(row.sumr) / 100).toFixed(2)
           row.w2 = (a * (parseFloat(row.r2) / 100)).toFixed(2)
           row.w3 = (a * (parseFloat(row.r3) / 100)).toFixed(2)
           row.w4 = (a * (parseFloat(row.r4) / 100)).toFixed(2)
           this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
           row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
+          this.$set(row, 'sumr', parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4))
+          row.sumr = formatNum(row.sumr, parseInt(Cookies.get('decimal')))
+          console.log(a,'aa')
+          console.log('b',b)
+          console.log('dailyWeight',row.dailyWeight)
+          console.log('row.sumr',row.sumr)
+          console.log('row.w1',row.w1)
+          console.log('row.w3',row.w3)
+          console.log('row.w4',row.w4)
         }
       } else if (this.table.RWLength == 3) {
         // 三班
@@ -2237,80 +2306,67 @@ export default {
         }
         // 2班3班都不锁
         if (row.isTwoWeight == false && row.isThreeWeight == false) {
-          console.log(row.w1, 'w1----------')
-          console.log(row.feedweight, 'feedweight----------')
-          row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (row.r2 == 0 && row.r3 == 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1)) / 2, parseInt(Cookies.get('decimal')))
-            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w3 = row.w2
-            row.r3 = row.r2
-          } else if (row.r2 == 0 && row.r3 !== 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3)), parseInt(Cookies.get('decimal')))
-            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            if (row.w1 == '') { row.w1 = 0 }
-            if (row.w2 == '') { row.w2 = 0 }
-            if (row.w3 == '') { row.w3 = 0 }
-            if (row.w4 == '') { row.w4 = 0 }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-            this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
-            row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
-            if (parseFloat(row.dailyWeight) > parseFloat(this.focusWRow.dailyWeight)) {
-              row.w3 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1)) * parseFloat(this.focusWRow.r3) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3)), parseInt(Cookies.get('decimal')))
-              row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-          } else if (row.r2 !== 0 && row.r3 == 0) {
-            row.w3 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w2)), parseInt(Cookies.get('decimal')))
-            row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            if (row.w1 == '') { row.w1 = 0 }
-            if (row.w2 == '') { row.w2 = 0 }
-            if (row.w3 == '') { row.w3 = 0 }
-            if (row.w4 == '') { row.w4 = 0 }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-            this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
-            row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
-            if (parseFloat(row.dailyWeight) > parseFloat(this.focusWRow.dailyWeight)) {
-              row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1)) * parseFloat(this.focusWRow.r2) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3)), parseInt(Cookies.get('decimal')))
-              row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-          } else {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1)) * parseFloat(this.focusWRow.r2) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3)), parseInt(Cookies.get('decimal')))
-            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w3 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1)) * parseFloat(this.focusWRow.r3) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3)), parseInt(Cookies.get('decimal')))
-            row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            console.log('我改了1')
-          }
-          if (isNaN(row.w2)) {
+          if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
             row.w2 = 0
             row.r2 = 0
           }
-          if (isNaN(row.w3)) {
+          if(isNaN(row.w3) || row.w3 == '' || row.w3 <= 0){
             row.w3 = 0
             row.r3 = 0
           }
-          if (row.w3 <= 0) {
-            row.w3 = 0
+          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
+            row.r2 = 0
+            row.w2 = 0
+          }
+          if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
             row.r3 = 0
+            row.w3 = 0
           }
-          if (row.w2 <= 0) {
-            row.w2 = 0
-            row.r2 = 0
+          if(isNaN(row.w1) || row.w1 == '' || row.w1 <= 0){
+            row.w1 = 0
+            // row.r1 = 0
           }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3), parseInt(Cookies.get('decimal'))))
+          if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
+            // row.w1 = 0
+            row.r1 = 0
+          }
+          let a = 0
+          if(parseFloat(this.focusWRow.r1) !== 0){
+            a = 1 / (parseFloat(row.r1) / 100) * parseFloat(row.w1)
+            if(row.w1 == 0){
+              row.r1 = 0
+              a = (parseFloat(this.focusWRow.dailyWeight) / parseFloat(this.focusWRow.sumr)*100).toFixed(2)
+              if(row.r2 === 0 && row.r3 === 0){
+                row.r2 = 0
+                row.r3 = 0
+                console.log('23班比例都为0')
+              }else if(row.r2 === 0 && row.r3 !== 0){
+                row.r2 = 0
+                row.r3 = parseFloat(this.focusWRow.r1) + parseFloat(this.focusWRow.r3)
+                console.log('2班比例为0,3班不为0')
+              }else if(row.r2 !== 0 && row.r3 === 0){
+                row.r2 = parseFloat(this.focusWRow.r1) + parseFloat(this.focusWRow.r2)
+                row.r3 = 0
+                console.log('3班比例为0,2班不为0')
+              }else{
+                console.log('23班不为0')
+                let average1 = (parseFloat(this.focusWRow.r1) / 2 ).toFixed(2)
+                row.r2 = parseFloat(average1) + parseFloat(this.focusWRow.r2)
+                row.r3 = parseFloat(average1) + parseFloat(this.focusWRow.r3)
+                console.log(average1,row.r2,row.r3)
+              }
+            }
+          }else{
+            a = (parseFloat(this.focusWRow.dailyWeight) / parseFloat(this.focusWRow.sumr)*100).toFixed(2)
+            row.r1 = parseFloat(row.w1) / a * 100
+          }
+          let b = (a * parseFloat(row.sumr) / 100).toFixed(2)
+          row.w2 = (a * (parseFloat(row.r2) / 100)).toFixed(2)
+          row.w3 = (a * (parseFloat(row.r3) / 100)).toFixed(2)
+          this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3))
+          row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
+          this.$set(row, 'sumr', parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3))
+          row.sumr = formatNum(row.sumr, parseInt(Cookies.get('decimal')))
         }
       } else if (this.table.RWLength == 2) {
         // 两班isOneWeight,isTwoWeight
@@ -2325,8 +2381,42 @@ export default {
           if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
           this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2), parseInt(Cookies.get('decimal'))))
         } else {
-          row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2), parseInt(Cookies.get('decimal'))))
+          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
+            row.r2 = 0
+            row.w2 = 0
+          }
+          if(isNaN(row.w1) || row.w1 == '' || row.w1 <= 0){
+            row.w1 = 0
+          }
+          if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
+            row.r1 = 0
+          }
+          let a = 0
+          if(parseFloat(this.focusWRow.r1) !== 0){
+            a = 1 / (parseFloat(row.r1) / 100) * parseFloat(row.w1)
+            if(parseFloat(row.w1) == 0){
+              a = (parseFloat(this.focusWRow.dailyWeight) / parseFloat(this.focusWRow.sumr)*100).toFixed(2)
+              if(row.r2 === 0){
+                row.r2 = 0
+                console.log('2班为0')
+              }
+              if(row.r2 !== 0){
+                row.r2 = parseFloat(this.focusWRow.r1) + parseFloat(this.focusWRow.r2)
+                console.log('2班不为0')
+              }
+            }
+          }else{
+            a = (parseFloat(this.focusWRow.dailyWeight) / parseFloat(this.focusWRow.sumr)*100).toFixed(2)
+            row.r1 = parseFloat(row.w1) / a * 100
+          }
+          let b = (a * parseFloat(this.focusWRow2.sumr) / 100).toFixed(2)
+          row.w2 = (a * (parseFloat(row.r2) / 100)).toFixed(2)
+          this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2))
+          row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
+          this.$set(row, 'sumr', parseFloat(row.r1) + parseFloat(row.r2))
+          row.sumr = formatNum(row.sumr, parseInt(Cookies.get('decimal')))
+          // row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+          // this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2), parseInt(Cookies.get('decimal'))))
         }
       } else {
         row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
@@ -2640,37 +2730,100 @@ export default {
         }
         // 1班3班4班未锁
         if (row.isOneWeight == false && row.isThreeWeight == false && row.isFourWeight == false) {
+          // 二班重量失去焦点
           if(isNaN(row.w1) || row.w1 == '' || row.w1 <= 0){
             row.w1 = 0
-          }
-          if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
-            row.w2 = 0
+            row.r1 = 0
           }
           if(isNaN(row.w3) || row.w3 == '' || row.w3 <= 0){
             row.w3 = 0
+            row.r3 = 0
           }
           if(isNaN(row.w4) || row.w4 == '' || row.w4 <= 0){
             row.w4 = 0
+            row.r4 = 0
           }
           if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
             row.r1 = 0
-          }
-          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
-            row.r2 = 0
+            row.w1 = 0
           }
           if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
             row.r3 = 0
+            row.w3 = 0
           }
           if(isNaN(row.r4) || row.r4 == '' || row.r4 <= 0){
             row.r4 = 0
+            row.w4 = 0
           }
-          let a = (1/ (parseFloat(row.r2) / 100) * parseFloat(row.w2)).toFixed(2)
-          let b = (a * parseFloat(row.sumr) / 100).toFixed(2)
+          if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
+            row.w2 = 0
+            // row.r2 = 0
+          }
+          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
+            // row.w2 = 0
+            row.r2 = 0
+          }
+          let a = 0
+          if(parseFloat(this.focusWRow2.r2) !== 0){
+            a = 1 / (parseFloat(row.r2) / 100) * parseFloat(row.w2)
+            if(parseFloat(row.w2) == 0){
+              a = (parseFloat(this.focusWRow2.dailyWeight) / parseFloat(this.focusWRow2.sumr)*100).toFixed(2)
+              if(row.r1 === 0 && row.r3 === 0 && row.r4 === 0){
+                row.r1 = 0
+                row.r3 = 0
+                row.r4 = 0
+                console.log('134班比例都为0')
+              }else if(row.r1 === 0 && row.r3 == 0 && row.r4 !== 0){
+                row.r1 = 0
+                row.r3 = 0
+                row.r4 = parseFloat(this.focusWRow2.r2) + parseFloat(this.focusWRow2.r4)
+                console.log('13班比例为0,4班不为0')
+              }else if(row.r1 === 0 && row.r4 === 0 && row.r3 !== 0){
+                row.r1 = 0
+                row.r4 = 0
+                row.r3 = parseFloat(this.focusWRow2.r2) + parseFloat(this.focusWRow2.r3)
+                console.log('14班比例为0,3班不为0')
+              }else if(row.r3 === 0 && row.r4 === 0 && row.r1 !== 0){
+                row.r3 = 0
+                row.r4 = 0
+                row.r1 = parseFloat(this.focusWRow2.r2) + parseFloat(this.focusWRow2.r1)
+                console.log('34班比例为0,1班不为0')
+              }else if(row.r1 === 0 && row.r3 !== 0 && row.r4 !== 0){
+                row.r1 = 0
+                row.r3 = parseFloat(this.focusWRow2.r2) / 2 + parseFloat(this.focusWRow2.r3)
+                row.r4 = parseFloat(this.focusWRow2.r2) / 2 + parseFloat(this.focusWRow2.r4)
+                console.log('1班比例为0,34班不为0')
+              }else if(row.r3 === 0 && row.r1 !== 0 && row.r4 !== 0){
+                row.r3 = 0
+                row.r1 = parseFloat(this.focusWRow2.r2) / 2 + parseFloat(this.focusWRow2.r1)
+                row.r4 = parseFloat(this.focusWRow2.r2) / 2 + parseFloat(this.focusWRow2.r4)
+                console.log('3班比例为0,14班不为0')
+              }else if(row.r4 === 0 && row.r1 !== 0 && row.r3 !== 0){
+                row.r4 = 0
+                row.r1 = parseFloat(this.focusWRow2.r2) / 2 + parseFloat(this.focusWRow2.r1)
+                row.r3 = parseFloat(this.focusWRow2.r2) / 2 + parseFloat(this.focusWRow2.r3)
+                console.log('4班比例为0,13班不为0')
+              }else{
+                console.log('134班不为0')
+                let average1 = (parseFloat(this.focusWRow2.r2) /3 ).toFixed(2)
+                let average2 = (parseFloat(this.focusWRow2.r2) - average1*2).toFixed(2)
+                row.r1 = parseFloat(average1) + parseFloat(this.focusWRow2.r1)
+                row.r3 = parseFloat(average1) + parseFloat(this.focusWRow2.r3)
+                row.r4 = parseFloat(average2) + parseFloat(this.focusWRow2.r4)
+              }
+            }
+          }else{
+            a = (parseFloat(this.focusWRow2.dailyWeight) / parseFloat(this.focusWRow2.sumr)*100).toFixed(2)
+            row.r2 = parseFloat(row.w2) / a * 100
+          }
+          let b = (a * parseFloat(this.focusWRow2.sumr) / 100).toFixed(2)
           row.w1 = (a * (parseFloat(row.r1) / 100)).toFixed(2)
           row.w3 = (a * (parseFloat(row.r3) / 100)).toFixed(2)
           row.w4 = (a * (parseFloat(row.r4) / 100)).toFixed(2)
           this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
           row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
+          this.$set(row, 'sumr', parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4))
+          row.sumr = formatNum(row.sumr, parseInt(Cookies.get('decimal')))
        }
       } else if (this.table.RWLength == 3) {
         // 三班
@@ -2703,77 +2856,68 @@ export default {
         }
         // 1班3班都不锁
         if (row.isOneWeight == false && row.isThreeWeight == false) {
-          row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (row.r1 == 0 && row.r3 == 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2)) / 2, parseInt(Cookies.get('decimal')))
-            row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w3 = row.w1
-            row.r3 = row.r1
-          } else if (row.r1 == 0 && row.r3 !== 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2) - parseFloat(row.w3)), parseInt(Cookies.get('decimal')))
-            row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            if (row.w1 == '') { row.w1 = 0 }
-            if (row.w2 == '') { row.w2 = 0 }
-            if (row.w3 == '') { row.w3 = 0 }
-            if (row.w4 == '') { row.w4 = 0 }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-            this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
-            row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
-            if (parseFloat(row.dailyWeight) > parseFloat(this.focusWRow2.dailyWeight)) {
-              row.w3 = formatNum((parseFloat(this.focusWRow2.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r3) / (parseFloat(this.focusWRow2.r1) + parseFloat(row.r3)), parseInt(Cookies.get('decimal')))
-              row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-          } else if (row.r1 !== 0 && row.r3 == 0) {
-            row.w3 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2) - parseFloat(row.w1)), parseInt(Cookies.get('decimal')))
-            row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            if (row.w1 == '') { row.w1 = 0 }
-            if (row.w2 == '') { row.w2 = 0 }
-            if (row.w3 == '') { row.w3 = 0 }
-            if (row.w4 == '') { row.w4 = 0 }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-            this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
-            row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
-            if (parseFloat(row.dailyWeight) > parseFloat(this.focusWRow2.dailyWeight)) {
-              row.w1 = formatNum((parseFloat(this.focusWRow2.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r3)), parseInt(Cookies.get('decimal')))
-              row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-          } else {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r3)), parseInt(Cookies.get('decimal')))
-            row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w3 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r3) / (parseFloat(this.focusWRow2.r1) + parseFloat(row.r3)), parseInt(Cookies.get('decimal')))
-            row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          }
-          if (isNaN(row.w1)) {
+          if(isNaN(row.w1) || row.w1 == '' || row.w1 <= 0){
             row.w1 = 0
             row.r1 = 0
           }
-          if (isNaN(row.w3)) {
-            row.w3 = 0
-            row.r3 = 0
+          if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
+            row.w2 = 0
+            // row.r2 = 0
           }
-          if (row.w3 <= 0) {
+          if(isNaN(row.w3) || row.w3 == '' || row.w3 <= 0){
             row.w3 = 0
             row.r3 = 0
           }
-          if (row.w1 <= 0) {
+          if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
             row.w1 = 0
             row.r1 = 0
           }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3), parseInt(Cookies.get('decimal'))))
+          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
+            row.r2 = 0
+            // row.w2 = 0
+          }
+          if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
+            row.r3 = 0
+            row.w3 = 0
+          }
+
+          let a = 0
+          if(parseFloat(this.focusWRow2.r2) !== 0){
+            a = 1 / (parseFloat(row.r2) / 100) * parseFloat(row.w2)
+            if(parseFloat(row.w2) == 0){
+              row.r2 = 0
+              a = (parseFloat(this.focusWRow2.dailyWeight) / parseFloat(this.focusWRow2.sumr)*100).toFixed(2)
+              if(row.r1 === 0 && row.r3 === 0){
+                row.r1 = 0
+                row.r3 = 0
+                console.log('13班比例都为0')
+              }else if(row.r1 === 0 && row.r3 !== 0){
+                row.r1 = 0
+                row.r3 = parseFloat(this.focusWRow2.r2) + parseFloat(this.focusWRow2.r3)
+                console.log('1班比例为0,3班不为0')
+              }else if(row.r1 !== 0 && row.r3 === 0){
+                row.r1 = parseFloat(this.focusWRow2.r2) + parseFloat(this.focusWRow2.r1)
+                row.r3 = 0
+                console.log('3班比例为0,1班不为0')
+              }else{
+                console.log('13班不为0')
+                let average1 = (parseFloat(this.focusWRow2.r2) / 2 ).toFixed(2)
+                row.r1 = parseFloat(average1) + parseFloat(this.focusWRow2.r1)
+                row.r3 = parseFloat(average1) + parseFloat(this.focusWRow2.r3)
+              }
+            }
+          }else{
+            a = (parseFloat(this.focusWRow2.dailyWeight) / parseFloat(this.focusWRow2.sumr)*100).toFixed(2)
+            row.r2 = parseFloat(row.w2) / a * 100
+          }
+
+          let b = (a * parseFloat(row.sumr) / 100).toFixed(2)
+          row.w1 = (a * (parseFloat(row.r1) / 100)).toFixed(2)
+          row.w3 = (a * (parseFloat(row.r3) / 100)).toFixed(2)
+          this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3))
+          row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
+          this.$set(row, 'sumr', parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3))
+          row.sumr = formatNum(row.sumr, parseInt(Cookies.get('decimal')))
         }
       } else if (this.table.RWLength == 2) {
         if (row.isOneWeight == false) {
@@ -2783,8 +2927,43 @@ export default {
           if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
           this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2), parseInt(Cookies.get('decimal'))))
         } else {
-          row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2), parseInt(Cookies.get('decimal'))))
+          if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
+            row.r1 = 0
+            row.w1 = 0
+          }
+          if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
+            row.w2 = 0
+          }
+          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
+            row.r2 = 0
+          }
+          let a = 0
+          if(parseFloat(this.focusWRow2.r2) !== 0){
+            a = 1 / (parseFloat(row.r2) / 100) * parseFloat(row.w2)
+            if(parseFloat(row.w2) == 0){
+              row.r2 = 0
+              a = (parseFloat(this.focusWRow2.dailyWeight) / parseFloat(this.focusWRow2.sumr)*100).toFixed(2)
+              if(row.r1 === 0){
+                row.r1 = 0
+                console.log('1班为0')
+              }
+              if(row.r1 !== 0){
+                row.r1 = parseFloat(this.focusWRow2.r1) + parseFloat(this.focusWRow2.r2)
+                console.log('1班不为0')
+              }
+            }
+          }else{
+            a = (parseFloat(this.focusWRow2.dailyWeight) / parseFloat(this.focusWRow2.sumr)*100).toFixed(2)
+            row.r2 = parseFloat(row.w2) / a * 100
+          }
+          let b = (a * parseFloat(this.focusWRow2.sumr) / 100).toFixed(2)
+          row.w1 = (a * (parseFloat(row.r1) / 100)).toFixed(2)
+          this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2))
+          row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
+          this.$set(row, 'sumr', parseFloat(row.r1) + parseFloat(row.r2))
+          row.sumr = formatNum(row.sumr, parseInt(Cookies.get('decimal')))
+          // row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+          // this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2), parseInt(Cookies.get('decimal'))))
         }
       }
       if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
@@ -3097,37 +3276,105 @@ export default {
         }
         // 2班1班4班未锁
         if (row.isTwoWeight == false && row.isOneWeight == false && row.isFourWeight == false) {
+          // 三班重量失去焦点
           if(isNaN(row.w1) || row.w1 == '' || row.w1 <= 0){
             row.w1 = 0
+            row.r1 = 0
           }
           if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
             row.w2 = 0
-          }
-          if(isNaN(row.w3) || row.w3 == '' || row.w3 <= 0){
-            row.w3 = 0
+            row.r2 = 0
           }
           if(isNaN(row.w4) || row.w4 == '' || row.w4 <= 0){
             row.w4 = 0
+            row.r4 = 0
           }
           if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
             row.r1 = 0
+            row.w1 = 0
           }
           if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
             row.r2 = 0
+            row.w2 = 0
+          }
+          if(isNaN(row.r4) || row.r4 == '' || row.r4 <= 0){
+            row.r4 = 0
+            row.w4 = 0
+          }
+          if(isNaN(row.w3) || row.w3 == '' || row.w3 <= 0){
+            row.w3 = 0
+            // row.r3 = 0
           }
           if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
+            // row.w3 = 0
             row.r3 = 0
           }
-          if(isNaN(row.r4) || row.r4 == '' || row.r4 <= 0){
-            row.r4 = 0
+          let a = 0
+          if(parseFloat(this.focusWRow3.r3) !== 0){
+            a = 1 / (parseFloat(row.r3) / 100) * parseFloat(row.w3)
+            if(parseFloat(row.w3) == 0){
+              row.r3 = 0
+              a = (parseFloat(this.focusWRow3.dailyWeight) / parseFloat(this.focusWRow3.sumr)*100).toFixed(2)
+              if(row.r1 === 0 && row.r2 === 0 && row.r4 === 0){
+                row.r1 = 0
+                row.r2 = 0
+                row.r4 = 0
+                console.log('124班比例都为0')
+              }else if(row.r1 === 0 && row.r2 === 0 && row.r4 !== 0){
+                row.r1 = 0
+                row.r2 = 0
+                row.r4 = parseFloat(this.focusWRow3.r3) + parseFloat(this.focusWRow3.r4)
+                console.log('12班比例为0,4班不为0')
+              }else if(row.r1 === 0 && row.r4 === 0 && row.r2 !== 0){
+                row.r1 = 0
+                row.r4 = 0
+                row.r2 = parseFloat(this.focusWRow3.r3) + parseFloat(this.focusWRow3.r2)
+                console.log('14班比例为0,2班不为0')
+              }else if(row.r2 === 0 && row.r4 === 0 && row.r1 !== 0){
+                row.r2 = 0
+                row.r4 = 0
+                row.r1 = parseFloat(this.focusWRow3.r3) + parseFloat(this.focusWRow3.r1)
+                console.log('24班比例为0,1班不为0')
+              }else if(row.r1 === 0 && row.r2 !== 0 && row.r4 !== 0){
+                row.r1 = 0
+                row.r2 = parseFloat(this.focusWRow3.r3) / 2 + parseFloat(this.focusWRow3.r2)
+                row.r4 = parseFloat(this.focusWRow3.r3) / 2 + parseFloat(this.focusWRow3.r4)
+                console.log('1班比例为0,24班不为0')
+              }else if(row.r2 === 0 && row.r1 !== 0 && row.r4 !== 0){
+                row.r2 = 0
+                row.r1 = parseFloat(this.focusWRow3.r2) / 2 + parseFloat(this.focusWRow3.r1)
+                row.r4 = parseFloat(this.focusWRow3.r2) / 2 + parseFloat(this.focusWRow3.r4)
+                console.log('3班比例为0,14班不为0')
+              }else if(row.r4 === 0 && row.r1 !== 0 && row.r3 !== 0){
+                row.r4 = 0
+                row.r1 = parseFloat(this.focusWRow3.r3) / 2 + parseFloat(this.focusWRow3.r1)
+                row.r2 = parseFloat(this.focusWRow3.r3) / 2 + parseFloat(this.focusWRow3.r2)
+                console.log('4班比例为0,12班不为0')
+              }else{
+                console.log('124班不为0')
+                let average1 = (parseFloat(this.focusWRow3.r3) / 3 ).toFixed(2)
+                let average2 = (parseFloat(this.focusWRow3.r3) - average1*2).toFixed(2)
+                row.r1 = parseFloat(average1) + parseFloat(this.focusWRow3.r1)
+                row.r2 = parseFloat(average1) + parseFloat(this.focusWRow3.r2)
+                row.r4 = parseFloat(average2) + parseFloat(this.focusWRow3.r4)
+                console.log('row.r1',row.r1)
+                console.log('row.r2',row.r2)
+                console.log('row.r4',row.r4)
+              }
+            }
+          }else{
+            a = (parseFloat(this.focusWRow3.dailyWeight) / parseFloat(this.focusWRow3.sumr)*100).toFixed(2)
+            row.r3 = parseFloat(row.w3) / a *100
           }
-          let a = (1/ (parseFloat(row.r3) / 100) * parseFloat(row.w3)).toFixed(2)
+          console.log(a,'aa==')
           let b = (a * parseFloat(row.sumr) / 100).toFixed(2)
-          row.w2 = (a * (parseFloat(row.r2) / 100)).toFixed(2)
           row.w1 = (a * (parseFloat(row.r1) / 100)).toFixed(2)
+          row.w2 = (a * (parseFloat(row.r2) / 100)).toFixed(2)
           row.w4 = (a * (parseFloat(row.r4) / 100)).toFixed(2)
           this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
           row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
+          this.$set(row, 'sumr', parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4))
+          row.sumr = formatNum(row.sumr, parseInt(Cookies.get('decimal')))
         }
       } else if (this.table.RWLength == 3) {
         // 三班
@@ -3159,80 +3406,68 @@ export default {
           }
           this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3), parseInt(Cookies.get('decimal'))))
         }
-        // 2班3班都不锁
         // 1班2班都不锁
         if (row.isOneWeight == false && row.isTwoWeight == false) {
-          row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (row.r1 == 0 && row.r2 == 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3)) / 2, parseInt(Cookies.get('decimal')))
-            row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w2 = row.w1
-            row.r2 = row.r1
-          } else if (row.r1 == 0 && row.r2 !== 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w2)), parseInt(Cookies.get('decimal')))
-            row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            if (row.w1 == '') { row.w1 = 0 }
-            if (row.w2 == '') { row.w2 = 0 }
-            if (row.w3 == '') { row.w3 = 0 }
-            if (row.w4 == '') { row.w4 = 0 }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-            this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
-            row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
-            if (parseFloat(row.dailyWeight) > parseFloat(this.focusWRow3.dailyWeight)) {
-              row.w2 = formatNum((parseFloat(this.focusWRow3.dailyWeight) - parseFloat(row.w3)) * parseFloat(row.r2) / (parseFloat(this.focusWRow3.r1) + parseFloat(row.r2)), parseInt(Cookies.get('decimal')))
-              row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-          } else if (row.r1 !== 0 && row.r2 == 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w1)), parseInt(Cookies.get('decimal')))
-            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            if (row.w1 == '') { row.w1 = 0 }
-            if (row.w2 == '') { row.w2 = 0 }
-            if (row.w3 == '') { row.w3 = 0 }
-            if (row.w4 == '') { row.w4 = 0 }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-            this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
-            row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
-            if (parseFloat(row.dailyWeight) > parseFloat(this.focusWRow3.dailyWeight)) {
-              row.w1 = formatNum((parseFloat(this.focusWRow3.dailyWeight) - parseFloat(row.w3)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r2)), parseInt(Cookies.get('decimal')))
-              row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            }
-            if (row.w1 <= 0) { row.w1 = 0; row.r1 = 0 }
-            if (row.w2 <= 0) { row.w2 = 0; row.r2 = 0 }
-            if (row.w3 <= 0) { row.w3 = 0; row.r3 = 0 }
-            if (row.w4 <= 0) { row.w4 = 0; row.r4 = 0 }
-          } else {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r2)), parseInt(Cookies.get('decimal')))
-            row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3)) * parseFloat(row.r2) / (parseFloat(this.focusWRow3.r1) + parseFloat(row.r2)), parseInt(Cookies.get('decimal')))
-            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          }
-          if (isNaN(row.w1)) {
+          if(isNaN(row.w1) || row.w1== '' || row.w1 <= 0){
             row.w1 = 0
             row.r1 = 0
           }
-          if (isNaN(row.w2)) {
+          if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
             row.w2 = 0
             row.r2 = 0
           }
-          if (row.w1 <= 0) {
-            row.w1 = 0
+          if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
             row.r1 = 0
+            row.w1 = 0
           }
-          if (row.w2 <= 0) {
-            row.w2 = 0
+          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
             row.r2 = 0
+            row.w2 = 0
           }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3), parseInt(Cookies.get('decimal'))))
+          if(isNaN(row.w3) || row.w3 == '' || row.w3 <= 0){
+            row.w3 = 0
+            // row.r3 = 0
+          }
+          if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
+            // row.w3 = 0
+            row.r3 = 0
+          }
+          let a = 0
+          if(parseFloat(this.focusWRow3.r3) !== 0){
+            a = 1 / (parseFloat(row.r3) / 100) * parseFloat(row.w3)
+            if(parseFloat(row.w3) == 0){
+              a = (parseFloat(this.focusWRow3.dailyWeight) / parseFloat(this.focusWRow3.sumr)*100).toFixed(2)
+              row.r3 = 0
+              if(row.r1 === 0 && row.r2 === 0){
+                row.r1 = 0
+                row.r2 = 0
+                console.log('12班比例都为0')
+              }else if(row.r1 === 0 && row.r2 !== 0){
+                row.r1 = 0
+                row.r2 = parseFloat(this.focusWRow3.r3) + parseFloat(this.focusWRow3.r2)
+                console.log('1班比例为0,2班不为0')
+              }else if(row.r1 !== 0 && row.r2 === 0){
+                row.r1 = parseFloat(this.focusWRow3.r3) + parseFloat(this.focusWRow3.r1)
+                row.r2 = 0
+                console.log('2班比例为0,1班不为0')
+              }else{
+                console.log('13班不为0')
+                let average1 = (parseFloat(this.focusWRow3.r3) / 2).toFixed(2)
+                row.r1 = parseFloat(average1) + parseFloat(this.focusWRow3.r1)
+                row.r2 = parseFloat(average1) + parseFloat(this.focusWRow3.r2)
+              }
+            }
+          }else{
+            a = (parseFloat(this.focusWRow3.dailyWeight) / parseFloat(this.focusWRow3.sumr)*100).toFixed(2)
+            row.r3 = parseFloat(row.w3) / a *100
+          }
+          let b = (a * parseFloat(row.sumr) / 100).toFixed(2)
+          row.w1 = (a * (parseFloat(row.r1) / 100)).toFixed(2)
+          row.w2 = (a * (parseFloat(row.r2) / 100)).toFixed(2)
+          this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3))
+          row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
+          this.$set(row, 'sumr', parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3))
+          row.sumr = formatNum(row.sumr, parseInt(Cookies.get('decimal')))
         }
       }
       if (row.w1 == '') { row.w1 = 0 }
@@ -3393,7 +3628,7 @@ export default {
         // 3班锁定，2班1班未锁
         if (row.isOneWeight == false && row.isTwoWeight == false && row.isThreeWeight == true) {
           row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (row.r1 == 0 && row.r2 == 0) {
+          if (row.r1 === 0 && row.r2 === 0) {
             row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w4) - parseFloat(row.w3)) / 2, parseInt(Cookies.get('decimal')))
             row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
             row.w2 = row.w1
@@ -3468,7 +3703,7 @@ export default {
         // 1班锁定，2班3班未锁
         if (row.isOneWeight == true && row.isTwoWeight == false && row.isThreeWeight == false) {
           row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (row.r2 == 0 && row.r3 == 0) {
+          if (row.r2 === 0 && row.r3 === 0) {
             row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w4)) / 2, parseInt(Cookies.get('decimal')))
             row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
             row.w3 = row.w2
@@ -3542,50 +3777,105 @@ export default {
         }
         // 2班3班1班未锁
         if (row.isOneWeight == false && row.isTwoWeight == false && row.isThreeWeight == false) {
+          // 四班重量失去焦点
           if(isNaN(row.w1) || row.w1 == '' || row.w1 <= 0){
             row.w1 = 0
+            row.r1 = 0
           }
           if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
             row.w2 = 0
+            row.r2 = 0
           }
           if(isNaN(row.w3) || row.w3 == '' || row.w3 <= 0){
             row.w3 = 0
-          }
-          if(isNaN(row.w4) || row.w4 == '' || row.w4 <= 0){
-            row.w4 = 0
+            row.r3 = 0
           }
           if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
             row.r1 = 0
+            row.w1 = 0
           }
           if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
             row.r2 = 0
+            row.w2 = 0
           }
           if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
             row.r3 = 0
+            row.w3 = 0
+          }
+          if(isNaN(row.w4) || row.w4 == '' || row.w4 <= 0){
+            row.w4 = 0
+            // row.r4 = 0
           }
           if(isNaN(row.r4) || row.r4 == '' || row.r4 <= 0){
+            // row.w4 = 0
             row.r4 = 0
           }
-          let a = (1/ (parseFloat(row.r4) / 100) * parseFloat(row.w4)).toFixed(2)
+          let a = 0
+          if(parseFloat(this.focusWRow4.r4) !== 0){
+            console.log(124556)
+            a = 1 / (parseFloat(row.r4) / 100) * parseFloat(row.w4)
+            if(parseFloat(row.w4) == 0){
+              row.r4 = 0
+              a = (parseFloat(this.focusWRow4.dailyWeight) / parseFloat(this.focusWRow4.sumr) *100).toFixed(2)
+              if(row.r1 === 0 && row.r2 === 0 && row.r3 === 0){
+                row.r1 = 0
+                row.r2 = 0
+                row.r3 = 0
+                console.log('123班比例都为0')
+              }else if(row.r1 === 0 && row.r2 === 0 && row.r3 !== 0){
+                row.r1 = 0
+                row.r2 = 0
+                row.r3 = parseFloat(this.focusWRow4.r4) + parseFloat(this.focusWRow4.r3)
+                console.log('12班比例为0,3班不为0')
+              }else if(row.r1 === 0 && row.r3 === 0 && row.r2 !== 0){
+                row.r1 = 0
+                row.r3 = 0
+                row.r2 = parseFloat(this.focusWRow4.r4) + parseFloat(this.focusWRow4.r2)
+                console.log('13班比例为0,2班不为0')
+              }else if(row.r2 === 0 && row.r3 === 0 && row.r1 !== 0){
+                row.r2 = 0
+                row.r3 = 0
+                row.r1 = parseFloat(this.focusWRow4.r4) + parseFloat(this.focusWRow4.r1)
+                console.log('23班比例为0,1班不为0')
+              }else if(row.r1 === 0 && row.r2 !== 0 && row.r3 !== 0){
+                row.r1 = 0
+                row.r2 = parseFloat(this.focusWRow4.r4) / 2 + parseFloat(this.focusWRow4.r2)
+                row.r3 = parseFloat(this.focusWRow4.r4) / 2 + parseFloat(this.focusWRow4.r3)
+                console.log('1班比例为0,23班不为0')
+              }else if(row.r2 === 0 && row.r1 !== 0 && row.r3 !== 0){
+                row.r2 = 0
+                row.r1 = parseFloat(this.focusWRow4.r4) / 2 + parseFloat(this.focusWRow4.r1)
+                row.r3 = parseFloat(this.focusWRow4.r4) / 2 + parseFloat(this.focusWRow4.r3)
+                console.log('2班比例为0,13班不为0')
+              }else if(row.r3 === 0 && row.r1 !== 0 && row.r2 !== 0){
+                row.r3 = 0
+                row.w3 = 0
+                row.r1 = parseFloat(this.focusWRow4.r4) / 2 + parseFloat(this.focusWRow4.r1)
+                row.r2 = parseFloat(this.focusWRow4.r4) / 2 + parseFloat(this.focusWRow4.r2)
+                console.log('3班比例为0,12班不为0')
+              }else{
+                console.log('123班不为0')
+                let average1 = (parseFloat(this.focusWRow4.r4) / 3 ).toFixed(2)
+                let average2 = (parseFloat(this.focusWRow4.r4) - average1*2).toFixed(2)
+                row.r1 = parseFloat(average1) + parseFloat(this.focusWRow4.r1)
+                row.r2 = parseFloat(average1) + parseFloat(this.focusWRow4.r2)
+                row.r3 = parseFloat(average2) + parseFloat(this.focusWRow4.r3)
+              }
+            }
+          }else{
+            a = (parseFloat(this.focusWRow4.dailyWeight) / parseFloat(this.focusWRow4.sumr) *100).toFixed(2)
+            row.r4 = parseFloat(row.w4) / a * 100
+          }
           let b = (a * parseFloat(row.sumr) / 100).toFixed(2)
+          row.w1 = (a * (parseFloat(row.r1) / 100)).toFixed(2)
           row.w2 = (a * (parseFloat(row.r2) / 100)).toFixed(2)
           row.w3 = (a * (parseFloat(row.r3) / 100)).toFixed(2)
-          row.w1 = (a * (parseFloat(row.r1) / 100)).toFixed(2)
           this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
           row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
+          this.$set(row, 'sumr', parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4))
+          row.sumr = formatNum(row.sumr, parseInt(Cookies.get('decimal')))
         }
       }
-      if (row.w1 == '') { row.w1 = 0 }
-      if (row.w2 == '') { row.w2 = 0 }
-      if (row.w3 == '') { row.w3 = 0 }
-      if (row.w4 == '') { row.w4 = 0 }
-      if (isNaN(row.r1)) { row.r1 = 0 }
-      if (isNaN(row.r2)) { row.r2 = 0 }
-      if (isNaN(row.r3)) { row.r3 = 0 }
-      if (isNaN(row.r4)) { row.r4 = 0 }
-      this.$set(row, 'sumr', formatNum(parseFloat(row.r1)+parseFloat(row.r2)+parseFloat(row.r3)+parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
-      this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4))
-      row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
     },
     celldblclick(row, column, cell, event) {
       console.log(row, '=====')
@@ -3651,7 +3941,8 @@ export default {
         }else{
           obj['supplement'] = row['bw' + i]
         }
-        obj['tratio'] = Math.round(row['r' + i])
+        obj['tratio'] = (parseFloat(row['r' + i])).toFixed(2)
+        // obj['tratio'] = Math.round(row['r' + i])
         obj['todaysupplement'] = row.todaysupplement
         obj['todayweight'] = row.todayweight
         arr.push(obj)

src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -17,7 +17,7 @@
         <el-option v-for="item in workingConditionList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <!-- 临时注释 -->
-      <!-- <div style="display: inline-block;" class="filter-item1">
+      <div style="display: inline-block;" class="filter-item1">
         <el-input-number :controls="false" :precision="2" v-model="hlwc1" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
         <span>-</span>
         <el-input-number :controls="false" :precision="2"  v-model="hlwc2" placeholder="混料误差值" style="width: 120px;" class="filter-item" clearable />
@@ -37,7 +37,7 @@
         <span>-</span>
         <el-input-number :controls="false" :precision="2" v-model="slzq2" placeholder="撒料准确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
       </div>
-      <el-checkbox v-model="ccys" style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox> -->
+      <el-checkbox v-model="ccys" style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox>
       <!-- 临时注释 -->
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
@@ -842,82 +842,82 @@ export default {
         this.table.getdataListParm.parammaps.stopTime = ''
       }
       // 临时注释
-      // this.table.getdataListParm.parammaps.hlwc1 = this.hlwc1
-      // this.table.getdataListParm.parammaps.hlwc2 = this.hlwc2
-      // this.table.getdataListParm.parammaps.hlzq1 = this.hlzq1
-      // this.table.getdataListParm.parammaps.hlzq2 = this.hlzq2
-      // this.table.getdataListParm.parammaps.slwc1 = this.slwc1
-      // this.table.getdataListParm.parammaps.slwc2 = this.slwc2
-      // this.table.getdataListParm.parammaps.slzq1 = this.slzq1
-      // this.table.getdataListParm.parammaps.slzq2 = this.slzq2
-      // if(this.ccys == true){
-      //   if(this.table3.getdataListParm.name !== 'getprocessAnalysisHL'){
-      //     this.hlwc1 = undefined
-      //     this.hlwc2 = undefined
-      //     this.hlzq1 = undefined
-      //     this.hlzq2 = undefined
-      //     this.slwc1 = undefined
-      //     this.slwc2 = undefined
-      //     this.slzq1 = undefined
-      //     this.slzq2 = undefined
-      //     this.table.getdataListParm.parammaps.error = ''
-      //     this.table3.getdataListParm.parammaps.error = ''
-      //     this.table4.getdataListParm.parammaps.error = ''
-      //   }
-      //   if(this.table3.getdataListParm.name == 'getprocessAnalysisHL'){
-      //     this.table3.getdataListParm.parammaps.hlwc1  = this.hlwc1
-      //     this.table3.getdataListParm.parammaps.hlwc2  = this.hlwc2
-      //     this.table3.getdataListParm.parammaps.hlzq1  = this.hlzq1
-      //     this.table3.getdataListParm.parammaps.hlzq2  = this.hlzq2
-      //     this.table3.getdataListParm.parammaps.slwc1  = this.slwc1
-      //     this.table3.getdataListParm.parammaps.slwc2  = this.slwc2
-      //     this.table3.getdataListParm.parammaps.slzq1  = this.slzq1
-      //     this.table3.getdataListParm.parammaps.slzq2  = this.slzq2
-      //     this.table3.getdataListParm.parammaps.error  = '有误差'
-      //   }
-      //   if(this.table4.getdataListParm.name == 'getprocessAnalysisSL'){
-      //     this.table4.getdataListParm.parammaps.hlwc1  = this.hlwc1
-      //     this.table4.getdataListParm.parammaps.hlwc2  = this.hlwc2
-      //     this.table4.getdataListParm.parammaps.hlzq1  = this.hlzq1
-      //     this.table4.getdataListParm.parammaps.hlzq2  = this.hlzq2
-      //     this.table4.getdataListParm.parammaps.slwc1  = this.slwc1
-      //     this.table4.getdataListParm.parammaps.slwc2  = this.slwc2
-      //     this.table4.getdataListParm.parammaps.slzq1  = this.slzq1
-      //     this.table4.getdataListParm.parammaps.slzq2  = this.slzq2
-      //     this.table4.getdataListParm.parammaps.error  = '有误差'
-      //   }
-      //   if(this.table.getdataListParm.name == 'getprocessAnalysis'){
-      //     this.table.getdataListParm.parammaps.hlwc1  = this.hlwc1
-      //     this.table.getdataListParm.parammaps.hlwc2  = this.hlwc2
-      //     this.table.getdataListParm.parammaps.hlzq1  = this.hlzq1
-      //     this.table.getdataListParm.parammaps.hlzq2  = this.hlzq2
-      //     this.table.getdataListParm.parammaps.slwc1  = this.slwc1
-      //     this.table.getdataListParm.parammaps.slwc2  = this.slwc2
-      //     this.table.getdataListParm.parammaps.slzq1  = this.slzq1
-      //     this.table.getdataListParm.parammaps.slzq2  = this.slzq2
-      //     this.table.getdataListParm.parammaps.error = '有误差'
-      //   }
-      // }else{
-      //   this.table3.getdataListParm.parammaps.hlwc1  = ''
-      //   this.table3.getdataListParm.parammaps.hlwc2  = ''
-      //   this.table3.getdataListParm.parammaps.hlzq1  = ''
-      //   this.table3.getdataListParm.parammaps.hlzq2  = ''
-      //   this.table3.getdataListParm.parammaps.slwc1  = ''
-      //   this.table3.getdataListParm.parammaps.slwc2  = ''
-      //   this.table3.getdataListParm.parammaps.slzq1  = ''
-      //   this.table3.getdataListParm.parammaps.slzq2  = ''
-      //   this.table4.getdataListParm.parammaps.hlwc1  = ''
-      //   this.table4.getdataListParm.parammaps.hlwc2  = ''
-      //   this.table4.getdataListParm.parammaps.hlzq1  = ''
-      //   this.table4.getdataListParm.parammaps.hlzq2  = ''
-      //   this.table4.getdataListParm.parammaps.slwc1  = ''
-      //   this.table4.getdataListParm.parammaps.slwc2  = ''
-      //   this.table4.getdataListParm.parammaps.slzq1  = ''
-      //   this.table4.getdataListParm.parammaps.slzq2  = ''
-      //   this.table3.getdataListParm.parammaps.error  = ''
-      //   this.table4.getdataListParm.parammaps.error  = ''
-      // }
-      // // 临时注释
+      this.table.getdataListParm.parammaps.hlwc1 = this.hlwc1
+      this.table.getdataListParm.parammaps.hlwc2 = this.hlwc2
+      this.table.getdataListParm.parammaps.hlzq1 = this.hlzq1
+      this.table.getdataListParm.parammaps.hlzq2 = this.hlzq2
+      this.table.getdataListParm.parammaps.slwc1 = this.slwc1
+      this.table.getdataListParm.parammaps.slwc2 = this.slwc2
+      this.table.getdataListParm.parammaps.slzq1 = this.slzq1
+      this.table.getdataListParm.parammaps.slzq2 = this.slzq2
+      if(this.ccys == true){
+        if(this.table3.getdataListParm.name !== 'getprocessAnalysisHL'){
+          this.hlwc1 = undefined
+          this.hlwc2 = undefined
+          this.hlzq1 = undefined
+          this.hlzq2 = undefined
+          this.slwc1 = undefined
+          this.slwc2 = undefined
+          this.slzq1 = undefined
+          this.slzq2 = undefined
+          this.table.getdataListParm.parammaps.error = ''
+          this.table3.getdataListParm.parammaps.error = ''
+          this.table4.getdataListParm.parammaps.error = ''
+        }
+        if(this.table3.getdataListParm.name == 'getprocessAnalysisHL'){
+          this.table3.getdataListParm.parammaps.hlwc1  = this.hlwc1
+          this.table3.getdataListParm.parammaps.hlwc2  = this.hlwc2
+          this.table3.getdataListParm.parammaps.hlzq1  = this.hlzq1
+          this.table3.getdataListParm.parammaps.hlzq2  = this.hlzq2
+          this.table3.getdataListParm.parammaps.slwc1  = this.slwc1
+          this.table3.getdataListParm.parammaps.slwc2  = this.slwc2
+          this.table3.getdataListParm.parammaps.slzq1  = this.slzq1
+          this.table3.getdataListParm.parammaps.slzq2  = this.slzq2
+          this.table3.getdataListParm.parammaps.error  = '有误差'
+        }
+        if(this.table4.getdataListParm.name == 'getprocessAnalysisSL'){
+          this.table4.getdataListParm.parammaps.hlwc1  = this.hlwc1
+          this.table4.getdataListParm.parammaps.hlwc2  = this.hlwc2
+          this.table4.getdataListParm.parammaps.hlzq1  = this.hlzq1
+          this.table4.getdataListParm.parammaps.hlzq2  = this.hlzq2
+          this.table4.getdataListParm.parammaps.slwc1  = this.slwc1
+          this.table4.getdataListParm.parammaps.slwc2  = this.slwc2
+          this.table4.getdataListParm.parammaps.slzq1  = this.slzq1
+          this.table4.getdataListParm.parammaps.slzq2  = this.slzq2
+          this.table4.getdataListParm.parammaps.error  = '有误差'
+        }
+        if(this.table.getdataListParm.name == 'getprocessAnalysis'){
+          this.table.getdataListParm.parammaps.hlwc1  = this.hlwc1
+          this.table.getdataListParm.parammaps.hlwc2  = this.hlwc2
+          this.table.getdataListParm.parammaps.hlzq1  = this.hlzq1
+          this.table.getdataListParm.parammaps.hlzq2  = this.hlzq2
+          this.table.getdataListParm.parammaps.slwc1  = this.slwc1
+          this.table.getdataListParm.parammaps.slwc2  = this.slwc2
+          this.table.getdataListParm.parammaps.slzq1  = this.slzq1
+          this.table.getdataListParm.parammaps.slzq2  = this.slzq2
+          this.table.getdataListParm.parammaps.error = '有误差'
+        }
+      }else{
+        this.table3.getdataListParm.parammaps.hlwc1  = ''
+        this.table3.getdataListParm.parammaps.hlwc2  = ''
+        this.table3.getdataListParm.parammaps.hlzq1  = ''
+        this.table3.getdataListParm.parammaps.hlzq2  = ''
+        this.table3.getdataListParm.parammaps.slwc1  = ''
+        this.table3.getdataListParm.parammaps.slwc2  = ''
+        this.table3.getdataListParm.parammaps.slzq1  = ''
+        this.table3.getdataListParm.parammaps.slzq2  = ''
+        this.table4.getdataListParm.parammaps.hlwc1  = ''
+        this.table4.getdataListParm.parammaps.hlwc2  = ''
+        this.table4.getdataListParm.parammaps.hlzq1  = ''
+        this.table4.getdataListParm.parammaps.hlzq2  = ''
+        this.table4.getdataListParm.parammaps.slwc1  = ''
+        this.table4.getdataListParm.parammaps.slwc2  = ''
+        this.table4.getdataListParm.parammaps.slzq1  = ''
+        this.table4.getdataListParm.parammaps.slzq2  = ''
+        this.table3.getdataListParm.parammaps.error  = ''
+        this.table4.getdataListParm.parammaps.error  = ''
+      }
+      // 临时注释
       this.table.getdataListParm.offset = 1
       this.getList()
     },