|
@@ -608,12 +608,12 @@ export default {
|
|
|
type: 'info'
|
|
type: 'info'
|
|
|
},
|
|
},
|
|
|
// todo 待开发
|
|
// todo 待开发
|
|
|
- // {
|
|
|
|
|
- // key: 'customPrint',
|
|
|
|
|
- // label: '打印标签',
|
|
|
|
|
- // icon: 'ibps-icon-cog',
|
|
|
|
|
- // type: 'warning'
|
|
|
|
|
- // },
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ key: 'customPrint',
|
|
|
|
|
+ label: '打印标签',
|
|
|
|
|
+ icon: 'ibps-icon-cog',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ },
|
|
|
{
|
|
{
|
|
|
key: 'customExport',
|
|
key: 'customExport',
|
|
|
label: '导出数据',
|
|
label: '导出数据',
|
|
@@ -712,7 +712,12 @@ export default {
|
|
|
slotName: 'posSlot',
|
|
slotName: 'posSlot',
|
|
|
sortable: true
|
|
sortable: true
|
|
|
},
|
|
},
|
|
|
- { prop: 'bianZhiShiJian', label: '建档时间', sortable: true, width: 130 },
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ prop: 'bianZhiShiJian',
|
|
|
|
|
+ label: '建档时间',
|
|
|
|
|
+ sortable: true,
|
|
|
|
|
+ width: 130
|
|
|
|
|
+ },
|
|
|
{ prop: 'sheBeiShiBieH', label: '设备编号', sortable: true },
|
|
{ prop: 'sheBeiShiBieH', label: '设备编号', sortable: true },
|
|
|
{ prop: 'yuanSheBeiBian', label: '原设备编号', sortable: true },
|
|
{ prop: 'yuanSheBeiBian', label: '原设备编号', sortable: true },
|
|
|
{ prop: 'sheBeiMingCheng', label: '设备名称', sortable: true },
|
|
{ prop: 'sheBeiMingCheng', label: '设备名称', sortable: true },
|
|
@@ -1679,7 +1684,9 @@ export default {
|
|
|
if (indices.length > 1) {
|
|
if (indices.length > 1) {
|
|
|
return [
|
|
return [
|
|
|
{
|
|
{
|
|
|
- field: `发现重复的原设备编号:${key} 在第 ${indices.join(', ')} 行`
|
|
|
|
|
|
|
+ field: `发现重复的原设备编号:${key} 在第 ${indices.join(
|
|
|
|
|
+ ', '
|
|
|
|
|
+ )} 行`
|
|
|
}
|
|
}
|
|
|
]
|
|
]
|
|
|
}
|
|
}
|