Browse Source

Merge branch 'release/v1.0.2' into feature/InventoryManagement-price

duanxiaoduan 1 year ago
parent
commit
0a0ed124a0
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/views/formulationPlan/dhedFormula/index.vue

+ 2 - 2
src/views/formulationPlan/dhedFormula/index.vue

@@ -1730,11 +1730,11 @@ export default {
       if (row.w4 == '' || row.w4 == undefined || isNaN(row.w4)) { row.w4 = 0 }
       if (row.w5 == '' || row.w5 == undefined || isNaN(row.w5)) { row.w5 = 0 }
       if (row.w6 == '' || row.w6 == undefined || isNaN(row.w6)) { row.w6 = 0 }
-      // 配方重量=实际牛头数*系数*配方模板取Sfweight
-      row.ftweight = (row.ccount * row.ratio / 100 * row.Sfweight).toFixed(this.decimal)
       // 实际牛头数不变
       // 系数=系数头数/实际牛头数*100
       row.ratio = (parseFloat(row.ccountratio) / parseFloat(row.ccount) * 100).toFixed(this.decimal)
+      // 配方重量=实际牛头数*系数*配方模板取Sfweight
+      row.ftweight = (row.ccount * row.ratio / 100 * row.Sfweight).toFixed(this.decimal)
       this.public(row)
       this.placeholder(row)
     },