diff --git a/src/views/accountsInfoManagement/index.vue b/src/views/accountsInfoManagement/index.vue index ba407839..1396bfbf 100644 --- a/src/views/accountsInfoManagement/index.vue +++ b/src/views/accountsInfoManagement/index.vue @@ -152,8 +152,8 @@ - - + + @@ -202,9 +202,8 @@ export default { total: 0, // 总条数 // 表头 tableColumns: [ - { label: 'ID', prop: 'id' }, { label: '协议ID', prop: 'agreementId' }, - { label: '机具型号ID', prop: 'typeId' }, + { label: '机具规格ID', prop: 'typeId' }, { label: '机具ID', prop: 'maId' }, { label: '领料数量', prop: 'num' }, { label: '领料时间', prop: 'outTime', width: '120' }, diff --git a/src/views/materialsStation/equipment/equipmentRecord/index.vue b/src/views/materialsStation/equipment/equipmentRecord/index.vue index f73f3e6a..a1a8af7f 100644 --- a/src/views/materialsStation/equipment/equipmentRecord/index.vue +++ b/src/views/materialsStation/equipment/equipmentRecord/index.vue @@ -38,10 +38,10 @@ - + - + - + + + + + - - - - - 导出数据 + 导出所有数据 @@ -535,7 +535,7 @@ export default { keyWord: '' // 关键字 }, dialogColumns: [ - { label: '类型名称', prop: 'typeCode' }, + { label: '物资名称', prop: 'typeCode' }, { label: '规格型号', prop: 'modelCode' }, { label: '计量单位', prop: 'unitNames' }, { label: '设备编码', prop: 'maCode' },