成本分配表-合计行计算

src/views/reportForms/cost-allocation-table.vue

@@ -470,6 +470,7 @@ export default {
             this.addAmountCostPay(this.costPayData)
             this.addAccident(this.accidentListData)
             this.calculation(oneData.syCostAllocationShipdetail)
+            debugger
             //合计中面料相关金额
             var s=0
             oneData.syCostAllocationFabricList.map(item=>{
@@ -585,10 +586,13 @@ export default {
           processCost:processCostAll.toFixed(3)
         }
         //发运明细-合计行
-        if(this.$refs.unitTabs.shipData[this.$refs.unitTabs.shipData.length-1].outdata=='合计'){
-          this.$refs.unitTabs.shipData.pop()
+       
+        if(this.$refs.unitTabs.shipData.length!==0 ){
+          if(this.$refs.unitTabs.shipData[this.$refs.unitTabs.shipData.length-1].outdata=='合计'){
+            this.$refs.unitTabs.shipData.pop()
+           }
+          this.$refs.unitTabs.shipData.push(allObj)
         }
-        if(this.$refs.unitTabs.shipData.length!==0 ){this.$refs.unitTabs.shipData.push(allObj)}
         this.$refs.unitTabs.shipData.map(item=>{
           item.shipQuantity = Number(item.shipQuantity)
           item.exportUnitPrice = Number(item.exportUnitPrice)
@@ -637,9 +641,11 @@ export default {
           usdAmount:usdAmountAll,
           priceExcludingtax:priceExcludingtaxAll,
           dosage:dosageAll
-        }
-     if(this.$refs.unitTabs.ingData[this.$refs.unitTabs.ingData.length-1].goodsName=='合计'){this.$refs.unitTabs.ingData.pop()}
-        if(this.$refs.unitTabs.ingData.length!==0 ){  this.$refs.unitTabs.ingData.push(allObj)}
+        }  
+        if(this.$refs.unitTabs.ingData.length!==0 ){
+          if(this.$refs.unitTabs.ingData[this.$refs.unitTabs.ingData.length-1].goodsName=='合计'){this.$refs.unitTabs.ingData.pop()}
+            this.$refs.unitTabs.ingData.push(allObj)
+          }
     },
     //事故单合计行
     addAccident(val){
@@ -656,8 +662,10 @@ export default {
       amount:amountAll,
       amountrmb:amountrmbAll
      }
-     if(this.accidentListData[this.accidentListData.length-1].goodsName=='合计'){this.accidentListData.pop()}
-        if(this.accidentListData.length!==0 ){  this.accidentListData.push(allObj)}
+        if(this.accidentListData.length!==0 ){ 
+          if(this.accidentListData[this.accidentListData.length-1].accidentUndertaker=='合计'){this.accidentListData.pop()}
+           this.accidentListData.push(allObj)
+          }
     },
     //费用支出合计行
     addAmountCostPay(val){
@@ -678,9 +686,10 @@ export default {
       shuiemoney:shuiemoneyAll.toFixed(3),
       totalTaxIncrease:(disbursedLocalmoneyALL+shuiemoneyAll)
      }
-     console.log(this.costPayData[this.costPayData.length-1])
-     if(this.costPayData[this.costPayData.length-1].setNo=='合计'){this.costPayData.pop()}
-     if(this.costPayData.length!==0){ this.costPayData.push(obj)}
+     if(this.costPayData.length!==0){
+      if(this.costPayData[this.costPayData.length-1].setNo=='合计'){this.costPayData.pop()}
+       this.costPayData.push(obj)
+      }
     },
     daYin(){
          this.showSelect = 1