|
@@ -675,7 +675,7 @@ export default {
|
|
|
{ title: '序号', width: '10%', dataIndex: 'index', className: 'replacecolor' },
|
|
|
{ title: '账套号', width: '10%', dataIndex: 'caccount', className: 'replacecolor' },
|
|
|
{ title: '订单号', width: '10%', dataIndex: 'cpoid', className: 'replacecolor' },
|
|
|
- { title: '供应商', width: '10%', dataIndex: 'cvenAbbName', className: 'replacecolor' },
|
|
|
+ { title: '供应商', width: '7%', dataIndex: 'cvenAbbName', className: 'replacecolor' },
|
|
|
{ title: ' 类型', width: '13%', dataIndex: 'cinvName', className: 'replacecolor',align:"left" },
|
|
|
{
|
|
|
title: '发票数量',
|
|
@@ -686,6 +686,7 @@ export default {
|
|
|
scopedSlots: { customRender: 'ingredientsInvoiceQuantity' }
|
|
|
},
|
|
|
{ title: '开票金额(人民币)', width: '10%', dataIndex: 'isum', className: 'replacecolor' },
|
|
|
+ { title: '无税金额', width: '6%', dataIndex: 'iNoTaxMoney', className: 'replacecolor' },
|
|
|
{ title: '单位', width: '10%', dataIndex: 'ccomUnitName', className: 'replacecolor' },
|
|
|
{ title: '订单数', width: '10%', dataIndex: 'iquantity', className: 'replacecolor' },
|
|
|
{ title: '采购入库数', width: '10%', dataIndex: 'iquantityIn', className: 'replacecolor' }
|
|
@@ -693,7 +694,7 @@ export default {
|
|
|
costInvoiceIngredientColumnsAll: [
|
|
|
{ title: '账套号', width: '10%', dataIndex: 'caccount', className: 'replacecolor' },
|
|
|
{ title: '订单号', width: '10%', dataIndex: 'cpoid', className: 'replacecolor' },
|
|
|
- { title: '供应商', width: '10%', dataIndex: 'cvenAbbName', className: 'replacecolor' },
|
|
|
+ { title: '供应商', width: '7%', dataIndex: 'cvenAbbName', className: 'replacecolor' },
|
|
|
{ title: ' 类型', width: '10%', dataIndex: 'cinvName', className: 'replacecolor',align:"left" },
|
|
|
{
|
|
|
title: '发票数量',
|
|
@@ -710,6 +711,7 @@ export default {
|
|
|
else
|
|
|
return record.ioriSum;
|
|
|
} },
|
|
|
+ { title: '无税金额', width: '6%', dataIndex: 'iNoTaxMoney', className: 'replacecolor' },
|
|
|
{ title: '单位', width: '10%', dataIndex: 'ccomUnitName', className: 'replacecolor' },
|
|
|
{ title: '订单数', width: '10%', dataIndex: 'iquantity', className: 'replacecolor' },
|
|
|
{ title: '采购入库数', width: '10%', dataIndex: 'iquantityIn', className: 'replacecolor' }
|
|
@@ -916,12 +918,13 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
//开票成本-辅料合计
|
|
|
- var isum = 0,ioriSum=0,iquantity=0,iquantityIn=0,iquantityInvoice=0;
|
|
|
+ var isum = 0,ioriSum=0,iquantity=0,iquantityIn=0,iquantityInvoice=0,iNoTaxMoney = 0
|
|
|
for (let row of this.fabricLoss.fabricCostAssistList){
|
|
|
isum += row.isum*1;
|
|
|
iquantity += row.iquantity*1;
|
|
|
iquantityIn += row.iquantityIn*1;
|
|
|
iquantityInvoice += row.iquantityInvoice*1;
|
|
|
+ iNoTaxMoney += (row.iNoTaxMoney?row.iNoTaxMoney:0)*1
|
|
|
if(row.isum!==row.ioriSum){
|
|
|
ioriSum += row.ioriSum*1;
|
|
|
}
|
|
@@ -933,7 +936,8 @@ export default {
|
|
|
ioriSum:parseFloat(ioriSum.toFixed(2)),
|
|
|
iquantity:parseFloat(iquantity.toFixed(4)),
|
|
|
iquantityIn:parseFloat(iquantityIn.toFixed(4)),
|
|
|
- iquantityInvoice:parseFloat(iquantityInvoice.toFixed(4))
|
|
|
+ iquantityInvoice:parseFloat(iquantityInvoice.toFixed(4)),
|
|
|
+ iNoTaxMoney:parseFloat(iNoTaxMoney.toFixed(4)),
|
|
|
})
|
|
|
}
|
|
|
|