更新6-15

src/views/formulationPlan/dhedFormula/index.vue

@@ -2174,189 +2174,37 @@ export default {
         }
         // 2班3班4班未锁
         if (row.isTwoWeight == false && row.isThreeWeight == false && row.isFourWeight == false) {
-          console.log('1231234')
-          row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (parseFloat(row.r2) == 0 && parseFloat(row.r3) == 0 && parseFloat(row.r4) == 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1)) / 3, parseInt(Cookies.get('decimal')))
-            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w3 = row.w2
-            row.w4 = row.w2
-            row.r3 = row.r2
-            row.r4 = row.r2
-          } else if (parseFloat(row.r2) == 0 && parseFloat(row.r3) == 0 && parseFloat(row.r4) !== 0) {
-            row.w3 = formatNum(((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w4))) / 2, parseInt(Cookies.get('decimal')))
-            row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w2 = row.w3
-            row.r2 = row.r3
-            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.w4 = formatNum((parseFloat(this.focusWRow.dailyWeight) - parseFloat(row.w1)) * parseFloat(this.focusWRow.r4) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3) + parseFloat(this.focusWRow.r4)), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / 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 (parseFloat(row.r2) == 0 && parseFloat(row.r3) !== 0 && parseFloat(row.r4) == 0) {
-            row.w2 = formatNum(((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3))) / 2, parseInt(Cookies.get('decimal')))
-            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = row.w2
-            row.r4 = row.r2
-            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(this.focusWRow.dailyWeight) - parseFloat(row.w1)) * parseFloat(this.focusWRow.r3) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3) + parseFloat(this.focusWRow.r4)), 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 (parseFloat(row.r2) !== 0 && parseFloat(row.r3) == 0 && parseFloat(row.r4) == 0) {
-            row.w3 = formatNum(((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w2))) / 2, parseInt(Cookies.get('decimal')))
-            row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = row.w3
-            row.r4 = row.r3
-            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(this.focusWRow.dailyWeight) - parseFloat(row.w1)) * parseFloat(row.r2) / (parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4)), 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.r2 == 0 && row.r3 !== 0 && row.r4 !== 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3) - parseFloat(row.w4)), 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')))
-            console.log(row.dailyWeight)
-            console.log(this.focusWRow.dailyWeight)
-            if (parseFloat(row.dailyWeight) > parseFloat(this.focusWRow.dailyWeight)) {
-              row.w3 = formatNum((parseFloat(this.focusWRow.dailyWeight) - parseFloat(row.w1)) * parseFloat(this.focusWRow.r3) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3) + parseFloat(this.focusWRow.r4)), parseInt(Cookies.get('decimal')))
-              row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w4 = formatNum((parseFloat(this.focusWRow.dailyWeight) - parseFloat(row.w1)) * parseFloat(this.focusWRow.r4) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3) + parseFloat(this.focusWRow.r4)), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / 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.r4 !== 0) {
-            row.w3 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w2) - parseFloat(row.w4)), 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(this.focusWRow.dailyWeight) - parseFloat(row.w1)) * parseFloat(row.r2) / (parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-              row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w4 = formatNum((parseFloat(this.focusWRow.dailyWeight) - parseFloat(row.w1)) * parseFloat(this.focusWRow.r4) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3) + parseFloat(this.focusWRow.r4)), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / 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.r4 == 0) {
-            row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w2) - parseFloat(row.w3)), parseInt(Cookies.get('decimal')))
-            row.r4 = formatNum(parseFloat(row.w4) / 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(this.focusWRow.dailyWeight) - parseFloat(row.w1)) * parseFloat(row.r2) / (parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-              row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w3 = formatNum((parseFloat(this.focusWRow.dailyWeight) - parseFloat(row.w1)) * parseFloat(row.r3) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3) + parseFloat(this.focusWRow.r4)), 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 {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1)) * parseFloat(row.r2) / (parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4)), 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(row.r3) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3) + parseFloat(this.focusWRow.r4)), parseInt(Cookies.get('decimal')))
-            row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1)) * parseFloat(row.r4) / (parseFloat(this.focusWRow.r2) + parseFloat(this.focusWRow.r3) + parseFloat(this.focusWRow.r4)), parseInt(Cookies.get('decimal')))
-            row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+          if(isNaN(row.w1) || row.w1 == '' || row.w1 <= 0){
+            row.w1 = 0
           }
