|
@@ -268,11 +268,7 @@ export default {
|
|
|
{label: '物料名称', prop: 'materialName'},
|
|
|
{label: '规格', prop: 'specification'},
|
|
|
{label: '生产厂家/代理人', prop: 'manufacturerName', width: 150},
|
|
|
- {label: '含税单价', prop: 'taxPrice', width: 80,
|
|
|
- formatter: function(row, column, cellValue, index) {
|
|
|
- return row.taxPrice ? parseFloat(row.taxPrice).toFixed(5) : '0.00'
|
|
|
- },
|
|
|
- },
|
|
|
+ {label: '含税单价', prop: 'taxPrice', width: 80},
|
|
|
{label: '最近价格', prop: 'recentlyPrice', width: 80},
|
|
|
{label: '单价差', prop: 'priceDiffer', width: 80},
|
|
|
{label: '申请理由', prop: 'explainStr'},
|
|
@@ -293,12 +289,12 @@ export default {
|
|
|
{label: '生产厂家', prop: 'manufacturerName', width: 150},
|
|
|
// {label: '医药物料', prop: 'isMedcine'},
|
|
|
{label: '数量', prop: 'qty', width: 80,},
|
|
|
- {label: '含税单价', prop: 'taxPrice', width: 80,
|
|
|
+ {label: '含税单价', prop: 'taxPrice', width: 80},
|
|
|
+ {label: '价税合计', prop: 'money', width: 80,
|
|
|
formatter: function(row, column, cellValue, index) {
|
|
|
- return row.taxPrice ? parseFloat(row.taxPrice).toFixed(5) : '0.00'
|
|
|
+ return row.money ? parseFloat(row.money).toFixed(2) : '0.00'
|
|
|
},
|
|
|
},
|
|
|
- {label: '价税合计', prop: 'money', width: 80,},
|
|
|
{label: '赠品', prop: 'isGift', width: 50,
|
|
|
formatter: function(row, column, cellValue, index) {
|
|
|
return row.isGift == 'Y' ? '是' : '否'
|