|
@@ -81,7 +81,7 @@
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
- :scroll="{ x: 1350, y: tableHeight }"
|
|
|
|
|
|
+ :scroll="{ x: 1540, y: tableHeight }"
|
|
bordered>
|
|
bordered>
|
|
<!-- 产品图片 -->
|
|
<!-- 产品图片 -->
|
|
<template slot="imageUrl" slot-scope="text, record">
|
|
<template slot="imageUrl" slot-scope="text, record">
|
|
@@ -114,6 +114,7 @@ import { productTypeQuery } from '@/api/productType'
|
|
import { productList, getCurrentDealer } from '@/api/product'
|
|
import { productList, getCurrentDealer } from '@/api/product'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
export default {
|
|
export default {
|
|
|
|
+ name: 'ProductJgList',
|
|
components: { STable, VSelect },
|
|
components: { STable, VSelect },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
@@ -188,10 +189,10 @@ export default {
|
|
// 设置表头
|
|
// 设置表头
|
|
getColumns () {
|
|
getColumns () {
|
|
this.columns = [
|
|
this.columns = [
|
|
- { title: '序号', dataIndex: 'no', width: 70, align: 'center', fixed: 'left' },
|
|
|
|
- { title: '产品编码', dataIndex: 'code', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
|
|
|
|
+ { title: '产品编码', dataIndex: 'code', align: 'center', width: 120, customRender: function (text) { return text || '--' } },
|
|
{ title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '原厂编码', dataIndex: 'origCode', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '原厂编码', dataIndex: 'origCode', align: 'center', width: 120, customRender: function (text) { return text || '--' } },
|
|
{ title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: 80, align: 'center' },
|
|
{ title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: 80, align: 'center' },
|
|
{ title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'center' }
|
|
{ title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'center' }
|
|
@@ -295,9 +296,11 @@ export default {
|
|
},
|
|
},
|
|
beforeRouteEnter (to, from, next) {
|
|
beforeRouteEnter (to, from, next) {
|
|
next(vm => {
|
|
next(vm => {
|
|
- vm.getColumns()
|
|
|
|
vm.getProductBrand()
|
|
vm.getProductBrand()
|
|
vm.getProductType()
|
|
vm.getProductType()
|
|
|
|
+ if (!vm.disabled) {
|
|
|
|
+ vm.getColumns()
|
|
|
|
+ }
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|