-          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 (isNaN(row.w4)) {
+          if(isNaN(row.w4) || row.w4 == '' || row.w4 <= 0){
             row.w4 = 0
-            row.r4 = 0
           }
-
-          if (row.w2 <= 0) {
-            row.w2 = 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
           }
-          if (row.w3 <= 0) {
-            row.w3 = 0
+          if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
             row.r3 = 0
           }
-          if (row.w4 <= 0) {
-            row.w4 = 0
+          if(isNaN(row.r4) || row.r4 == '' || row.r4 <= 0){
             row.r4 = 0
           }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
+          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')))
         }
       } else if (this.table.RWLength == 3) {
         // 三班
@@ -2792,187 +2640,38 @@ export default {
         }
         // 1班3班4班未锁
         if (row.isOneWeight == false && row.isThreeWeight == false && row.isFourWeight == false) {
-          row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (row.r1 == 0 && row.r3 == 0 && row.r4 == 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2)) / 3, 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
-            row.w4 = row.w1
-            row.r4 = row.r1
-          } else if (row.r1 == 0 && row.r3 == 0 && row.r4 !== 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2) - parseFloat(row.w4)) / 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
-            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.w4 = formatNum((parseFloat(this.focusWRow2.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r4) / (parseFloat(this.focusWRow2.r1) + parseFloat(this.focusWRow2.r3) + parseFloat(this.focusWRow2.r4)), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / 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.r4 == 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2) - parseFloat(row.w3)) / 2, parseInt(Cookies.get('decimal')))
-            row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = row.w1
-            row.r4 = row.r1
-            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(this.focusWRow2.r3) + parseFloat(this.focusWRow2.r4)), parseInt(Cookies.get('decimal')))
-              row.r3 = 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.r3 == 0 && row.r4 == 0) {
-            row.w3 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2) - parseFloat(row.w1)) / 2, parseInt(Cookies.get('decimal')))
-            row.r3 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = row.w3
-            row.r4 = row.r3
-            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) + parseFloat(row.r4)), 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 if ((row.r1 !== 0 && row.r3 !== 0 && row.r4 == 0)) {
-            row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2) - parseFloat(row.w1) - parseFloat(row.w3)), parseInt(Cookies.get('decimal')))
-            row.r4 = formatNum(parseFloat(row.w4) / 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) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-              row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w3 = formatNum((parseFloat(this.focusWRow2.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r3) / (parseFloat(this.focusWRow2.r1) + parseFloat(this.focusWRow2.r3) + parseFloat(this.focusWRow2.r4)), parseInt(Cookies.get('decimal')))
-              row.r3 = 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.r3 == 0 && row.r4 !== 0)) {
-            row.w3 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2) - parseFloat(row.w1) - parseFloat(row.w4)), 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) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-              row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w4 = formatNum((parseFloat(this.focusWRow2.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r4) / (parseFloat(this.focusWRow2.r1) + parseFloat(this.focusWRow2.r3) + parseFloat(this.focusWRow2.r4)), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / 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.r4 !== 0)) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2) - parseFloat(row.w3) - parseFloat(row.w4)), 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(this.focusWRow2.r3) + parseFloat(this.focusWRow2.r4)), parseInt(Cookies.get('decimal')))
-              row.r3 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w4 = formatNum((parseFloat(this.focusWRow2.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r4) / (parseFloat(this.focusWRow2.r1) + parseFloat(this.focusWRow2.r3) + parseFloat(this.focusWRow2.r4)), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / 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 {
-            console.log('wolaile')
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r3) + parseFloat(row.r4)), 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(this.focusWRow2.r3) + parseFloat(this.focusWRow2.r4)), parseInt(Cookies.get('decimal')))
-            row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r4) / (parseFloat(this.focusWRow2.r1) + parseFloat(this.focusWRow2.r3) + parseFloat(this.focusWRow2.r4)), parseInt(Cookies.get('decimal')))
-            row.r4 = formatNum(parseFloat(row.w4) / 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)) {
+          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.r3 = 0
           }
-          if (isNaN(row.w4)) {
+          if(isNaN(row.w4) || row.w4 == '' || row.w4 <= 0){
             row.w4 = 0
-            row.r4 = 0
           }
-          if (row.w1 <= 0) {
-            row.w1 = 0
+          if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
             row.r1 = 0
           }
-          if (row.w3 <= 0) {
-            row.w3 = 0
+          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
+            row.r2 = 0
+          }
+          if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
             row.r3 = 0
           }
-          if (row.w4 <= 0) {
-            row.w4 = 0
+          if(isNaN(row.r4) || row.r4 == '' || row.r4 <= 0){
             row.r4 = 0
           }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
-        }
+          let a = (1/ (parseFloat(row.r2) / 100) * parseFloat(row.w2)).toFixed(2)
+          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)
+          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')))
+       }
       } else if (this.table.RWLength == 3) {
         // 三班
         // 1班/3班锁定
@@ -3228,235 +2927,36 @@ export default {
             row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w2) - parseFloat(row.w3)) * parseFloat(row.r4) / (parseFloat(this.focusWRow3.r1) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
             row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
           }
