成本分配表/成本分配列表-辅料成本($)计算公式修改

src/views/cost-allocation-total/costDetailDrawer.vue

@@ -581,16 +581,18 @@ export default {
             //合计中辅料相关金额
             var s = 0,
             v =0,
-            t=0
+            t=0,
+            u=0
             oneData.syCostAllocationIngredientList.map(item=>{
               s+=item.priceExcludingtax?Number(item.priceExcludingtax):0,
               v+=item.rmbAmount?Number(item.rmbAmount):0
               t+=item.transferCost?Number(item.transferCost):0
+              u+=item.usdAmount?Number(item.usdAmount):0
             })
             this.$refs.unitTabs.sumInfo.ingAmount =((v/2)+(t/2)).toFixed(2)//辅料金额合计
             this.$refs.unitTabs.sumInfo.ingExcludAmount = (((s/2)+(t/2)/(1+(Number(this.detailsPlanNum.taxrate)/100)))).toFixed(2)//合计sheet辅料不含税金额合计
             this.detailsPlanNum.excipiencostNotincludestax =  ( this.$refs.unitTabs.sumInfo.ingExcludAmount==''|| !this.$refs.unitTabs.sumInfo.ingExcludAmount)?0:Number(this.$refs.unitTabs.sumInfo.ingExcludAmount).toFixed(2)//表头辅料料不含税成本   
-            this.detailsPlanNum.excipiencostIncludestaxUsd = (this.detailsPlanNum.excipiencostNotincludestax/Number(this.detailsPlanNum.exchangeRate)).toFixed(2)
+            this.detailsPlanNum.excipiencostIncludestaxUsd = ((u/2)+(t/2)/1.13/(Number(this.detailsPlanNum.exchangeRate))).toFixed(2)
             this.detailsPlanNum.excipiencostIncludestax =   (  this.$refs.unitTabs.sumInfo.ingAmount ==''|| ! this.$refs.unitTabs.sumInfo.ingAmount )?0:Number( this.$refs.unitTabs.sumInfo.ingAmount ).toFixed(2)//表头辅料成本(￥)
             //合计中出运明细相关金额
             var s =0,
@@ -869,11 +871,11 @@ export default {
           if(this.$refs.unitTabs.ingData[this.$refs.unitTabs.ingData.length-1].goodsName=='合计'){this.$refs.unitTabs.ingData.pop()}
             this.$refs.unitTabs.ingData.push(allObj)
           }
-          if(rmbAmountAll == usdAmountAll){
-            this.detailsPlanNum.excipiencostIncludestaxUsd = 0
-          }else{
-            this.detailsPlanNum.excipiencostIncludestaxUsd = usdAmountAll.toFixed(2)
-          }
+          // if(rmbAmountAll == usdAmountAll){
+          //   this.detailsPlanNum.excipiencostIncludestaxUsd = 0
+          // }else{
+          //   this.detailsPlanNum.excipiencostIncludestaxUsd = usdAmountAll.toFixed(2)
+          // }
     },
     //事故单合计行
     addAccident(val){
@@ -1030,18 +1032,21 @@ export default {
     IngInQua(dataArr){
       var s = 0,
           v =0,
-          t=0
+          t=0,
+          u=0
       dataArr.map(item=>{
           s+=item.priceExcludingtax?Number(item.priceExcludingtax):0,
           v+=item.rmbAmount?Number(item.rmbAmount):0
           t+=item.transferCost?Number(item.transferCost):0
+          u+=item.usdAmount?Number(item.usdAmount):0
       })
       this.$refs.unitTabs.sumInfo.ingAmount =((v/2)+(t/2)).toFixed(2)//辅料金额合计
       this.$refs.unitTabs.sumInfo.ingExcludAmount = (((s/2)+(t/2)/(1+(Number(this.detailsPlanNum.taxrate)/100)))).toFixed(2)//合计sheet辅料不含税金额合计
       this.detailsPlanNum.excipiencostNotincludestax =  ( this.$refs.unitTabs.sumInfo.ingExcludAmount==''|| !this.$refs.unitTabs.sumInfo.ingExcludAmount)?0:Number(this.$refs.unitTabs.sumInfo.ingExcludAmount).toFixed(2)//表头辅料料不含税成本   
-      this.detailsPlanNum.excipiencostIncludestaxUsd = (this.detailsPlanNum.excipiencostNotincludestax/Number(this.detailsPlanNum.exchangeRate)).toFixed(2)
+      this.detailsPlanNum.excipiencostIncludestaxUsd = ((u/2)+(t/2)/1.13/(Number(this.detailsPlanNum.exchangeRate))).toFixed(2)
       this.detailsPlanNum.excipiencostIncludestax =   (  this.$refs.unitTabs.sumInfo.ingAmount ==''|| ! this.$refs.unitTabs.sumInfo.ingAmount )?0:Number( this.$refs.unitTabs.sumInfo.ingAmount ).toFixed(2)//表头辅料成本(￥)
       this.$refs.unitTabs.sumInfo.amountTotal = (Number(this.$refs.unitTabs.sumInfo.fabricAmount)+Number(this.$refs.unitTabs.sumInfo.ingAmount)+Number( this.$refs.unitTabs.sumInfo.shipProcesFees)).toFixed(2)//合计金额
+      this.addAmountIng()
     },
 
 

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

@@ -558,16 +558,18 @@ export default {
             //合计中辅料相关金额
             var s = 0,
             v =0,
-            t=0
+            t=0,
+            u=0
             oneData.syCostAllocationIngredientList.map(item=>{
               s+=item.priceExcludingtax?Number(item.priceExcludingtax):0,
               v+=item.rmbAmount?Number(item.rmbAmount):0
               t+=item.transferCost?Number(item.transferCost):0
+              u+=item.usdAmount?Number(item.usdAmount):0
             })
             this.$refs.unitTabs.sumInfo.ingAmount =((v/2)+(t/2)).toFixed(2)//辅料金额合计
             this.$refs.unitTabs.sumInfo.ingExcludAmount = (((s/2)+(t/2)/(1+(Number(this.detailsPlanNum.taxrate)/100)))).toFixed(2)//合计sheet辅料不含税金额合计
             this.detailsPlanNum.excipiencostNotincludestax =  ( this.$refs.unitTabs.sumInfo.ingExcludAmount==''|| !this.$refs.unitTabs.sumInfo.ingExcludAmount)?0:Number(this.$refs.unitTabs.sumInfo.ingExcludAmount).toFixed(2)//表头辅料料不含税成本   
-            this.detailsPlanNum.excipiencostIncludestaxUsd = (this.detailsPlanNum.excipiencostNotincludestax/Number(this.detailsPlanNum.exchangeRate)).toFixed(2)
+            this.detailsPlanNum.excipiencostIncludestaxUsd = ((u/2)+(t/2)/1.13/(Number(this.detailsPlanNum.exchangeRate))).toFixed(2)
             this.detailsPlanNum.excipiencostIncludestax =   (  this.$refs.unitTabs.sumInfo.ingAmount ==''|| ! this.$refs.unitTabs.sumInfo.ingAmount )?0:Number( this.$refs.unitTabs.sumInfo.ingAmount ).toFixed(2)//表头辅料成本(￥)
             //合计中出运明细相关金额
             var s =0,
@@ -649,15 +651,17 @@ export default {
               //重新计算辅料相关数值
               var s = 0,
               v=0,
-                t=0
+              t=0,
+              u=0
             oneData.syCostAllocationIngredientList.map(item=>{
               s+=Number(item.priceExcludingtax),
               v+=item.rmbAmount?Number(item.rmbAmount):0
               t+=item.transferCost?Number(item.transferCost):0
+              u+=item.usdAmount?Number(item.usdAmount):0
             })
             this.$refs.unitTabs.sumInfo.ingExcludAmount = (((s/2)+(t/2)/(1+(Number(this.detailsPlanNum.taxrate)/100)))).toFixed(2)//合计sheet辅料不含税金额合计
             this.detailsPlanNum.excipiencostNotincludestax =  ( this.$refs.unitTabs.sumInfo.ingExcludAmount==''|| !this.$refs.unitTabs.sumInfo.ingExcludAmount)?0:Number(this.$refs.unitTabs.sumInfo.ingExcludAmount).toFixed(2)//表头辅料料不含税成本   
-            this.detailsPlanNum.excipiencostIncludestaxUsd = (this.detailsPlanNum.excipiencostNotincludestax/Number(this.detailsPlanNum.exchangeRate)).toFixed(2)
+            this.detailsPlanNum.excipiencostIncludestaxUsd = ((u/2)+(t/2)/1.13/(Number(this.detailsPlanNum.exchangeRate))).toFixed(2)
             this.$refs.unitTabs.sumInfo.ingAmount =((v/2)+(t/2)).toFixed(2)//辅料金额合计  
             this.detailsPlanNum.excipiencostIncludestax =   (  this.$refs.unitTabs.sumInfo.ingAmount ==''|| ! this.$refs.unitTabs.sumInfo.ingAmount )?0:Number( this.$refs.unitTabs.sumInfo.ingAmount ).toFixed(2)//表头辅料成本(￥)
           }
@@ -1029,18 +1033,21 @@ export default {
     IngInQua(dataArr){
       var s = 0,
           v =0,
-          t=0
+          t=0,
+          u=0
       dataArr.map(item=>{
           s+=item.priceExcludingtax?Number(item.priceExcludingtax):0,
           v+=item.rmbAmount?Number(item.rmbAmount):0
           t+=item.transferCost?Number(item.transferCost):0
+          u+=item.usdAmount?Number(item.usdAmount):0
       })
       this.$refs.unitTabs.sumInfo.ingAmount =((v/2)+(t/2)).toFixed(2)//辅料金额合计
       this.$refs.unitTabs.sumInfo.ingExcludAmount = (((s/2)+(t/2)/(1+(Number(this.detailsPlanNum.taxrate)/100)))).toFixed(2)//合计sheet辅料不含税金额合计
       this.detailsPlanNum.excipiencostNotincludestax =  ( this.$refs.unitTabs.sumInfo.ingExcludAmount==''|| !this.$refs.unitTabs.sumInfo.ingExcludAmount)?0:Number(this.$refs.unitTabs.sumInfo.ingExcludAmount).toFixed(2)//表头辅料料不含税成本   
-      this.detailsPlanNum.excipiencostIncludestaxUsd = (this.detailsPlanNum.excipiencostNotincludestax/Number(this.detailsPlanNum.exchangeRate)).toFixed(2)
+      this.detailsPlanNum.excipiencostIncludestaxUsd = ((u/2)+(t/2)/1.13/(Number(this.detailsPlanNum.exchangeRate))).toFixed(2)
       this.detailsPlanNum.excipiencostIncludestax =   (  this.$refs.unitTabs.sumInfo.ingAmount ==''|| ! this.$refs.unitTabs.sumInfo.ingAmount )?0:Number( this.$refs.unitTabs.sumInfo.ingAmount ).toFixed(2)//表头辅料成本(￥)
       this.$refs.unitTabs.sumInfo.amountTotal = (Number(this.$refs.unitTabs.sumInfo.fabricAmount)+Number(this.$refs.unitTabs.sumInfo.ingAmount)+Number( this.$refs.unitTabs.sumInfo.shipProcesFees)).toFixed(2)//合计金额
+      this.addAmountIng()
     },
 
     // father 方法