diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 5d96ad648..4d015d342 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -258,10 +258,7 @@ const butttondata = (row) => { hide: isShowMainButton(row, 'publish'), hasPermi: 'qms:inspection-recode-main:pub' }), // 发布 - defaultButtons.mainListCloseBtn({ - hide: isShowMainButton(row, 'publish'), - hasPermi: 'qms:inspection-recode-main:close' - }), // 关闭 + defaultButtons.mainListPackageBtn({ hide: isShowPackageBtn(row, ['11']) }), // 包装 // defaultButtons.mainListJobExeBtn({ // hide:row.useDecision, @@ -269,7 +266,11 @@ const butttondata = (row) => { // }), // 执行 defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑 defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 - defaultButtons.mainListSupplierResumeBtn({}) // 查看履历表 + defaultButtons.mainListSupplierResumeBtn({}), // 查看履历表 + defaultButtons.mainListCloseBtn({ + hide: isShowMainButton(row, 'publish'), + hasPermi: 'qms:inspection-recode-main:close' + }), // 关闭 ] } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index b190ab1d6..d81beb924 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -275,6 +275,7 @@ const handleDelete = async (id: number) => { const handleFree = async (row: any) => { try { // 发起删除 + console.log(row.frozenStatus) if(row.frozenStatus=="是"){ await UserApi.unLockUser(row.id) message.success(t('common.unLockSuccess'))