diff --git a/src/api/resource/software.ts b/src/api/resource/software.ts
index 983a965..7f4d371 100644
--- a/src/api/resource/software.ts
+++ b/src/api/resource/software.ts
@@ -29,99 +29,9 @@
 }
 
 // 印章管理编辑
-export function updateSealInfo(data: object) {
+export function updateSoftwareInfo(data: object) {
   return request({
-    url: `${prefix}/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查询印章使用日志列表
-export function getSealLogList(data: any) {
-  return request({
-    url: `${prefix}/note/log/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查询印章使用登记审批列表
-export function getSealNoteList(data: any) {
-  return request({
-    url: `${prefix}/note/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 印章使用登记（保存）
-export function saveSealNote(data: object) {
-  return request({
-    url: `${prefix}/note/save`,
-    method: 'post',
-    data,
-  })
-}
-
-// 印章使用登记（草稿箱编辑）
-export function draftUpdateSealNote(data: object) {
-  return request({
-    url: `${prefix}/note/draftUpdate`,
-    method: 'post',
-    data,
-  })
-}
-
-// 提交流程
-export function submitSealNote(data: object) {
-  return request({
-    url: `${prefix}/note/submit`,
-    method: 'post',
-    data,
-  })
-}
-
-// 发起者撤回，表单状态更改为已取消
-export function revokeApproval(data: object) {
-  return request({
-    url: `${prefix}/note/approval/revoke`,
-    method: 'post',
-    data,
-  })
-}
-
-// 审批-拒绝
-export function refuseApproval(data: object) {
-  return request({
-    url: `${prefix}/note/approval/refuse`,
-    method: 'post',
-    data,
-  })
-}
-
-// 未通过委托方编辑（重走流程审批）
-export function failUpdateNote(data: object) {
-  return request({
-    url: `${prefix}/note/failUpdate`,
-    method: 'post',
-    data,
-  })
-}
-
-// 删除 草稿箱
-export function deleteSealNoteDraft(data: object) {
-  return request({
-    url: `${prefix}/note/draftDelete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 删除 已取消
-export function deleteSealNoteRevoked(data: object) {
-  return request({
-    url: `${prefix}/note/approval/delete`,
+    url: `${prefix}Info/update`,
     method: 'post',
     data,
   })

diff --git a/src/api/resource/software.ts b/src/api/resource/software.ts
index 983a965..7f4d371 100644
--- a/src/api/resource/software.ts
+++ b/src/api/resource/software.ts
@@ -29,99 +29,9 @@
 }
 
 // 印章管理编辑
-export function updateSealInfo(data: object) {
+export function updateSoftwareInfo(data: object) {
   return request({
-    url: `${prefix}/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查询印章使用日志列表
-export function getSealLogList(data: any) {
-  return request({
-    url: `${prefix}/note/log/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查询印章使用登记审批列表
-export function getSealNoteList(data: any) {
-  return request({
-    url: `${prefix}/note/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 印章使用登记（保存）
-export function saveSealNote(data: object) {
-  return request({
-    url: `${prefix}/note/save`,
-    method: 'post',
-    data,
-  })
-}
-
-// 印章使用登记（草稿箱编辑）
-export function draftUpdateSealNote(data: object) {
-  return request({
-    url: `${prefix}/note/draftUpdate`,
-    method: 'post',
-    data,
-  })
-}
-
-// 提交流程
-export function submitSealNote(data: object) {
-  return request({
-    url: `${prefix}/note/submit`,
-    method: 'post',
-    data,
-  })
-}
-
-// 发起者撤回，表单状态更改为已取消
-export function revokeApproval(data: object) {
-  return request({
-    url: `${prefix}/note/approval/revoke`,
-    method: 'post',
-    data,
-  })
-}
-
-// 审批-拒绝
-export function refuseApproval(data: object) {
-  return request({
-    url: `${prefix}/note/approval/refuse`,
-    method: 'post',
-    data,
-  })
-}
-
-// 未通过委托方编辑（重走流程审批）
-export function failUpdateNote(data: object) {
-  return request({
-    url: `${prefix}/note/failUpdate`,
-    method: 'post',
-    data,
-  })
-}
-
-// 删除 草稿箱
-export function deleteSealNoteDraft(data: object) {
-  return request({
-    url: `${prefix}/note/draftDelete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 删除 已取消
-export function deleteSealNoteRevoked(data: object) {
-  return request({
-    url: `${prefix}/note/approval/delete`,
+    url: `${prefix}Info/update`,
     method: 'post',
     data,
   })
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 86c93a1..60cdea7 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -1,10 +1,13 @@
 <!-- 在用软件详情 -->
 <script name="SoftwareInfoDetail" lang="ts" setup>
-import type { UploadProps } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { ISoftwareInfo } from './software-info'
+import type { IReviewReport } from '../review/software-review'
+import type { IRevisionApply } from '../revision/software-revision'
+import type { IChangeLog, ISoftwareInfo } from './software-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { UploadFile } from '@/api/file'
-import { detailSoftware, getSoftwareChangeLog } from '@/api/resource/software'
+import { detailSoftware, getSoftwareChangeLog, updateSoftwareInfo } from '@/api/resource/software'
+import { getPhotoUrl } from '@/api/system/tool'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -37,15 +40,49 @@
   createUserName: '',
 })
 
-const sealInfoRules = ref({
-  sealNo: [{ required: true, message: '印章编号不能为空', trigger: 'blur' }],
-  sealName: [{ required: true, message: '印章名称不能为空', trigger: 'blur' }],
-  sealType: [{ required: true, message: '印章类型不能为空，请选择', trigger: ['blur', 'change'] }],
-  approverId: [{ required: true, message: '批准人不能为空', trigger: ['blur', 'change'] }],
-  applyTime: [{ required: true, message: '申请时间不能为空，请选择', trigger: 'blur' }],
-  ratifyTime: [{ required: true, message: '批准时间不能为空，请选择', trigger: 'blur' }],
-  status: [{ required: true, message: '在用状态不能为空，请选择', trigger: ['blur', 'change'] }],
-  minioFileName: [{ required: true, message: '图形不能为空，请选择一个文件上传', trigger: 'blur' }],
+const reviewList = ref<Array<IReviewReport>>([])
+const revisionList = ref<Array<IRevisionApply>>([])
+const changeList = ref<Array<IChangeLog>>([])
+
+const reviewColumn = ref<TableColumn[]>([
+  { text: '文件编号', value: 'reportNo', align: 'center', width: '180' },
+  { text: '软件名称', value: 'softwareName', align: 'center' },
+  { text: '版本号', value: 'softwareVersion', align: 'center', width: '120' },
+  { text: '软件评审类型', value: 'reviewTypeStr', align: 'center', width: '160' },
+  { text: '申请部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '申请人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '申请时间', value: 'createTime', align: 'center', width: '180' },
+])
+const revisionColumn = ref<TableColumn[]>([
+  { text: '文件编号', value: 'applyNo', align: 'center', width: '180' },
+  { text: '软件名称', value: 'softwareName', align: 'center' },
+  { text: '修订前版本号', value: 'softwareVersion', align: 'center', width: '280' },
+  { text: '申请部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '申请人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '申请时间', value: 'createTime', align: 'center', width: '180' },
+])
+const changeColumn = ref<TableColumn[]>([
+  { text: '变更类型', value: 'changeType', align: 'center', width: '160' },
+  { text: '创建人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '180' },
+  { text: '软件名称', value: 'softwareName', align: 'center' },
+  { text: '版本号', value: 'softwareVersion', align: 'center', width: '120' },
+  { text: '软件文档', value: 'softwareDocument', align: 'center', width: '180' },
+  { text: '功能文档', value: 'functionDocument', align: 'center', width: '180' },
+  { text: '源代码', value: 'sourceCode', align: 'center', width: '180' },
+  { text: '数据验证记录', value: 'dataValidationRecord', align: 'center', width: '180' },
+])
+
+const documentFileUrl = ref<string>('')
+const functionFileUrl = ref<string>('')
+const sourceFileUrl = ref<string>('')
+const validateFileUrl = ref<string>('')
+
+const softwareInfoRules = ref({
+  softwareDocument: [{ required: true, message: '软件文档不能为空，请选择一个文件上传', trigger: ['blur', 'change'] }],
+  functionDocument: [{ required: true, message: '功能文档不能为空，请选择一个文件上传', trigger: ['blur', 'change'] }],
+  sourceCode: [{ required: true, message: '源代码不能为空，请选择一个文件上传', trigger: ['blur', 'change'] }],
+  dataValidationRecord: [{ required: true, message: '数据验证记录不能为空，请选择一个文件上传', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 逻辑
@@ -67,31 +104,12 @@
   router.go(-1)
 }
 
-// 添加
-const saveSealInfoForm = () => {
-  // 将创建时间改为提交的时间
-  softwareInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-  addSealInfo(softwareInfo.value).then((res) => {
-    if (res.code === 200) {
-      // 提示保存成功
-      ElMessage.success('保存成功')
-      type.value = 'detail'
-      title.value = '印章管理登记（详情）'
-    }
-    else {
-      // 提示失败信息
-      ElMessage.error(`保存失败：${res.message}`)
-    }
-  })
-}
 // 编辑
-const updateSealInfoById = () => {
-  updateSealInfo(softwareInfo.value).then((res) => {
+const updateById = () => {
+  updateSoftwareInfo(softwareInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-      type.value = 'detail'
-      title.value = '印章管理登记（详情）'
     }
     else {
       // 提示失败信息
@@ -113,7 +131,9 @@
 const getChangeLogs = (softwareId: string) => {
   getSoftwareChangeLog({ id: softwareId }).then((res) => {
     if (res.code === 200) {
-      softwareInfo.value = res.data
+      reviewList.value = res.data.reviewReportList
+      revisionList.value = res.data.revisionApplyList
+      changeList.value = res.data.changeLogList
     }
   })
 }
@@ -133,19 +153,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (type.value === 'create') {
-          saveSealInfoForm()
-        }
-        else if (type.value === 'update') {
-          updateSealInfoById()
-        }
+        updateById()
       })
     }
   })
 }
 
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: any) => {
+const uploadSoftwareFile: any = (file: any, fileType: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   const loading = ElLoading.service({
@@ -155,10 +170,8 @@
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ElMessage.success('上传成功')
-      softwareInfo.value.minioFileName = res.data[0]
+      softwareInfo.value[fileType] = res.data[0]
       loading.close()
-
-      basicFormRef.value.validateField('minioFileName', () => {})
     }
   }).catch(() => {
     loading.close()
@@ -166,24 +179,6 @@
   })
 }
 
-// 上传之前的验证
-const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
-  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
-    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
-    return false
-  }
-  else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('图片不能大于2MB')
-    return false
-  }
-  return true
-}
-
-// 预览文件
-const previewSealImage = (url: string) => {
-  console.log(url)
-}
-
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -198,14 +193,24 @@
       title.value = '在用软件详情（编辑）'
       id.value = params.id
 
-      softwareInfo.value = JSON.parse(sessionStorage.getItem('sealInfo')!)
+      radioItems.value = [
+        { name: '基本信息', value: 'software-basic' },
+      ]
+
+      detail(id.value)
 
       break
     case 'detail':
       title.value = '在用软件详情'
       id.value = params.id
 
+      radioItems.value = [
+        { name: '基本信息', value: 'software-basic' },
+        { name: '变更记录', value: 'software-changeLog' },
+      ]
+
       detail(id.value)
+      getChangeLogs(id.value)
       break
     default:
       title.value = ''
@@ -213,6 +218,46 @@
   }
 }
 
+watch(() => softwareInfo.value.softwareDocument, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        documentFileUrl.value = res.data
+      }
+    })
+  }
+})
+
+watch(() => softwareInfo.value.functionDocument, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        functionFileUrl.value = res.data
+      }
+    })
+  }
+})
+
+watch(() => softwareInfo.value.sourceCode, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        sourceFileUrl.value = res.data
+      }
+    })
+  }
+})
+
+watch(() => softwareInfo.value.dataValidationRecord, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        validateFileUrl.value = res.data
+      }
+    })
+  }
+})
+
 onMounted(async () => {
   initDialog(route.query)
 })
