成本分配表-辅料sheet合计行

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

@@ -756,42 +756,27 @@ export default {
     },
     //辅料中的合计行
     addAmountIng(val){
-      var ingredientsTransferQuantityALll = 0,
+      var
       transferCostAll =0,
-      usageQuantityAll = 0,
-      purchaseQuantityAll = 0,
-      ingredientsRemainingQuantityAll = 0,
-      lossAll = 0,
       rmbAmountAll = 0,
       usdAmountAll = 0,
-      priceExcludingtaxAll = 0,
-      dosageAll = 0
+      priceExcludingtaxAll = 0
         val.map(item=>{
           if(item.goodsName!=='合计'){
-          ingredientsTransferQuantityALll+=Number(item.ingredientsTransferQuantity)
           transferCostAll+=Number(item.transferCost)
-          usageQuantityAll+=Number(item.usageQuantity)
-          purchaseQuantityAll+=Number(item.purchaseQuantity)
-          ingredientsRemainingQuantityAll+=Number(item.ingredientsRemainingQuantity)
-          lossAll+=Number(item.loss)
           rmbAmountAll+=item.rmbAmount?Number(item.rmbAmount):0
           usdAmountAll+=item.usdAmount?Number(item.usdAmount):0
           priceExcludingtaxAll+=item.priceExcludingtax?Number(item.priceExcludingtax):0
-          dosageAll+=Number(item.dosage)
           }
         })
       var allObj ={
           goodsName:'合计',
-          ingredientsTransferQuantity:ingredientsTransferQuantityALll,
           transferCost:transferCostAll,
-          usageQuantity:usageQuantityAll,
-          purchaseQuantity:purchaseQuantityAll,
-          ingredientsRemainingQuantity:ingredientsRemainingQuantityAll,
-          loss:lossAll,
           rmbAmount:rmbAmountAll,
           usdAmount:usdAmountAll,
           priceExcludingtax:priceExcludingtaxAll,
-          dosage:dosageAll
+          ingredientsTransferQuantity:'',
+          ingredientsRemainingQuantity:''
         }  
         if(this.$refs.unitTabs.ingData.length!==0 ){
           if(this.$refs.unitTabs.ingData[this.$refs.unitTabs.ingData.length-1].goodsName=='合计'){this.$refs.unitTabs.ingData.pop()}

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

@@ -63,11 +63,11 @@
           </span>
             <!--辅料-转入数量 弹框-->
             <span slot="ingInQuaSlot" slot-scope="text">
-              <a>{{ Number(text).toFixed(4) }}</a>
+              <a v-if="text!==''">{{ Number(text).toFixed(4) }}</a>
             </span>
             <!--辅料-余下数量 弹框-->
             <span slot="ingRemQuaSlot" slot-scope="text">
-              <a>{{ Number(text).toFixed(4) }}</a>
+              <a v-if="text!==''">{{ Number(text).toFixed(4) }}</a>
             </span>
             <!-- 备注 -->
             <span slot="remarks" slot-scope="text,record">