Merge branch 'feature/newdemand' of duanxiaoduan/tmr-admin into release/v1.0.2

src/views/formulationPlan/dhedFormula/index.vue

@@ -1400,8 +1400,22 @@ export default {
               response.data.list[i].r6 = 0
               response.data.list[i].w6 = 0
             }
-            this.$set(response.data.list[i], 'sumr', parseFloat(response.data.list[i].r1) + parseFloat(response.data.list[i].r2) + parseFloat(response.data.list[i].r3) + parseFloat(response.data.list[i].r4))
-            response.data.list[i].sumr = formatNum(response.data.list[i].sumr, parseInt(Cookies.get('decimalr')))
+            // this.$set(response.data.list[i], 'sumr', parseFloat(response.data.list[i].r1) + parseFloat(response.data.list[i].r2) + parseFloat(response.data.list[i].r3) + parseFloat(response.data.list[i].r4))
+            // response.data.list[i].sumr = formatNum(response.data.list[i].sumr, parseInt(Cookies.get('decimalr')))
+            var sumr = 0
+            if(response.data.list[i].r1 && !isNaN(response.data.list[i].r1)){
+              sumr += parseFloat(response.data.list[i].r1) }
+            if(response.data.list[i].r2 && !isNaN(response.data.list[i].r2)){
+              sumr += parseFloat(response.data.list[i].r2) }
+            if(response.data.list[i].r3 && !isNaN(response.data.list[i].r3)){
+              sumr += parseFloat(response.data.list[i].r3) }
+            if(response.data.list[i].r4 && !isNaN(response.data.list[i].r4)){
+              sumr += parseFloat(response.data.list[i].r4) }
+            if(response.data.list[i].r5 && !isNaN(response.data.list[i].r5)){
+              sumr += parseFloat(response.data.list[i].r5) }
+            if(response.data.list[i].r6 && !isNaN(response.data.list[i].r6)){ sumr += parseFloat(response.data.list[i].r6) }
+            console.log(sumr,'sumr')
+            response.data.list[i].sumr = formatNum(sumr, parseInt(Cookies.get('decimalr')))
             // this.$set(response.data.list[i],'feedweight',formatNum(parseFloat(response.data.list[i].feedweight) * parseFloat(response.data.list[i].sumr)/100,2))
             this.$set(response.data.list[i], 'dailyWeight', parseFloat(response.data.list[i].w1) + parseFloat(response.data.list[i].w2) + parseFloat(response.data.list[i].w3) + parseFloat(response.data.list[i].w4))
             response.data.list[i].dailyWeight = formatNum(response.data.list[i].dailyWeight, parseInt(Cookies.get('decimal')))

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -839,6 +839,9 @@ export default {
     changeTemplateFormulation(item) {
       this.create.temp.ftname = this.templateFormulationList.find(obj => obj.id === item).tname
       this.create.temp.ftvolume = this.templateFormulationList.find(obj => obj.id === item).volume
+      if(this.create.temp.display == ''){
+        this.create.temp.display = this.create.temp.ftname
+      }
       this.getCreateList1()
       var obj = {
         'pastureid':this.create.temp.pastureid,
@@ -1299,6 +1302,9 @@ export default {
       this.create.temp.mytmrid = row.tmrid
       this.create.checkBarList = []
       this.create.temp.mytmrid = row.tmrid
+      if(this.create.temp.display == ''){
+        this.create.temp.display = this.create.temp.ftname
+      }
       if(this.create.temp.volume == undefined || this.create.temp.volume == ''){
         console.log(111)
         this.$set(this.create.temp,'volume',0)