开票成本-辅料的显示以及合计

src/views/reportForms/fabric-loss-table.vue

@@ -692,7 +692,12 @@ export default {
           scopedSlots: { customRender: 'ingredientsInvoiceQuantity' }
         },
         { title: '开票金额(人民币)', width: 120, dataIndex: 'isum', className: 'replacecolor' },
-        { title: '开票金额(美元)', width: 120, dataIndex: 'ioriSum', className: 'replacecolor' },
+        { title: '开票金额(美元)', width: 120, dataIndex: 'ioriSum', className: 'replacecolor',customRender: (text, record, index) => {
+            if (record.isum == record.ioriSum)
+              return "";
+            else
+              return record.ioriSum;
+         } },
         { title: '单位', width: 120, dataIndex: 'ccomUnitName', className: 'replacecolor' },
         { title: '订单数', width: 120, dataIndex: 'iquantity', className: 'replacecolor' },
         { title: '采购入库数', width: 120, dataIndex: 'iquantityIn', className: 'replacecolor' }
@@ -908,10 +913,12 @@ export default {
           var isum = 0,ioriSum=0,iquantity=0,iquantityIn=0,iquantityInvoice=0;
           for (let row of this.fabricLoss.fabricCostAssistList){
             isum += row.isum*1;
-             ioriSum += row.ioriSum*1;
              iquantity += row.iquantity*1;
              iquantityIn += row.iquantityIn*1;
              iquantityInvoice += row.iquantityInvoice*1;
+             if(row.isum!==row.ioriSum){
+                ioriSum += row.ioriSum*1;
+             }
             }
           if(this.fabricLoss.fabricCostAssistList.length !== 0){
              this.fabricLoss.fabricCostAssistList.push({