@@ -234,41 +279,184 @@
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
 
-      <el-form ref="basicFormRef" :model="softwareInfo" :rules="sealInfoRules" label-position="right" label-width="110px" border stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="软件评审报告">
-              <el-input v-model="softwareInfo.reportNo" :disabled="true" />
-            </el-form-item>
-          </el-col>
+      <template v-if="current === 'software-basic'">
+        <el-form ref="basicFormRef" :model="softwareInfo" :rules="softwareInfoRules" label-position="right" label-width="110px" border stripe>
+          <el-row :gutter="24">
+            <!-- 第一行 第一列 -->
+            <el-col :span="6">
+              <el-form-item label="软件评审报告">
+                <el-input v-model="softwareInfo.reportNo" :disabled="true" />
+              </el-form-item>
+            </el-col>
 
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="软件名称">
-              <el-input v-model="softwareInfo.softwareName" :disabled="true" />
-            </el-form-item>
-          </el-col>
+            <!-- 第一行 第二列 -->
+            <el-col :span="6">
+              <el-form-item label="软件名称">
+                <el-input v-model="softwareInfo.softwareName" :disabled="true" />
+              </el-form-item>
+            </el-col>
 
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="版本号">
-              <el-input v-model="softwareInfo.softwareVersion" :disabled="true" />
-            </el-form-item>
-          </el-col>
+            <!-- 第一行 第三列 -->
+            <el-col :span="6">
+              <el-form-item label="版本号">
+                <el-input v-model="softwareInfo.softwareVersion" :disabled="true" />
+              </el-form-item>
+            </el-col>
 
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input v-model="softwareInfo.createUserName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+            <!-- 第一行 第四列 -->
+            <el-col :span="6">
+              <el-form-item label="创建人">
+                <el-input v-model="softwareInfo.createUserName" :disabled="true" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="软件文档" prop="softwareDocument">
+                <el-input v-model="softwareInfo.softwareDocument" type="hidden" />
+                <el-link :href="documentFileUrl" :underline="false" target="_blank">
+                  {{ softwareInfo.softwareDocument }}
+                </el-link>
+
+                <el-upload
+                  :show-file-list="false"
+                  :http-request="(params) => uploadSoftwareFile(params, 'softwareDocument')"
+                  style="width: 50%; margin-left: 20px;"
+                >
+                  <el-button v-if="type !== 'detail'" type="primary">
+                    <template v-if="softwareInfo.softwareDocument !== ''">
+                      替换
+                    </template>
+                    <template v-else>
+                      上传
+                    </template>
+                  </el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="功能文档" prop="functionDocument">
+                <el-input v-model="softwareInfo.functionDocument" type="hidden" />
+                <el-link :href="functionFileUrl" :underline="false" target="_blank">
+                  {{ softwareInfo.functionDocument }}
+                </el-link>
+
+                <el-upload
+                  :show-file-list="false"
+                  :http-request="(params) => uploadSoftwareFile(params, 'functionDocument')"
+                  style="width: 50%; margin-left: 20px;"
+                >
+                  <el-button v-if="type !== 'detail'" type="primary">
+                    <template v-if="softwareInfo.functionDocument !== ''">
+                      替换
+                    </template>
+                    <template v-else>
+                      上传
+                    </template>
+                  </el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="源代码" prop="sourceCode">
+                <el-input v-model="softwareInfo.sourceCode" type="hidden" />
+                <el-link :href="sourceFileUrl" :underline="false" target="_blank">
+                  {{ softwareInfo.sourceCode }}
+                </el-link>
+
+                <el-upload
+                  :show-file-list="false"
+                  :http-request="(params) => uploadSoftwareFile(params, 'sourceCode')"
+                  style="width: 50%; margin-left: 20px;"
+                >
+                  <el-button v-if="type !== 'detail'" type="primary">
+                    <template v-if="softwareInfo.sourceCode !== ''">
+                      替换
+                    </template>
+                    <template v-else>
+                      上传
+                    </template>
+                  </el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="数据验证记录" prop="dataValidationRecord">
+                <el-input v-model="softwareInfo.dataValidationRecord" type="hidden" />
+                <el-link :href="validateFileUrl" :underline="false" target="_blank">
+                  {{ softwareInfo.dataValidationRecord }}
+                </el-link>
+
+                <el-upload
+                  :show-file-list="false"
+                  :http-request="(params) => uploadSoftwareFile(params, 'dataValidationRecord')"
+                  style="width: 50%; margin-left: 20px;"
+                >
+                  <el-button v-if="type !== 'detail'" type="primary">
+                    <template v-if="softwareInfo.dataValidationRecord !== ''">
+                      替换
+                    </template>
+                    <template v-else>
+                      上传
+                    </template>
+                  </el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="18">
+              <el-form-item label="备注">
+                <el-input v-model="softwareInfo.remark" :disabled="type === 'detail'" type="textarea" :rows="5" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </template>
+
+      <template v-if="current === 'software-changeLog' && type === 'detail'">
+        <table-container title="评审报告">
+          <!-- 表格区域 -->
+          <el-table :data="reviewList" :columns="reviewColumn" border stripe>
+            <el-table-column align="center" label="序号" width="55" type="index" />
+            <el-table-column v-for="col in reviewColumn" :key="col.value" :label="col.text" :align="col.align" :width="col.width">
+              <template #default="scope">
+                {{ scope.row[col.value] }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </table-container>
+
+        <table-container title="修订申请">
+          <!-- 表格区域 -->
+          <el-table :data="revisionList" :columns="revisionColumn" border stripe>
+            <el-table-column align="center" label="序号" width="55" type="index" />
+            <el-table-column v-for="col in revisionColumn" :key="col.value" :label="col.text" :align="col.align" :width="col.width">
+              <template #default="scope">
+                {{ scope.row[col.value] }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </table-container>
+
+        <table-container title="历史变更记录">
+          <el-table :data="changeList" :columns="changeColumn" border stripe>
+            <el-table-column align="center" label="序号" width="55" type="index" />
+            <el-table-column v-for="col in changeColumn" :key="col.value" :label="col.text" :align="col.align" :width="col.width">
+              <template #default="scope">
+                {{ scope.row[col.value] }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </table-container>
+      </template>
     </detail-page>
-
-    <template v-if="current === 'software-changeLog' && type === 'detail'">
-      <approval-record-table :process-id="softwareInfo.id" />
-    </template>
   </app-container>
 </template>

diff --git a/src/api/resource/software.ts b/src/api/resource/software.ts
index 983a965..7f4d371 100644
--- a/src/api/resource/software.ts
+++ b/src/api/resource/software.ts
@@ -29,99 +29,9 @@
 }
 
 // 印章管理编辑
-export function updateSealInfo(data: object) {
+export function updateSoftwareInfo(data: object) {
   return request({
-    url: `${prefix}/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查询印章使用日志列表
-export function getSealLogList(data: any) {
-  return request({
-    url: `${prefix}/note/log/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查询印章使用登记审批列表
-export function getSealNoteList(data: any) {
-  return request({
-    url: `${prefix}/note/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 印章使用登记（保存）
-export function saveSealNote(data: object) {
-  return request({
-    url: `${prefix}/note/save`,
-    method: 'post',
-    data,
-  })
-}
-
-// 印章使用登记（草稿箱编辑）
-export function draftUpdateSealNote(data: object) {
-  return request({
-    url: `${prefix}/note/draftUpdate`,
-    method: 'post',
-    data,
-  })
-}
-
-// 提交流程
-export function submitSealNote(data: object) {
-  return request({
-    url: `${prefix}/note/submit`,
-    method: 'post',
-    data,
-  })
-}
-
-// 发起者撤回，表单状态更改为已取消
-export function revokeApproval(data: object) {
-  return request({
-    url: `${prefix}/note/approval/revoke`,
-    method: 'post',
-    data,
-  })
-}
-
-// 审批-拒绝
-export function refuseApproval(data: object) {
-  return request({
-    url: `${prefix}/note/approval/refuse`,
-    method: 'post',
-    data,
-  })
-}
-
-// 未通过委托方编辑（重走流程审批）
-export function failUpdateNote(data: object) {
-  return request({
-    url: `${prefix}/note/failUpdate`,
-    method: 'post',
-    data,
-  })
-}
-
-// 删除 草稿箱
-export function deleteSealNoteDraft(data: object) {
-  return request({
-    url: `${prefix}/note/draftDelete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 删除 已取消
-export function deleteSealNoteRevoked(data: object) {
-  return request({
-    url: `${prefix}/note/approval/delete`,
+    url: `${prefix}Info/update`,
     method: 'post',
     data,
   })
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 86c93a1..60cdea7 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -1,10 +1,13 @@
 <!-- 在用软件详情 -->
 <script name="SoftwareInfoDetail" lang="ts" setup>
-import type { UploadProps } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { ISoftwareInfo } from './software-info'
+import type { IReviewReport } from '../review/software-review'
+import type { IRevisionApply } from '../revision/software-revision'
+import type { IChangeLog, ISoftwareInfo } from './software-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { UploadFile } from '@/api/file'
-import { detailSoftware, getSoftwareChangeLog } from '@/api/resource/software'
+import { detailSoftware, getSoftwareChangeLog, updateSoftwareInfo } from '@/api/resource/software'
+import { getPhotoUrl } from '@/api/system/tool'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -37,15 +40,49 @@
   createUserName: '',
 })
 
-const sealInfoRules = ref({
-  sealNo: [{ required: true, message: '印章编号不能为空', trigger: 'blur' }],
-  sealName: [{ required: true, message: '印章名称不能为空', trigger: 'blur' }],
-  sealType: [{ required: true, message: '印章类型不能为空，请选择', trigger: ['blur', 'change'] }],
-  approverId: [{ required: true, message: '批准人不能为空', trigger: ['blur', 'change'] }],
-  applyTime: [{ required: true, message: '申请时间不能为空，请选择', trigger: 'blur' }],
-  ratifyTime: [{ required: true, message: '批准时间不能为空，请选择', trigger: 'blur' }],
-  status: [{ required: true, message: '在用状态不能为空，请选择', trigger: ['blur', 'change'] }],
-  minioFileName: [{ required: true, message: '图形不能为空，请选择一个文件上传', trigger: 'blur' }],
+const reviewList = ref<Array<IReviewReport>>([])
+const revisionList = ref<Array<IRevisionApply>>([])
+const changeList = ref<Array<IChangeLog>>([])
+
+const reviewColumn = ref<TableColumn[]>([
+  { text: '文件编号', value: 'reportNo', align: 'center', width: '180' },
+  { text: '软件名称', value: 'softwareName', align: 'center' },
+  { text: '版本号', value: 'softwareVersion', align: 'center', width: '120' },
+  { text: '软件评审类型', value: 'reviewTypeStr', align: 'center', width: '160' },
+  { text: '申请部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '申请人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '申请时间', value: 'createTime', align: 'center', width: '180' },
+])
+const revisionColumn = ref<TableColumn[]>([
+  { text: '文件编号', value: 'applyNo', align: 'center', width: '180' },
+  { text: '软件名称', value: 'softwareName', align: 'center' },
+  { text: '修订前版本号', value: 'softwareVersion', align: 'center', width: '280' },
+  { text: '申请部门', value: 'createDept', align: 'center', width: '160' },
+  { text: '申请人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '申请时间', value: 'createTime', align: 'center', width: '180' },
+])
+const changeColumn = ref<TableColumn[]>([
+  { text: '变更类型', value: 'changeType', align: 'center', width: '160' },
+  { text: '创建人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '180' },
+  { text: '软件名称', value: 'softwareName', align: 'center' },
+  { text: '版本号', value: 'softwareVersion', align: 'center', width: '120' },
+  { text: '软件文档', value: 'softwareDocument', align: 'center', width: '180' },
+  { text: '功能文档', value: 'functionDocument', align: 'center', width: '180' },
+  { text: '源代码', value: 'sourceCode', align: 'center', width: '180' },
+  { text: '数据验证记录', value: 'dataValidationRecord', align: 'center', width: '180' },
+])
+
+const documentFileUrl = ref<string>('')
+const functionFileUrl = ref<string>('')
+const sourceFileUrl = ref<string>('')
+const validateFileUrl = ref<string>('')
+
+const softwareInfoRules = ref({
+  softwareDocument: [{ required: true, message: '软件文档不能为空，请选择一个文件上传', trigger: ['blur', 'change'] }],
+  functionDocument: [{ required: true, message: '功能文档不能为空，请选择一个文件上传', trigger: ['blur', 'change'] }],
+  sourceCode: [{ required: true, message: '源代码不能为空，请选择一个文件上传', trigger: ['blur', 'change'] }],
+  dataValidationRecord: [{ required: true, message: '数据验证记录不能为空，请选择一个文件上传', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 逻辑
@@ -67,31 +104,12 @@
   router.go(-1)
 }
 
-// 添加
-const saveSealInfoForm = () => {
-  // 将创建时间改为提交的时间
-  softwareInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-  addSealInfo(softwareInfo.value).then((res) => {
-    if (res.code === 200) {
-      // 提示保存成功
-      ElMessage.success('保存成功')
-      type.value = 'detail'
-      title.value = '印章管理登记（详情）'
-    }
-    else {
-      // 提示失败信息
-      ElMessage.error(`保存失败：${res.message}`)
-    }
-  })
-}
 // 编辑
-const updateSealInfoById = () => {
-  updateSealInfo(softwareInfo.value).then((res) => {
+const updateById = () => {
+  updateSoftwareInfo(softwareInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-      type.value = 'detail'
-      title.value = '印章管理登记（详情）'
     }
     else {
       // 提示失败信息
@@ -113,7 +131,9 @@
 const getChangeLogs = (softwareId: string) => {
   getSoftwareChangeLog({ id: softwareId }).then((res) => {
     if (res.code === 200) {
-      softwareInfo.value = res.data
+      reviewList.value = res.data.reviewReportList
+      revisionList.value = res.data.revisionApplyList
+      changeList.value = res.data.changeLogList
     }
   })
 }
@@ -133,19 +153,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (type.value === 'create') {
-          saveSealInfoForm()
-        }
-        else if (type.value === 'update') {
-          updateSealInfoById()
-        }
+        updateById()
       })
     }
   })
 }
 
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: any) => {
+const uploadSoftwareFile: any = (file: any, fileType: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   const loading = ElLoading.service({
@@ -155,10 +170,8 @@
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ElMessage.success('上传成功')
-      softwareInfo.value.minioFileName = res.data[0]
+      softwareInfo.value[fileType] = res.data[0]
       loading.close()
-
-      basicFormRef.value.validateField('minioFileName', () => {})
     }
   }).catch(() => {
     loading.close()
@@ -166,24 +179,6 @@
   })
 }
 
-// 上传之前的验证
-const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
-  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
-    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
-    return false
-  }
-  else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('图片不能大于2MB')
-    return false
-  }
-  return true
-}
-
-// 预览文件
-const previewSealImage = (url: string) => {
-  console.log(url)
-}
-
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
@@ -198,14 +193,24 @@
       title.value = '在用软件详情（编辑）'
       id.value = params.id
 
-      softwareInfo.value = JSON.parse(sessionStorage.getItem('sealInfo')!)
+      radioItems.value = [
+        { name: '基本信息', value: 'software-basic' },
+      ]
+
+      detail(id.value)
 
       break
     case 'detail':
       title.value = '在用软件详情'
       id.value = params.id
 
+      radioItems.value = [
+        { name: '基本信息', value: 'software-basic' },
+        { name: '变更记录', value: 'software-changeLog' },
+      ]
+
       detail(id.value)
+      getChangeLogs(id.value)
       break
     default:
       title.value = ''
@@ -213,6 +218,46 @@
   }
 }
 
+watch(() => softwareInfo.value.softwareDocument, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        documentFileUrl.value = res.data
+      }
+    })
+  }
+})
+
+watch(() => softwareInfo.value.functionDocument, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        functionFileUrl.value = res.data
+      }
+    })
+  }
+})
+
+watch(() => softwareInfo.value.sourceCode, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        sourceFileUrl.value = res.data
+      }
+    })
+  }
+})
+
+watch(() => softwareInfo.value.dataValidationRecord, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        validateFileUrl.value = res.data
+      }
+    })
+  }
+})
+
 onMounted(async () => {
   initDialog(route.query)
 })
