diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue index 0ba3e72..27be02d 100644 --- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue +++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue @@ -80,8 +80,8 @@ { text: '设备名称', value: 'equipmentName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '所属部门', value: 'deptName', align: 'center' }, - { text: '申请人', value: 'value', align: 'center' }, - { text: '申请时间', value: 'value', align: 'center', width: '180' }, + { text: '申请人', value: 'createUserName', align: 'center' }, + { text: '申请时间', value: 'createTime', align: 'center', width: '180' }, ]) const list = ref([]) // 表格数据 const checkoutList = ref([])// 选中的内容 diff --git a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue index 0ba3e72..27be02d 100644 --- a/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue +++ b/src/views/equipement/stateMaintenance/commonComponents/templateTable.vue @@ -80,8 +80,8 @@ { text: '设备名称', value: 'equipmentName', align: 'center' }, { text: '型号规格', value: 'model', align: 'center' }, { text: '所属部门', value: 'deptName', align: 'center' }, - { text: '申请人', value: 'value', align: 'center' }, - { text: '申请时间', value: 'value', align: 'center', width: '180' }, + { text: '申请人', value: 'createUserName', align: 'center' }, + { text: '申请时间', value: 'createTime', align: 'center', width: '180' }, ]) const list = ref([]) // 表格数据 const checkoutList = ref([])// 选中的内容 diff --git a/src/views/workbench/approve/useChangePage.ts b/src/views/workbench/approve/useChangePage.ts index 86e5163..0188417 100644 --- a/src/views/workbench/approve/useChangePage.ts +++ b/src/views/workbench/approve/useChangePage.ts @@ -57,6 +57,9 @@ else if (row.sourceModuleName === '印章使用登记') { $router.push({ path: '/seal/noteList' }) } + else if (row.sourceModuleName === '印章使用登记') { + $router.push({ path: '/seal/noteList' }) + } else if ( row.sourceModuleName === '实验室接地电阻记录' || row.sourceModuleName === '工作间供电电压记录'