|
@@ -43,7 +43,7 @@
|
|
|
<template slot="unitTypeShow" slot-scope="text,record">
|
|
|
{{ record.unitType==='SL'?'按数量设置':'按整箱设置' }}
|
|
|
</template>
|
|
|
- <!-- <template slot="errorMsg" slot-scope="text,record">
|
|
|
+ <!-- <template slot="errorMsg" slot-scope="text,record">
|
|
|
<a-popover placement="topRight">
|
|
|
<template slot="content">
|
|
|
<p v-for="d in record.importErrorMsgSet">{{ d }}</p>
|
|
@@ -138,7 +138,7 @@ export default {
|
|
|
{ title: '产品名称', dataIndex: 'product.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '起订类型', scopedSlots: { customRender: 'unitTypeShow' }, dataIndex: 'unitType', width: '10%', align: 'center' },
|
|
|
{ title: '起订数量', dataIndex: 'unitQty', width: '10%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '错误说明',dataIndex: 'importErrorMsgSet', width: '30%', align: 'center', customRender: function (text) { return text || '--' },ellipsis: true }
|
|
|
+ { title: '错误说明', dataIndex: 'importErrorMsgSet', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
|
|
|
]
|
|
|
if (_this.goodsFlag == '0' && _this.discountType == '0') {
|
|
|
unColumnsArr.splice(3, 0, { title: '省级特价', dataIndex: 'provinceDiscountPriceText', width: '10%', align: 'right', customRender: function (text) { return text || '--' } },
|
|
@@ -150,7 +150,7 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
setFlag (val) {
|
|
|
- this.goodsFlag = val.goodsFlag
|
|
|
+ this.goodsFlag = val.goodFlag
|
|
|
this.discountType = val.discountType
|
|
|
},
|
|
|
getData () {
|
|
@@ -184,7 +184,12 @@ export default {
|
|
|
}
|
|
|
_this.spinning = true
|
|
|
const ajaxName = _this.goodsFlag == '0' ? downSpecialFail : downNormalFail
|
|
|
- hdExportExcel(ajaxName, _this.unLoadData, '导出产品错误项', function () {
|
|
|
+ var ajaxData = {}
|
|
|
+ ajaxData.unLoadData = _this.unLoadData
|
|
|
+ if (_this.goodsFlag == '0') {
|
|
|
+ ajaxData.discountType = _this.discountType
|
|
|
+ }
|
|
|
+ hdExportExcel(ajaxName, ajaxData, '导出产品错误项', function () {
|
|
|
_this.spinning = false
|
|
|
})
|
|
|
}
|