Merge branch 'master_hella' into hella_zhaoxuebing

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'
+      }), // 关闭
     ]
   }
 

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'))