|
@@ -81,7 +81,7 @@
|
|
|
<script>
|
|
|
import { commonMixin } from '@/utils/mixin'
|
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
-import { productPriceImport, productPriceFailExcel } from '@/api/product'
|
|
|
+import { productPriceFailExcel } from '@/api/product'
|
|
|
export default {
|
|
|
name: 'ChooseImportModal',
|
|
|
mixins: [commonMixin],
|
|
@@ -103,18 +103,18 @@ export default {
|
|
|
nowColumns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
|
{ title: '产品编码', dataIndex: 'productCode', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '唯一码', dataIndex: 'warehouseName', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '业务单号', dataIndex: 'warehouseName1', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '工厂出库单号', dataIndex: 'warehouseLocationName', width: '26%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
+ { title: '唯一码', dataIndex: 'traceCodeSn', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '业务单号', dataIndex: 'bizCode', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '工厂出库单号', dataIndex: 'factoryOutCode', width: '26%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
],
|
|
|
loadData: [],
|
|
|
nowUnColumns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
|
{ title: '产品编码', dataIndex: 'productCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '唯一码', dataIndex: 'warehouseName', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '业务单号', dataIndex: 'warehouseName1', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '工厂出库单号', dataIndex: 'warehouseLocationName', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '备注', dataIndex: 'errorMsg', width: '27%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
+ { title: '唯一码', dataIndex: 'traceCodeSn', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '业务单号', dataIndex: 'bizCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '工厂出库单号', dataIndex: 'factoryOutCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '备注', dataIndex: 'errorDesc', width: '27%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
],
|
|
|
unLoadData: [],
|
|
|
loading: false
|
|
@@ -123,26 +123,15 @@ export default {
|
|
|
methods: {
|
|
|
getData () {
|
|
|
const _this = this
|
|
|
- this.loading = true
|
|
|
- const params = {
|
|
|
- path: this.paramsData.path
|
|
|
- }
|
|
|
- productPriceImport(params).then(res => {
|
|
|
- this.loading = false
|
|
|
- if (res.status == 200) {
|
|
|
- if (res.data.rightList && res.data.rightList.length > 0) {
|
|
|
- res.data.rightList.map((item, index) => {
|
|
|
- item.no = index + 1
|
|
|
- })
|
|
|
- }
|
|
|
- if (res.data.errorList && res.data.errorList.length > 0) {
|
|
|
- res.data.errorList.map((item, index) => {
|
|
|
- item.no = index + 1
|
|
|
- })
|
|
|
- }
|
|
|
- _this.loadData = res.data.rightList || []
|
|
|
- _this.unLoadData = res.data.errorList || []
|
|
|
- }
|
|
|
+ const paramsData = JSON.parse(JSON.stringify(_this.paramsData))
|
|
|
+ console.log(paramsData)
|
|
|
+ this.loadData = paramsData.rightList || []
|
|
|
+ this.unLoadData = paramsData.errorList || []
|
|
|
+ this.loadData.map((item, index) => {
|
|
|
+ item.no = index + 1
|
|
|
+ })
|
|
|
+ this.unLoadData.map((item, index) => {
|
|
|
+ item.no = index + 1
|
|
|
})
|
|
|
},
|
|
|
// 确认导入
|