-          if (isNaN(row.w1)) {
-            row.w1 = 0
-            row.r1 = 0
-          }
-          if (isNaN(row.w4)) {
-            row.w4 = 0
-            row.r4 = 0
-          }
-
-          if (row.w1 <= 0) {
-            row.w1 = 0
-            row.r1 = 0
-          }
-          if (row.w4 <= 0) {
-            row.w4 = 0
-            row.r4 = 0
-          }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
-        }
-        // 1班锁定，2班4班未锁
-        if (row.isTwoWeight == false && row.isOneWeight == true && row.isFourWeight == false) {
-          row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (row.r2 == 0 && row.r4 == 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3)) / 2, parseInt(Cookies.get('decimal')))
-            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = row.w2
-            row.r4 = row.r2
-          } else if (row.r2 == 0 && row.r4 !== 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3) - parseFloat(row.w4)), 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.w4 = formatNum((parseFloat(this.focusWRow3.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3)) * parseFloat(row.r4) / (parseFloat(this.focusWRow3.r2) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / 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.r4 == 0) {
-            row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3) - parseFloat(row.w2)), parseInt(Cookies.get('decimal')))
-            row.r4 = formatNum(parseFloat(row.w4) / 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.w1) - parseFloat(row.w3)) * parseFloat(row.r2) / (parseFloat(row.r2) + parseFloat(row.r4)), 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(row.w3)) * parseFloat(row.r2) / (parseFloat(row.r2) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3)) * parseFloat(row.r4) / (parseFloat(this.focusWRow3.r2) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-            row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          }
-          if (isNaN(row.w2)) {
-            row.w2 = 0
-            row.r2 = 0
-          }
-          if (isNaN(row.w4)) {
-            row.w4 = 0
-            row.r4 = 0
-          }
-          if (row.w2 <= 0) {
-            row.w2 = 0
-            row.r2 = 0
-          }
-          if (row.w4 <= 0) {
-            row.w4 = 0
-            row.r4 = 0
-          }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
-        }
-        // 4班锁定，2班1班未锁
-        if (row.isTwoWeight == false && row.isOneWeight == false && row.isFourWeight == true) {
-          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) - parseFloat(row.w4)) / 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.w4) - 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.w4)) * 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.w4) - 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(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w4)) * parseFloat(row.r1) / (parseFloat(this.focusWRow3.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.w4)) * parseFloat(row.r1) / (parseFloat(this.focusWRow3.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.w4)) * 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)) {
-            row.w1 = 0
-            row.r1 = 0
-          }
-          if (isNaN(row.w2)) {
-            row.w2 = 0
-            row.r2 = 0
-          }
-
-          if (row.w2 <= 0) {
-            row.w2 = 0
-            row.r2 = 0
-          }
-          if (row.w1 <= 0) {
-            row.w1 = 0
-            row.r1 = 0
-          }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
-        }
-        // 2班1班4班未锁
-        if (row.isTwoWeight == false && row.isOneWeight == false && row.isFourWeight == false) {
-          row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (row.r1 == 0 && row.r2 == 0 && row.r4 == 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3)) / 3, 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
-            row.w4 = row.w1
-            row.r4 = row.r1
-          } else if (row.r1 == 0 && row.r2 == 0 && row.r4 !== 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w4)) / 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
-            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.w4 = formatNum((parseFloat(this.focusWRow3.dailyWeight - row.w3) * parseFloat(row.r4) / (parseFloat(this.focusWRow3.r1) + parseFloat(this.focusWRow3.r2) + parseFloat(this.focusWRow3.r4))), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / 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.r4 == 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w2)) / 2, parseInt(Cookies.get('decimal')))
-            row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = row.w1
-            row.r4 = row.r1
-            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 - row.w3) * parseFloat(row.r2) / (parseFloat(this.focusWRow3.r1) + parseFloat(this.focusWRow3.r2) + parseFloat(this.focusWRow3.r4))), 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.r4 == 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w1)) / 2, parseInt(Cookies.get('decimal')))
+          if (isNaN(row.w1)) {
+            row.w1 = 0
+            row.r1 = 0
+          }
+          if (isNaN(row.w4)) {
+            row.w4 = 0
+            row.r4 = 0
+          }
+
+          if (row.w1 <= 0) {
+            row.w1 = 0
+            row.r1 = 0
+          }
+          if (row.w4 <= 0) {
+            row.w4 = 0
+            row.r4 = 0
+          }
+          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
+        }
+        // 1班锁定，2班4班未锁
+        if (row.isTwoWeight == false && row.isOneWeight == true && row.isFourWeight == false) {
+          row.r3 = formatNum(parseFloat(row.w3) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+          if (row.r2 == 0 && row.r4 == 0) {
+            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3)) / 2, parseInt(Cookies.get('decimal')))
+            row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+            row.w4 = row.w2
+            row.r4 = row.r2
+          } else if (row.r2 == 0 && row.r4 !== 0) {
+            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3) - parseFloat(row.w4)), parseInt(Cookies.get('decimal')))
             row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-            row.w4 = row.w1
-            row.r4 = row.r1
             if (row.w1 == '') { row.w1 = 0 }
             if (row.w2 == '') { row.w2 = 0 }
             if (row.w3 == '') { row.w3 = 0 }
@@ -3468,15 +2968,15 @@ export default {
             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) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-              row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+              row.w4 = formatNum((parseFloat(this.focusWRow3.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3)) * parseFloat(row.r4) / (parseFloat(this.focusWRow3.r2) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
+              row.r4 = formatNum(parseFloat(row.w4) / 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.r4 == 0) {
-            row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w1) - parseFloat(row.w2)), parseInt(Cookies.get('decimal')))
+          } else if (row.r2 !== 0 && row.r4 == 0) {
+            row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3) - parseFloat(row.w2)), parseInt(Cookies.get('decimal')))
             row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
             if (row.w1 == '') { row.w1 = 0 }
             if (row.w2 == '') { row.w2 = 0 }
@@ -3489,18 +2989,48 @@ export default {
             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) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-              row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w2 = formatNum((parseFloat(this.focusWRow3.dailyWeight - row.w3) * parseFloat(row.r2) / (parseFloat(this.focusWRow3.r1) + parseFloat(this.focusWRow3.r2) + parseFloat(this.focusWRow3.r4))), parseInt(Cookies.get('decimal')))
+              row.w2 = formatNum((parseFloat(this.focusWRow3.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3)) * parseFloat(row.r2) / (parseFloat(row.r2) + parseFloat(row.r4)), 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.r4 !== 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w1) - parseFloat(row.w4)), parseInt(Cookies.get('decimal')))
+          } else {
+            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3)) * parseFloat(row.r2) / (parseFloat(row.r2) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
             row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+            row.w4 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w1) - parseFloat(row.w3)) * parseFloat(row.r4) / (parseFloat(this.focusWRow3.r2) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
+            row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+          }
+          if (isNaN(row.w2)) {
+            row.w2 = 0
+            row.r2 = 0
+          }
+          if (isNaN(row.w4)) {
+            row.w4 = 0
+            row.r4 = 0
+          }
+          if (row.w2 <= 0) {
+            row.w2 = 0
+            row.r2 = 0
+          }
+          if (row.w4 <= 0) {
+            row.w4 = 0
+            row.r4 = 0
+          }
+          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
+        }
+        // 4班锁定，2班1班未锁
+        if (row.isTwoWeight == false && row.isOneWeight == false && row.isFourWeight == true) {
+          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) - parseFloat(row.w4)) / 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.w4) - 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 }
@@ -3512,18 +3042,16 @@ export default {
             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) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
