diff --git a/src/views/warehouseManagement/maintenancetools/components/maintenanceList.vue b/src/views/warehouseManagement/maintenancetools/components/maintenanceList.vue index 50e0a5df..e8c6d8aa 100644 --- a/src/views/warehouseManagement/maintenancetools/components/maintenanceList.vue +++ b/src/views/warehouseManagement/maintenancetools/components/maintenanceList.vue @@ -157,6 +157,24 @@ export default { span: 24, overflow: true, search: false, + }, + { + label: '是否量具保养', + prop: 'isMeasureMaintenance', + span: 24, + overflow: true, + search: false, + type: 'select', + dicData:[ + { + label: '是', + value: 1, + }, + { + label: '否', + value: 0, + }, + ] }, { label: '累计使用次数', diff --git a/src/views/warehouseManagement/maintenancetools/components/maintenanceRecord.vue b/src/views/warehouseManagement/maintenancetools/components/maintenanceRecord.vue index 90ea7034..e76171e9 100644 --- a/src/views/warehouseManagement/maintenancetools/components/maintenanceRecord.vue +++ b/src/views/warehouseManagement/maintenancetools/components/maintenanceRecord.vue @@ -221,7 +221,7 @@ export default { }, { label: '当前状态', - prop: 'status', + prop: 'checkFlag', type: 'select', span: 24, labelWidth: 140, @@ -236,8 +236,9 @@ export default { ], // 0 新建 1 已申请 dicData: [ - { label: '新建', value: 0 }, - { label: '已申请', value: 1 }, + { label: '未检查', value: 0 }, + { label: '检验合格', value: 1 }, + { label: '检验不合格', value: 1 }, ], }, ],