成本分配表-短出货值-计算

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

@@ -439,9 +439,11 @@ export default {
     calculation(val){
       var  average = 0
        val.map(item=>{
-         average += item.exportUnitPrice
+        if(item.outdata !=='合计'){
+          average += (Number(item.exportUnitPrice)*Number(item.shipQuantity)*Number(item.exchangeRate))
+        }
        })
-       this.detailsPlanNum.shortvalue = Number(this.detailsPlanNum.shortseveral*average).toFixed(2)
+       this.detailsPlanNum.shortvalue = average.toFixed(2)
        var shipQuantityAll =0,
         exportUnitPriceALll = 0,
         exportPriceAll =0,
@@ -450,6 +452,7 @@ export default {
         procesUnitPriceusdAll = 0,
         processCostAll = 0
         val.map(item=>{
+          if(item.outdata !=='合计'){
           shipQuantityAll+=Number(item.shipQuantity)
           exportUnitPriceALll+=Number(item.exportUnitPrice)
           exportPriceAll+=Number(item.exportPrice)
@@ -457,6 +460,7 @@ export default {
           procesUnitPricermbAll+=Number(item.procesUnitPricermb)
           procesUnitPriceusdAll+=Number(item.procesUnitPriceusd)
           processCostAll+=Number(item.processCost)
+          }
         })
         var allObj ={
           outdata:'合计',
@@ -469,7 +473,9 @@ export default {
           processCost:processCostAll.toFixed(3)
         }
         //发运明细-合计行
-        if(this.$refs.unitTabs.shipData[this.$refs.unitTabs.shipData.length-1].goodsName=='合计'){this.$refs.unitTabs.shipData.pop()}
+        if(this.$refs.unitTabs.shipData[this.$refs.unitTabs.shipData.length-1].outdata=='合计'){
+          this.$refs.unitTabs.shipData.pop()
+        }
         if(this.$refs.unitTabs.shipData.length!==0 ){this.$refs.unitTabs.shipData.push(allObj)}
         this.$refs.unitTabs.shipData.map(item=>{
           item.shipQuantity = Number(item.shipQuantity).toFixed(0)
@@ -494,6 +500,7 @@ export default {
       priceExcludingtaxAll = 0,
       dosageAll = 0
         val.map(item=>{
+          if(item.goodsName!=='合计'){
           ingredientsTransferQuantityALll+=Number(item.ingredientsTransferQuantity)
           transferCostAll+=Number(item.transferCost)
           usageQuantityAll+=Number(item.usageQuantity)
@@ -504,6 +511,7 @@ export default {
           usdAmountAll+=Number(item.usdAmount)
           priceExcludingtaxAll+=Number(item.priceExcludingtax)
           dosageAll+=Number(item.dosage)
+          }
         })
       var allObj ={
           goodsName:'合计',
@@ -527,9 +535,11 @@ export default {
       disbursedOriginalmoneyALL=0,
       shuiemoneyAll = 0
      val.map(item=>{
+      if(item.setNo!=='合计'){
       disbursedLocalmoneyALL+=Number(item.disbursedLocalmoney) 
       disbursedOriginalmoneyALL+=Number(item.disbursedOriginalmoney) 
       shuiemoneyAll+=Number(item.shuiemoney) 
+      }
      })
      var obj={
       setNo:'合计',
@@ -538,30 +548,10 @@ export default {
       shuiemoney:shuiemoneyAll.toFixed(3),
       totalTaxIncrease:(disbursedLocalmoneyALL+shuiemoneyAll).toFixed(3)
      }
-     if(this.costPayData[this.costPayData.lengthh-1].setNo=='合计'){this.costPayData.pop()}
+     if(this.costPayData[this.costPayData.length-1].setNo=='合计'){this.costPayData.pop()}
      if(this.costPayData.length!==0){ this.costPayData.push(obj)}
     },
     daYin(){
-      //  printJS({
-	    //      printable:this.fabricLoss.fabricOMOrderList1,
-	    //      properties:[
-      //        {field:'cvcname',displayName:'制造工艺',columnSize:1},
-      //        {field:'cvenAbbName',displayName:'工厂',columnSize:1},
-      //        {field:'iquantityOut',displayName:'材料出库数量',columnSize:1},
-      //        {field:'iquantity', displayName:'计划数量',columnSize:1},
-      //        {field:'iquantityIn', displayName:'采购入库数量',columnSize:1},
-      //        {field:'cinvCode', displayName:'物料编码',columnSize:1},
-      //        {field:'cinvName', displayName:'货物名称',columnSize:1},
-      //        {field:'ccolor', displayName:'颜色',columnSize:1},
-      //        {field:'cquantityLoss', displayName:'损耗',columnSize:1},
-      //        {field:'iquantityMoreLess', displayName:'多发少发',columnSize:1},
-      //        ],
-	    //      type:'json',
-	    //      header:'C001',
-	         //样式设置
-	        //  gridStyle:'border:2px solid #3971A5;text-align: center',
-	        //  gridHeaderStyle:'color:red; border:2px solid #3971A5;'
-	    //  })
          this.showSelect = 1
          this.$nextTick(() => {
           const html = window.document.getElementById('costAllocationTable').innerHTML