From 549e896341d0f0287c8fc7f8a50236298e8e8d90 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Wed, 25 Oct 2023 13:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=A4=87=E6=B3=A8=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/remark/index.ts            | 14 ++++++++
 src/components/Annex/src/Annex.vue     | 11 +++++--
 src/components/Detail/src/Detail.vue   | 44 +++++---------------------
 src/components/Remarks/src/Remarks.vue |  4 +--
 4 files changed, 33 insertions(+), 40 deletions(-)
 create mode 100644 src/api/wms/remark/index.ts

diff --git a/src/api/wms/remark/index.ts b/src/api/wms/remark/index.ts
new file mode 100644
index 000000000..7a1ac3642
--- /dev/null
+++ b/src/api/wms/remark/index.ts
@@ -0,0 +1,14 @@
+import request from '@/config/axios'
+// 查询备注列表
+export const getRemarkPage = async (params) => {
+  return await request.get({ url: `/infra/remark/list`, params })
+}
+
+// 新增备注
+export const createRemark= async (data) => {
+  return await request.post({ url: `/infra/remark/create`, data })
+}
+// 查询变更记录列表
+export const getChangeRecordPage = async (params) => {
+  return await request.get({ url: `/infra/trends/list`, params })
+}
diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index 703db3fdd..6d9a06b4d 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -28,6 +28,7 @@
 <script lang="ts" setup>
 import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
 import { formatDate } from '@/utils/formatTime'
+import * as FileApi from '@/api/wms/file'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 defineComponent({
@@ -53,8 +54,14 @@ const handleAnnexSuccess = () => {
 
 // 删除附件
 const deleteAnnex = async (id) => {
-
-  emit('deleteAnnexSuccess', id)
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await FileApi.deleteFile(id)
+    message.success(t('common.delSuccess'))
+  } catch { }
+  emit('deleteAnnexSuccess')
 }
 
 </script>
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index f5891f696..c4907859f 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -41,11 +41,9 @@ import Annex from '@/components/Annex/src/Annex.vue'
 import Remarks from '@/components/Remarks/src/Remarks.vue'
 import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
 import Tabs from '@/components/Tabs/src/Tabs.vue'
-import * as DetailApi from '@/api/wms/detail'
+import * as RemarkApi from '@/api/wms/remark'
 import * as FileApi from '@/api/wms/file'
 
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
 
 
 defineOptions({ name: 'Detail' })
@@ -114,26 +112,7 @@ const remarksData = reactive({
 
 // 变更记录默认数据
 const changeRecordData = reactive({
-  changeRecordList: [{
-    name: '诸葛亮',
-    type: 1,
-    time: '2023年5月6日 17:16:00',
-  }, {
-    name: '刘备',
-    type: 2,
-    time: '2023年5月6日 17:16:00',
-  }, {
-    name: '曹操',
-    type: 3,
-    time: '2023年5月6日 17:16:00',
-    file: [{
-      name: '这是个附件的名字.docx',
-      url: 'http://localhost:12080/admin-api/system/user/get-import-template'
-    }, {
-      name: '这是个附件的名字.docx',
-      url: 'http://localhost:12080/admin-api/system/user/get-import-template'
-    }]
-  }]
+  changeRecordList: []
 })
 const detailData = ref("")//详情数据
 // 获取附件列表篇
@@ -152,17 +131,10 @@ const handleAnnexSuccess = () => {
 
 }
 // 删除附件成功之后所走的方法
-const deleteAnnexSuccess = async (id) => {
-  console.log('删除成功');
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await FileApi.deleteFile(id)
-    message.success(t('common.delSuccess'))
-    getFileList()
-    getChangeRecordList()
-  } catch { }
+const deleteAnnexSuccess = async () => {
+
+  getFileList()
+  getChangeRecordList()
 }
 
 // Tabs当前选择
@@ -204,7 +176,7 @@ defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
 const getRemarkList = async () => {
   detailLoading.value = true
   try {
-    remarksData.remarksList = await DetailApi.getRemarkPage(remarksData.data)
+    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
   } finally {
     detailLoading.value = false
   }
@@ -218,7 +190,7 @@ const remarksSubmitScuess = async (remark) => {
 // 获取变更记录
 const getChangeRecordList = async () => {
   // remarksData.data.tableId = '1679654720693248010'
-  changeRecordData.changeRecordList = await DetailApi.getChangeRecordPage(remarksData.data)
+  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
   
 }
 
diff --git a/src/components/Remarks/src/Remarks.vue b/src/components/Remarks/src/Remarks.vue
index 0e91a2e04..f73c66c8f 100644
--- a/src/components/Remarks/src/Remarks.vue
+++ b/src/components/Remarks/src/Remarks.vue
@@ -30,7 +30,7 @@
 
 <script lang="ts" setup>
 const message = useMessage() // 消息弹窗
-import * as DetailApi from '@/api/wms/detail'
+import * as RemarkApi from '@/api/wms/remark'
 import { formatDate } from '@/utils/formatTime'
 
 defineComponent({
@@ -55,7 +55,7 @@ const handleSubmitrRemarks =async ()=>{
     return;
   }
   try {
-    await DetailApi.createRemark(data.value)
+    await RemarkApi.createRemark(data.value)
     message.success('提交成功')
   } finally {
     emit('remarksSubmitScuess') //成功之后给父组件的数据