-              row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w4 = formatNum((parseFloat(this.focusWRow3.dailyWeight - row.w3) * parseFloat(row.r4) / (parseFloat(this.focusWRow3.r1) + parseFloat(this.focusWRow3.r2) + parseFloat(this.focusWRow3.r4))), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+              row.w2 = formatNum((parseFloat(this.focusWRow3.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w4)) * 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.r4 !== 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w2) - parseFloat(row.w4)), parseInt(Cookies.get('decimal')))
-            row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+          } else if (row.r1 !== 0 && row.r2 == 0) {
+            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w4) - 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 }
@@ -3535,22 +3063,18 @@ export default {
             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 - row.w3) * parseFloat(row.r2) / (parseFloat(this.focusWRow3.r1) + parseFloat(this.focusWRow3.r2) + parseFloat(this.focusWRow3.r4))), parseInt(Cookies.get('decimal')))
-              row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w4 = formatNum((parseFloat(this.focusWRow3.dailyWeight - row.w3) * parseFloat(row.r4) / (parseFloat(this.focusWRow3.r1) + parseFloat(this.focusWRow3.r2) + parseFloat(this.focusWRow3.r4))), parseInt(Cookies.get('decimal')))
-              row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
+              row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w4)) * parseFloat(row.r1) / (parseFloat(this.focusWRow3.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) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
+            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w4)) * parseFloat(row.r1) / (parseFloat(this.focusWRow3.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 - row.w3) * parseFloat(row.r2) / (parseFloat(this.focusWRow3.r1) + parseFloat(this.focusWRow3.r2) + parseFloat(this.focusWRow3.r4))), parseInt(Cookies.get('decimal')))
+            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w3) - parseFloat(row.w4)) * 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')))
-            row.w4 = formatNum((parseFloat(row.dailyWeight - row.w3) * parseFloat(row.r4) / (parseFloat(this.focusWRow3.r1) + parseFloat(this.focusWRow3.r2) + parseFloat(this.focusWRow3.r4))), parseInt(Cookies.get('decimal')))
-            row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
           }
           if (isNaN(row.w1)) {
             row.w1 = 0
@@ -3560,24 +3084,50 @@ export default {
             row.w2 = 0
             row.r2 = 0
           }
-          if (isNaN(row.w4)) {
-            row.w4 = 0
-            row.r4 = 0
-          }
 
+          if (row.w2 <= 0) {
+            row.w2 = 0
+            row.r2 = 0
+          }
           if (row.w1 <= 0) {
             row.w1 = 0
             row.r1 = 0
           }
-          if (row.w2 <= 0) {
+          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
+        }
+        // 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
+          }
+          if(isNaN(row.w2) || row.w2 == '' || row.w2 <= 0){
             row.w2 = 0
-            row.r2 = 0
           }
-          if (row.w4 <= 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
+          }
+          if(isNaN(row.r1) || row.r1 == '' || row.r1 <= 0){
+            row.r1 = 0
+          }
+          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
+            row.r2 = 0
+          }
+          if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
+            row.r3 = 0
+          }
+          if(isNaN(row.r4) || row.r4 == '' || row.r4 <= 0){
             row.r4 = 0
           }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
