Merge remote-tracking branch 'origin/master'

src/api/museums/specimeninfo/index.ts

@@ -57,8 +57,8 @@ export const SpecimenInfoApi = {
   },
 
   // 删除标本管理
-  deleteSpecimenInfo: async (id: number) => {
-    return await request.delete({ url: `/museums/specimen-info/delete?id=` + id })
+  deleteSpecimenInfo: async (id: number,deletedReason) => {
+    return await request.delete({ url: `/museums/specimen-info/delete?id=` + id + '&deletedReason=' + deletedReason})
   },
   //下载导入标本信息模板
   importSpecimenInfTemplate: async(data: SpecimenInfoVO) => {

src/views/museums/specimeninfo/index.vue

@@ -556,15 +556,38 @@ const openForm = (type: string, id?: number) => {
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SpecimenInfoApi.deleteSpecimenInfo(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
+  // try {
+  //   // 删除的二次确认
+  //   await message.delConfirm()
+  //   // 发起删除
+  //   await SpecimenInfoApi.deleteSpecimenInfo(id)
+  //   message.success(t('common.delSuccess'))
+  //   // 刷新列表
+  //   await getList()
+  // } catch {}
+  ElMessageBox.prompt('请输入删除原因', '删除', {
+    confirmButtonText: 'OK',
+    cancelButtonText: 'Cancel',
+    inputPattern: /.+/ ,
+    inputErrorMessage: '删除原因必填',
+  })
+    .then(async ({ value }) =>  {
+      try {
+        await SpecimenInfoApi.deleteSpecimenInfo(id,value)
+        await getList()
+        ElMessage({
+          type: 'success',
+          message: `删除成功`,
+        })
+      } catch {}
+
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消删除',
+      })
+    })
 }
 
 /** 批量导入 */