@@ -234,41 +279,184 @@
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
 
-      <el-form ref="basicFormRef" :model="softwareInfo" :rules="sealInfoRules" label-position="right" label-width="110px" border stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="软件评审报告">
-              <el-input v-model="softwareInfo.reportNo" :disabled="true" />
-            </el-form-item>
-          </el-col>
+      <template v-if="current === 'software-basic'">
+        <el-form ref="basicFormRef" :model="softwareInfo" :rules="softwareInfoRules" label-position="right" label-width="110px" border stripe>
+          <el-row :gutter="24">
+            <!-- 第一行 第一列 -->
+            <el-col :span="6">
+              <el-form-item label="软件评审报告">
+                <el-input v-model="softwareInfo.reportNo" :disabled="true" />
+              </el-form-item>
+            </el-col>
 
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="软件名称">
-              <el-input v-model="softwareInfo.softwareName" :disabled="true" />
-            </el-form-item>
-          </el-col>
+            <!-- 第一行 第二列 -->
+            <el-col :span="6">
+              <el-form-item label="软件名称">
+                <el-input v-model="softwareInfo.softwareName" :disabled="true" />
+              </el-form-item>
+            </el-col>
 
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="版本号">
-              <el-input v-model="softwareInfo.softwareVersion" :disabled="true" />
-            </el-form-item>
-          </el-col>
+            <!-- 第一行 第三列 -->
+            <el-col :span="6">
+              <el-form-item label="版本号">
+                <el-input v-model="softwareInfo.softwareVersion" :disabled="true" />
+              </el-form-item>
+            </el-col>
 
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input v-model="softwareInfo.createUserName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+            <!-- 第一行 第四列 -->
+            <el-col :span="6">
+              <el-form-item label="创建人">
+                <el-input v-model="softwareInfo.createUserName" :disabled="true" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="软件文档" prop="softwareDocument">
+                <el-input v-model="softwareInfo.softwareDocument" type="hidden" />
+                <el-link :href="documentFileUrl" :underline="false" target="_blank">
+                  {{ softwareInfo.softwareDocument }}
+                </el-link>
+
+                <el-upload
+                  :show-file-list="false"
+                  :http-request="(params) => uploadSoftwareFile(params, 'softwareDocument')"
+                  style="width: 50%; margin-left: 20px;"
+                >
+                  <el-button v-if="type !== 'detail'" type="primary">
+                    <template v-if="softwareInfo.softwareDocument !== ''">
+                      替换
+                    </template>
+                    <template v-else>
+                      上传
+                    </template>
+                  </el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="功能文档" prop="functionDocument">
+                <el-input v-model="softwareInfo.functionDocument" type="hidden" />
+                <el-link :href="functionFileUrl" :underline="false" target="_blank">
+                  {{ softwareInfo.functionDocument }}
+                </el-link>
+
+                <el-upload
+                  :show-file-list="false"
+                  :http-request="(params) => uploadSoftwareFile(params, 'functionDocument')"
+                  style="width: 50%; margin-left: 20px;"
+                >
+                  <el-button v-if="type !== 'detail'" type="primary">
+                    <template v-if="softwareInfo.functionDocument !== ''">
+                      替换
+                    </template>
+                    <template v-else>
+                      上传
+                    </template>
+                  </el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="源代码" prop="sourceCode">
+                <el-input v-model="softwareInfo.sourceCode" type="hidden" />
+                <el-link :href="sourceFileUrl" :underline="false" target="_blank">
+                  {{ softwareInfo.sourceCode }}
+                </el-link>
+
+                <el-upload
+                  :show-file-list="false"
+                  :http-request="(params) => uploadSoftwareFile(params, 'sourceCode')"
+                  style="width: 50%; margin-left: 20px;"
+                >
+                  <el-button v-if="type !== 'detail'" type="primary">
+                    <template v-if="softwareInfo.sourceCode !== ''">
+                      替换
+                    </template>
+                    <template v-else>
+                      上传
+                    </template>
+                  </el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="数据验证记录" prop="dataValidationRecord">
+                <el-input v-model="softwareInfo.dataValidationRecord" type="hidden" />
+                <el-link :href="validateFileUrl" :underline="false" target="_blank">
+                  {{ softwareInfo.dataValidationRecord }}
+                </el-link>
+
+                <el-upload
+                  :show-file-list="false"
+                  :http-request="(params) => uploadSoftwareFile(params, 'dataValidationRecord')"
+                  style="width: 50%; margin-left: 20px;"
+                >
+                  <el-button v-if="type !== 'detail'" type="primary">
+                    <template v-if="softwareInfo.dataValidationRecord !== ''">
+                      替换
+                    </template>
+                    <template v-else>
+                      上传
+                    </template>
+                  </el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="18">
+              <el-form-item label="备注">
+                <el-input v-model="softwareInfo.remark" :disabled="type === 'detail'" type="textarea" :rows="5" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </template>
+
+      <template v-if="current === 'software-changeLog' && type === 'detail'">
+        <table-container title="评审报告">
+          <!-- 表格区域 -->
+          <el-table :data="reviewList" :columns="reviewColumn" border stripe>
+            <el-table-column align="center" label="序号" width="55" type="index" />
+            <el-table-column v-for="col in reviewColumn" :key="col.value" :label="col.text" :align="col.align" :width="col.width">
+              <template #default="scope">
+                {{ scope.row[col.value] }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </table-container>
+
+        <table-container title="修订申请">
+          <!-- 表格区域 -->
+          <el-table :data="revisionList" :columns="revisionColumn" border stripe>
+            <el-table-column align="center" label="序号" width="55" type="index" />
+            <el-table-column v-for="col in revisionColumn" :key="col.value" :label="col.text" :align="col.align" :width="col.width">
+              <template #default="scope">
+                {{ scope.row[col.value] }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </table-container>
+
+        <table-container title="历史变更记录">
+          <el-table :data="changeList" :columns="changeColumn" border stripe>
+            <el-table-column align="center" label="序号" width="55" type="index" />
+            <el-table-column v-for="col in changeColumn" :key="col.value" :label="col.text" :align="col.align" :width="col.width">
+              <template #default="scope">
+                {{ scope.row[col.value] }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </table-container>
+      </template>
     </detail-page>
-
-    <template v-if="current === 'software-changeLog' && type === 'detail'">
-      <approval-record-table :process-id="softwareInfo.id" />
-    </template>
   </app-container>
 </template>
diff --git a/src/views/resource/software/info/software-info.ts b/src/views/resource/software/info/software-info.ts
index 1ace95b..5f12610 100644
--- a/src/views/resource/software/info/software-info.ts
+++ b/src/views/resource/software/info/software-info.ts
@@ -17,14 +17,15 @@
   softwareVersion: string
   softwareDocument: string
   functionDocument: string
-  sourceCode?: string
-  dataValidationRecord?: string
+  sourceCode: string
+  dataValidationRecord: string
   reportId?: string
   reportNo: string
   remark?: string
   createTime?: string
   createUserId?: string
   createUserName?: string
+  [key: string]: string | undefined
 }
 
 export interface IChangeLog {