From dbef3271d79bb7a997e067d3b8314e05f371986d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 26 Feb 2025 13:48:36 +0800
Subject: [PATCH 1/2] FWHL-234
---
src/views/qms/inspectionRecord/index.vue | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
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'
+ }), // 关闭
]
}
From 6509dfeb5a77f3e627b8452ad2f1ab94d3fd241f Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Wed, 26 Feb 2025 14:12:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?FWHL-241=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/user/index.vue | 1 +
1 file changed, 1 insertion(+)
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'))