+          let a = (1/ (parseFloat(row.r3) / 100) * parseFloat(row.w3)).toFixed(2)
+          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.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')))
         }
       } else if (this.table.RWLength == 3) {
         // 三班
@@ -3992,192 +3542,37 @@ export default {
         }
         // 2班3班1班未锁
         if (row.isOneWeight == false && row.isTwoWeight == false && row.isThreeWeight == false) {
-          row.r4 = formatNum(parseFloat(row.w4) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-          if (row.r1 == 0 && row.r2 == 0 && row.r3 == 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w4)) / 3, 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
-            row.w3 = row.w1
-            row.r3 = row.r1
-          } else if (row.r1 == 0 && row.r2 == 0 && row.r3 !== 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
-            row.r2 = row.r1
-            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 }
-            if (row.w1 == '') { row.w1 = 0 }
-            if (row.w2 == '') { row.w2 = 0 }
-            if (row.w3 == '') { row.w3 = 0 }
-            if (row.w4 == '') { row.w4 = 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')))
-            console.log(row.dailyWeight)
-            console.log(this.focusWRow4.dailyWeight)
-            if (parseFloat(row.dailyWeight) > parseFloat(this.focusWRow4.dailyWeight)) {
-              row.w3 = formatNum((parseFloat(this.focusWRow4.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r3) / (parseFloat(this.focusWRow4.r1) + parseFloat(this.focusWRow4.r2) + parseFloat(this.focusWRow4.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.r2 !== 0 && row.r3 == 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w4) - 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
-            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.focusWRow4.dailyWeight)) {
-              row.w2 = formatNum((parseFloat(this.focusWRow4.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r2) / (parseFloat(this.focusWRow4.r1) + parseFloat(this.focusWRow4.r2) + parseFloat(this.focusWRow4.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 if (row.r1 !== 0 && row.r2 == 0 && row.r3 == 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w4) - 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.w1
-            row.r3 = row.r1
-            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.focusWRow4.dailyWeight)) {
-              row.w1 = formatNum((parseFloat(this.focusWRow4.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r2) + 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 if (row.r1 !== 0 && row.r2 !== 0 && row.r3 == 0) {
-            row.w3 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w4) - 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.focusWRow4.dailyWeight)) {
-              row.w1 = formatNum((parseFloat(this.focusWRow4.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3)), parseInt(Cookies.get('decimal')))
-              row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w2 = formatNum((parseFloat(this.focusWRow4.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r2) / (parseFloat(this.focusWRow4.r1) + parseFloat(this.focusWRow4.r2) + parseFloat(this.focusWRow4.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 if (row.r1 !== 0 && row.r2 == 0 && row.r3 !== 0) {
-            row.w2 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w4) - 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.focusWRow4.dailyWeight)) {
-              row.w1 = formatNum((parseFloat(this.focusWRow4.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r2) + 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(this.focusWRow4.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r3) / (parseFloat(this.focusWRow4.r1) + parseFloat(this.focusWRow4.r2) + parseFloat(this.focusWRow4.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 }
-            }
-            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.r3 !== 0) {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w4) - 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.focusWRow4.dailyWeight)) {
-              row.w2 = formatNum((parseFloat(this.focusWRow4.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r2) / (parseFloat(this.focusWRow4.r1) + parseFloat(this.focusWRow4.r2) + parseFloat(this.focusWRow4.r3)), parseInt(Cookies.get('decimal')))
-              row.r2 = formatNum(parseFloat(row.w2) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
-              row.w3 = formatNum((parseFloat(this.focusWRow4.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r3) / (parseFloat(this.focusWRow4.r1) + parseFloat(this.focusWRow4.r2) + parseFloat(this.focusWRow4.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 {
-            row.w1 = formatNum((parseFloat(row.dailyWeight) - parseFloat(row.w4)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3)), 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.w4)) * parseFloat(row.r2) / (parseFloat(this.focusWRow4.r1) + parseFloat(this.focusWRow4.r2) + parseFloat(this.focusWRow4.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.w4)) * parseFloat(row.r3) / (parseFloat(this.focusWRow4.r1) + parseFloat(this.focusWRow4.r2) + parseFloat(this.focusWRow4.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.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.w1 <= 0) {
-            row.w1 = 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
           }
-          if (row.w2 <= 0) {
-            row.w2 = 0
+          if(isNaN(row.r2) || row.r2 == '' || row.r2 <= 0){
             row.r2 = 0
           }
-          if (row.w3 <= 0) {
-            row.w3 = 0
+          if(isNaN(row.r3) || row.r3 == '' || row.r3 <= 0){
             row.r3 = 0
           }
-          this.$set(row, 'sumr', formatNum(parseFloat(row.r1) + parseFloat(row.r2) + parseFloat(row.r3) + parseFloat(row.r4), parseInt(Cookies.get('decimal'))))
+          if(isNaN(row.r4) || row.r4 == '' || row.r4 <= 0){
+            row.r4 = 0
+          }
+          let a = (1/ (parseFloat(row.r4) / 100) * parseFloat(row.w4)).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.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')))
         }
       }
       if (row.w1 == '') { row.w1 = 0 }

src/views/formulationPlan/dhedFormula/index - 副本.vue → src/views/formulationPlan/dhedFormula/index备份.vue

@@ -13,19 +13,19 @@
         </el-select>
         <!-- <el-input v-model="table.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" /> -->
         <el-button class="successBorder" @click="handleSearch">查询</el-button>
+        <el-button v-if="isRoleEdit" class="successBorder" @click="handleDryMatterRegulation">干物质调节</el-button>
+        <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
+          <el-button v-if="isRoleEdit" class="import" icon="el-icon-download" style="float: right;">导入</el-button>
+        </el-upload>
+        <el-dropdown style="float: right;margin-right: 10px;">
+          <el-button class="export" icon="el-icon-upload2">导出</el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
+            <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-button class="export" style="float: right;margin-right: 10px;" @click="handleHistoryRecords">历史记录</el-button>
       </div>
-      <el-button v-if="isRoleEdit" class="successBorder" style="float: left;" @click="handleDryMatterRegulation">干物质调节</el-button>
-      <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
-        <el-button v-if="isRoleEdit" class="import" icon="el-icon-download" style="float: right;">导入</el-button>
-      </el-upload>
-      <el-dropdown style="float: right;margin-right: 10px;">
-        <el-button class="export" icon="el-icon-upload2">导出</el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
-          <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-button class="export" style="float: right;margin-right: 10px;" @click="handleHistoryRecords">历史记录</el-button>
     </div>
     <div class="search" />
     <div class="table">
@@ -242,7 +242,7 @@
           <!-- <el-button class="successBorder" @click="handleApplication">应用</el-button> -->
         </div>
         <div class="table">
-          <el-table
+          <u-table
             :key="history.tableKey"
             v-loading="history.listLoading"
             element-loading-text="给我一点时间"
@@ -255,30 +255,32 @@
             :cell-style="cellStyle"
             class="elTable table-fixed"
             :span-method="objectSpanMethod"
+            :max-height="500"
           >
-            <el-table-column :key="1" label="序号" align="center" type="index" width="50px" class-name="small-padding fixed-width" fixed="left">
+            <u-table-column :key="1" label="序号" align="center" type="index" width="50px" class-name="small-padding fixed-width" fixed="left" />
+            <!-- <u-table-column :key="1" label="序号" align="center" type="index" width="50px" class-name="small-padding fixed-width" fixed="left">
               <template slot-scope="scope">
                 <span>{{ scope.$index + (history.pageNum-1) * history.pageSize + 1 }}</span>
               </template>
-            </el-table-column>
-            <el-table-column :key="2" label="栏舍名称" prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
-            <el-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
-            <el-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
-            <el-table-column :key="5" label="实际牛头数" prop="ccount" min-width="70px" align="center" />
-            <el-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />
-            <el-table-column :key="7" label="系数头数" prop="ccountratio" min-width="70px" align="center" />
-            <el-table-column :key="8" label="配方模板" prop="ptname" min-width="70px" align="center" />
-            <el-table-column v-if="table.isPtsfname" :key="9" label="补料配方" prop="ptsname" min-width="70px" align="center" />
-            <el-table-column :key="10" label="班次比例" prop="tratio" min-width="70px" align="center" />
-            <el-table-column :key="11" label="班次重量" prop="weight" min-width="70px" align="center" />
-            <el-table-column :key="12" label="配方重量" prop="pweight" min-width="70px" align="center" />
-            <el-table-column v-if="table.isPtsfname" :key="13" label="补料重量" prop="ptweight" min-width="70px" align="center" />
-            <el-table-column :key="14" label="配方干物质量" prop="dryweight" min-width="70px" align="center" />
-            <el-table-column :key="15" label="饲喂干物质量" prop="swdryw" min-width="70px" align="center" />
-            <el-table-column :key="16" label="采样干物质量" prop="cydryw" min-width="70px" align="center" />
-            <el-table-column :key="17" label="日投喂量" prop="sumweight" min-width="70px" align="center" />
-          </el-table>
-          <pagination2 v-show="history.total>0" :total="history.total" :page.sync="history.getdataListParm.offset" :limit.sync="history.getdataListParm.pagecount" @pagination="getHistoryList" />
+            </u-table-column> -->
+            <u-table-column :key="2" label="栏舍名称" prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
+            <u-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
+            <u-table-column :key="4" label="软件牛头数" prop="softccount" min-width="70px" align="center" />
+            <u-table-column :key="5" label="实际牛头数" prop="ccount" min-width="70px" align="center" />
+            <u-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />
+            <u-table-column :key="7" label="系数头数" prop="ccountratio" min-width="70px" align="center" />
+            <u-table-column :key="8" label="配方模板" prop="ptname" min-width="70px" align="center" />
+            <u-table-column v-if="table.isPtsfname" :key="9" label="补料配方" prop="ptsname" min-width="70px" align="center" />
+            <u-table-column :key="10" label="班次比例" prop="tratio" min-width="70px" align="center" />
+            <u-table-column :key="11" label="班次重量" prop="weight" min-width="70px" align="center" />
+            <u-table-column :key="12" label="配方重量" prop="pweight" min-width="70px" align="center" />
+            <u-table-column v-if="table.isPtsfname" :key="13" label="补料重量" prop="ptweight" min-width="70px" align="center" />
+            <u-table-column :key="14" label="配方干物质量" prop="dryweight" min-width="70px" align="center" />
+            <u-table-column :key="15" label="饲喂干物质量" prop="swdryw" min-width="70px" align="center" />
+            <u-table-column :key="16" label="采样干物质量" prop="cydryw" min-width="70px" align="center" />
+            <u-table-column :key="17" label="日投喂量" prop="sumweight" min-width="70px" align="center" />
+          </u-table>
+          <!-- <pagination2 v-show="history.total>0" :total="history.total" :page.sync="history.getdataListParm.offset" :limit.sync="history.getdataListParm.pagecount" @pagination="getHistoryList" /> -->
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
@@ -787,7 +789,9 @@ export default {
         // pagecount: parseInt(Cookies.get('pageCount')),
         pagecount: '',
         returntype: 'Map',
-        parammaps: {}
+        parammaps: {
+          pastureid: Cookies.get('pastureid')
+        }
       },
       tnameList: [], // 配方名 称
       recipeTemplateList: [], // 配方模板
@@ -976,7 +980,8 @@ export default {
           name: 'getPlanModifyFPlist',
           page: 1,
           offset: 1,
-          pagecount: 12,
+          // pagecount: 12,
+          pagecount: '',
           returntype: 'Map',
           parammaps: {
             pastureid: Cookies.get('pastureid'),
@@ -1053,7 +1058,8 @@ export default {
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
-      myHeight: document.documentElement.clientHeight - 85 - 140
+      myHeight: document.documentElement.clientHeight - 85 - 140,
+      oldRowList:{}
     }
   },
   computed: {
@@ -1065,7 +1071,7 @@ export default {
     },
     uploadData() {
       return {
-        name: 'checkbarname,checkftsw,checkftbl,updateBigFPUpload,updateBigFPfeedweightUpload,updateBigFPDetailUpload,updateBigFPDetailUploadV1,updateBigFPDetailUploadV2,updateBigFPDetailUploadV3',
+        name: 'checkbarname,checkftsw,checkftbl',
         importParams: '栏舍名称,实际牛头数,系数（%）,配方模板,补料配方,第一班比例（%）,第二班比例（%）,第三班比例（%）',
         sheetname: 'Sheet1',
         // 登录牧场
@@ -1080,7 +1086,7 @@ export default {
     },
     // 设置上传地址
     uploadExcelUrl() {
-      return process.env.VUE_APP_BASE_API + 'authdata/ImportExcel'
+      return process.env.VUE_APP_BASE_API + 'authdata/fpdimportexcel'
     }
   },
   created() {
@@ -2482,6 +2488,11 @@ export default {
       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')))
     },
@@ -2851,7 +2862,6 @@ export default {
             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)) {
-              console.log('huijia;')
               row.w1 = formatNum((parseFloat(this.focusWRow2.dailyWeight) - parseFloat(row.w2)) * parseFloat(row.r1) / (parseFloat(row.r1) + parseFloat(row.r3) + parseFloat(row.r4)), parseInt(Cookies.get('decimal')))
               row.r1 = formatNum(parseFloat(row.w1) / parseFloat(row.feedweight) * 100, parseInt(Cookies.get('decimal')))
             }
@@ -3084,6 +3094,11 @@ export default {
       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')))
     },
@@ -3674,6 +3689,11 @@ export default {
       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')))
     },
@@ -4164,6 +4184,11 @@ export default {
       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')))
     },
@@ -4174,6 +4199,7 @@ export default {
     // 编辑
     handleUpdate(row) {
       console.log(row)
+      this.oldRowList = {...row}
       for (let i = 0; i < this.table.list.length; i++) {
         if (this.table.list[i].Edit == true) {
           this.$message({ type: 'error', message: '当前内容未保存，请点击取消或保存继续进行操作', duration: 2000 })
@@ -4230,6 +4256,7 @@ export default {
         }else{
           obj['supplement'] = row['bw' + i]
         }
+        obj['tratio'] = Math.round(row['r' + i])
         obj['todaysupplement'] = row.todaysupplement
         obj['todayweight'] = row.todayweight
         arr.push(obj)
@@ -4254,11 +4281,11 @@ export default {
       this.$set(row, 'ccountratio', Math.floor(parseFloat(row.ccountratio) * 100) / 100)
       row.ccountratio = String(row.ccountratio)
       row.sumr = Math.round(row.sumr)
-      for(let i=0;i<arr.length;i++){
-        if(arr[i].tratio == undefined ||arr[i].tratio =='' || arr[i].tratio == null){
-          arr[i].tratio = 0
-        }
-      }
+      // for(let i=0;i<arr.length;i++){
+      //   if(arr[i].tratio == undefined ||arr[i].tratio =='' || arr[i].tratio == null){
+      //     arr[i].tratio = 0
+      //   }
+      // }
       this.table.rwList = arr
       console.log('点击了编辑保存', row)
       this.table.temp.pastureid = row.pastureid
@@ -4315,6 +4342,28 @@ export default {
       this.table.temp.w3 = row.w3
       this.table.temp.w4 = row.w4
 
+      var obj = {}
+      obj.pastureid = row.pastureid
+      obj.id = row.id
+      obj.data = []
+      if(this.oldRowList.w1 !== row.w1){
+        obj.data.push({'old':this.oldRowList.w1,'new':row.w1,times:1,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
+      if(this.oldRowList.w2 !== row.w2){
+        obj.data.push({'old':this.oldRowList.w2,'new':row.w2,times:2,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
+      if(this.oldRowList.w3 !== row.w3){
+        obj.data.push({'old':this.oldRowList.w3,'new':row.w3,times:3,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
+      if(this.oldRowList.bw1 !== row.bw1){
+        obj.data.push({'old':this.oldRowList.bw1,'new':row.bw1,times:1,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
+      if(this.oldRowList.bw2 !== row.bw2){
+        obj.data.push({'old':this.oldRowList.bw2,'new':row.bw2,times:2,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
+      if(this.oldRowList.bw3 !== row.bw3){
+        obj.data.push({'old':this.oldRowList.bw3,'new':row.bw3,times:3,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
       if (this.table.temp.ccount == '' && this.table.temp.ratio == '' && this.table.temp.ccountratio == '' && this.table.temp.ftid == '') {
         this.$message({ type: 'error', message: '实际牛头数/系数/系数头数/配方模版不能为空', duration: 2000 })
         return false
@@ -4408,8 +4457,17 @@ export default {
         if (response.msg === 'fail') {
           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-          // this.reload()
+          if(obj.data.length>0){
+            const url = 'authdata/fpdetail/edit'
+            const data = obj
+            postJson(url, data).then(response => {
+              if(response.msg !== 'fail'){
+                this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              }
+            })
+          }else{
+            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          }
           this.getList()
           for (let i = 0; i < this.headerList.length; i++) {
             if (this.headerList[i].target.className == 'el-icon-lock') {

src/views/shedProduction/materialRemainingRecord/index.vue

@@ -625,10 +625,10 @@ export default {
         console.log('点击了导出模板')
         console.log('点击了导出模板')
         const requestParam = this.requestParam
-        const url = process.env.VUE_APP_BASE_API + 'file/导入导出模板/栏舍生产/栏舍剩料记录导入模板.xlsx' // 请求下载文件的地址
+        const url = process.env.VUE_APP_BASE_API + 'authdata/barfeedremain/excel' // 请求下载文件的地址
         console.log(url)
         axios({
-          method: 'GET',
+          method: 'POST',
           url: url,
           data: requestParam,
           headers: { token: getToken(), optname: 'insertcustomdoc' },

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

@@ -672,7 +672,7 @@
             <span>-</span>
             <el-input-number :controls="false" :precision="2" v-model="tab2.table.getdataListParm.parammaps.hlzql2" placeholder="混料正确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
           </div>
-          <el-checkbox v-model="tab2.table.getdataListParm.parammaps.ccys" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
+          <el-checkbox v-model="tab2.table.getdataListParm.parammaps.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
           <!-- 临时注释 -->
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleSearch2">查询</el-button>
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh2">重置</el-button>
@@ -766,7 +766,7 @@
             <span>-</span>
             <el-input-number :controls="false" :precision="2" v-model="tab3.table.getdataListParm.parammaps.slzql2" placeholder="撒料正确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
           </div>
-          <el-checkbox v-model="tab3.table.getdataListParm.parammaps.ccys" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
+          <el-checkbox v-model="tab3.table.getdataListParm.parammaps.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
           <!-- 临时注释 -->
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleSearch3">查询</el-button>
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh3">重置</el-button>
@@ -834,7 +834,7 @@
     </div>
     </el-dialog>
     <!-- 查看 -->
-    <See :show.sync="isShowDialog"  :row-pid="rowPid" :start-time="startTime" :stop-time="stopTime"  :optdevice="optdevice" :title-fname="titlefname" :method-name="methodName" />
+    <See :show.sync="isShowDialog"  :row-pid="rowPid" :start-time="startTime" :stop-time="stopTime"  :optdevice="optdevice" :title-fname="titlefname" :method-name="methodName" :error="error" />
 
     <!-- 配方名称弹窗 -->
     <el-dialog :title="textMap[recipeNameTemp.dialogStatus]" :visible.sync="recipeNameTemp.dialogFormVisible" :close-on-click-modal="false" width="98%">
@@ -1589,6 +1589,7 @@ export default {
       optdevice:'',
       startTime:'',
       stopTime:'',
+      error:'',
       isShowDialog: false,
       statisticalTypeList: [{ id: '0', name: '驾驶员' }, { id: '1', name: '配方名称' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '牲畜类别' }, { id: '4', name: '车次' }, { id: '5', name: 'TMR名称' }],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
@@ -4337,6 +4338,11 @@ export default {
       })
     },
     handleSee(item,row) {
+      if(this.tab.table.getdataListParm.parammaps.error == true){
+        this.error = true
+      }else{
+        this.error = ''
+      }
       if(item == 1){
         // 混料
         if (this.tab.radio == 0) {

src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue

@@ -131,7 +131,8 @@ export default {
     rowPid: { type: String, defalut: '0' },
     optdevice: { type: String, defalut: '' },
     startTime:{ type: String, defalut: '' },
-    stopTime:{ type: String, defalut: '' }
+    stopTime:{ type: String, defalut: '' },
+    error:{type: String, defalut: '' }
   },
   data() {
     return {
@@ -143,6 +144,7 @@ export default {
       optdevice:'',
       startTime:'',
       stopTime:'',
+      error:'',
       table1: {
         getdataListParm: {
           name: '', page: 1, offset: 1, pagecount: '', returntype: 'Map',
@@ -234,7 +236,14 @@ export default {
         console.log(newVal, 'stopTime')
         this.stopTime = newVal
       }
-    }
+    },
+    error: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        console.log(newVal, 'error')
+        this.error = newVal
+      }
+    },
   },
   created() {
 
@@ -255,6 +264,7 @@ export default {
       this.table1.getdataListParm.parammaps.startTime = this.startTime
       this.table1.getdataListParm.parammaps.stopTime = this.stopTime
       this.table1.getdataListParm.parammaps.pid = this.pid
+      this.table1.getdataListParm.parammaps.error = this.error
       this.table1.getdataListParm.parammaps.pastureid = Cookies.get('pastureid')
       GetDataByName(this.table1.getdataListParm).then(response => {
         console.log('车次信息数据', response.data.list)
@@ -285,6 +295,7 @@ export default {
     },
     getList2() {
       this.table2.listLoading = true
+      this.table2.getdataListParm.parammaps.error = this.error
       GetDataByName(this.table2.getdataListParm).then(response => {
         console.log('混料信息数据', response.data.list)
         if (response.data !== null && response.data.list !== null) {
@@ -316,6 +327,7 @@ export default {
     },
     getList3() {
       this.table3.listLoading = true
+      this.table3.getdataListParm.parammaps.error = this.error
       GetDataByName(this.table3.getdataListParm).then(response => {
         if (response.data !== null && response.data.list !== null) {
           console.log('撒料信息数据', response.data.list)
@@ -347,6 +359,7 @@ export default {
     },
     getChart1() {
       this.chart1.listLoading = true
+      this.chart1.getdataListParm.parammaps.error = this.error
       GetReportform(this.chart1.getdataListParm).then(response => {
         if (response.data !== null && response.data.list !== null) {
           this.chart1.list = response.data.data

src/views/systemManagement/user/index.vue

@@ -99,8 +99,8 @@
             <el-button v-if="row.isCreate && isRoleEdit" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
             <!-- 扫码接收消息 -->
             <!-- 临时注释 -->
-            <!-- <a v-if="row.isUpdate && isRoleEdit" class="correcting" size="mini" style="width: 80px;" @click="handleScanningCode(row)">扫码接收消息</a>
-            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span> -->
+            <a v-if="row.isUpdate && isRoleEdit" class="correcting" size="mini" style="width: 80px;" @click="handleScanningCode(row)">扫码接收消息</a>
+            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
             <!-- 临时注释 -->
             <!-- 重置密码 -->
             <a v-if="row.isUpdate && isRoleEdit" class="correcting" size="mini" style="width: 80px;" @click="handleResetPassword(row)">重置密码</a>
@@ -126,7 +126,7 @@
             <p>请将下方二维码分享给需要接收信息的用户扫码</p>
           </div>
           <div style="font-weight: 600;">关注微信：</div>
-          <img src="https://img2.baidu.com/it/u=1151188475,1753963046&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=300" alt="">
+          <img :src="imgUrl" alt="">
         </div>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom: 40px;">
           <el-button class="save" :disabled="isokDisable" @click="QRcode.dialogFormVisible = false;">确认</el-button>
@@ -189,7 +189,8 @@ export default {
         QRcode:'提示'
       },
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      imgUrl:''
 
     }
   },
@@ -492,6 +493,8 @@ export default {
     handleScanningCode(){
       this.QRcode.dialogStatus = 'QRcode'
       this.QRcode.dialogFormVisible = true
+      this.imgUrl = 'http://tmrwatch.cn/wx/code?scene_id:tmrwatch.'+Cookies.get('name')+ '.'+Cookies.get('employename')
+      console.log(this.imgUrl)
     }
   }
 }