Browse Source

成本分配表-面料成本(¥)计算方法修改

jbb 1 year ago
parent
commit
ae52b338b9
1 changed files with 10 additions and 15 deletions
  1. 10 15
      src/views/reportForms/cost-allocation-table.vue

+ 10 - 15
src/views/reportForms/cost-allocation-table.vue

@@ -594,17 +594,6 @@ export default {
             // 页面打开加载的数据
             var oneData = this.$refs.unitTabs.tabsAllData[0]
             this.$refs.unitTabs.fabData = oneData.syCostAllocationFabricList
-           if(data=='queryNew'){
-            var all = 0
-            this.StagingList.map(item=>{
-              if(item.remainingQuantitycost!=='' && item.remainingQuantitycost){
-                item.remainingQuantitycost = item.remainingQuantitycost.toFixed(2)
-              }
-              if(item.transferCost&&item.transferCost!==''){
-                all+=Number(item.transferCost)
-              }
-            })
-           }else{
             var all = 0
             this.$refs.unitTabs.fabData.map(item=>{
               if(item.remainingQuantitycost!=='' && item.remainingQuantitycost){
@@ -614,12 +603,11 @@ export default {
                 all+=Number(item.transferCost)
               }
             })
-           }
   
             
             this.fabricCost = this.detailsPlanNum.fabriccostIncludestax
-            this.detailsPlanNum.fabriccostIncludestax = all+Number(this.detailsPlanNum.fabriccostIncludestax) // 表头面料成本(¥)
-            this.detailsPlanNum.fabriccostIncludestaxUsd = Number(this.detailsPlanNum.fabriccostIncludestax)/this.detailsPlanNum.exchangeRate//表头面料成本($)
+            this.detailsPlanNum.fabriccostIncludestax = (all+Number(this.detailsPlanNum.fabriccostIncludestax)).toFixed(2) // 表头面料成本(¥)
+            this.detailsPlanNum.fabriccostIncludestaxUsd = (Number(this.detailsPlanNum.fabriccostIncludestax)/this.detailsPlanNum.exchangeRate).toFixed(2)//表头面料成本($)
             this.detailsPlanNum.fabriccostNotincludestax = (Number(this.detailsPlanNum.fabriccostIncludestax)/(1+(Number(this.detailsPlanNum.taxrate)/100))).toFixed(2)
             this.$refs.unitTabs.ingData = oneData.syCostAllocationIngredientList
             this.$refs.unitTabs.shipData = oneData.syCostAllocationShipdetail
@@ -708,14 +696,21 @@ export default {
               this.detailsPlanNum.memo = Staging
               this.detailsPlanNum.remarks = StagingLast
               this.fileList = file
+              var all = 0
               oneData.syCostAllocationFabricList.map(item=>{
                 this.$refs.unitTabs.mList.map(event=>{
                   if(item.goodsName==event.goodsName){
                     item.transferCost = event.transferCost
                   }
                 })
+                if(item.transferCost&&item.transferCost!==''){
+                    all+=item.transferCost
+                  }
               })
-              oneData.syCostAllocationIngredientList.map(item=>{
+              this.detailsPlanNum.fabriccostIncludestax = (all+Number(this.fabricCost)).toFixed(2) // 表头面料成本(¥)
+              this.detailsPlanNum.fabriccostIncludestaxUsd = (Number(this.detailsPlanNum.fabriccostIncludestax)/this.detailsPlanNum.exchangeRate).toFixed(2)//表头面料成本($)
+              this.detailsPlanNum.fabriccostNotincludestax = (Number(this.detailsPlanNum.fabriccostIncludestax)/(1+(Number(this.detailsPlanNum.taxrate)/100))).toFixed(2)
+               oneData.syCostAllocationIngredientList.map(item=>{
                 this.$refs.unitTabs.fList.map(event=>{
                   if(item.goodsName==event.goodsName){
                     item.transferCost = event.transferCost