Browse Source

Merge branch 'hotfix/DhedFormula_bug' of duanxiaoduan/tmr-admin into develop

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

+ 18 - 0
src/views/formulationPlan/dhedFormula/index.vue

@@ -2039,6 +2039,15 @@ export default {
       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.w4 !== row.w4){
+        obj.data.push({'old':this.oldRowList.w4,'new':row.w4,times:4,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
+      if(this.oldRowList.w5 !== row.w5){
+        obj.data.push({'old':this.oldRowList.w5,'new':row.w5,times:5,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
+      if(this.oldRowList.w6 !== row.w6){
+        obj.data.push({'old':this.oldRowList.w6,'new':row.w6,times:6,'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})
       }
@@ -2048,6 +2057,15 @@ export default {
       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.oldRowList.bw4 !== row.bw4){
+        obj.data.push({'old':this.oldRowList.bw4,'new':row.bw4,times:4,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
+      if(this.oldRowList.bw5 !== row.bw5){
+        obj.data.push({'old':this.oldRowList.bw5,'new':row.bw5,times:5,'ptid':row.ftid,'ptsid':row.ptsfid})
+      }
+      if(this.oldRowList.bw6 !== row.bw6){
+        obj.data.push({'old':this.oldRowList.bw6,'new':row.bw6,times:6,'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