Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/museums/specimeninfo/index.vue

src/api/museums/museumsdocument/index.ts

@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 
+
 // 博物馆文件管理 VO
 export interface DocumentVO {
   id: number // 主键
@@ -13,21 +14,21 @@ export interface DocumentVO {
   uploadedBy: string // 上传者
 }
 
-// 博物馆文件管理 API
+//博物馆文件管理 API
 export const DocumentApi = {
   // 查询博物馆文件管理分页
   getDocumentPage: async (params: any) => {
-    return await request.get({ url: `/museums/document/page`, params })
+    return await request.get({ url: `/infra/file/page/another`, params })
   },
 
   // 查询博物馆文件管理详情
   getDocument: async (id: number) => {
     return await request.get({ url: `/museums/document/get?id=` + id })
   },
-
-  // 新增博物馆文件管理
-  createDocument: async (data: DocumentVO) => {
-    return await request.post({ url: `/museums/document/create`, data })
+  //
+  // // 新增博物馆文件管理
+  createDocument: async (data: any) => {
+    return await request.post({ url: `/infra/file/create`, data })
   },
 
   // 修改博物馆文件管理
@@ -37,11 +38,28 @@ export const DocumentApi = {
 
   // 删除博物馆文件管理
   deleteDocument: async (id: number) => {
-    return await request.delete({ url: `/museums/document/delete?id=` + id })
+    return await request.delete({ url: `/infra/file/delete?id=` + id })
   },
 
   // 导出博物馆文件管理 Excel
   exportDocument: async (params) => {
     return await request.download({ url: `/museums/document/export-excel`, params })
-  }
-}
+  },
+  // 上传博物馆文件
+  updateFile: async (data: any) => {
+    return await request.download({ url: `/infra/file/upload`, data  })
+  },
+}
+// 新增博物馆文件管理
+// export const createDocument = (data: any) => {
+//   return request.post({ url: '/infra/file/create', data })
+// }
+
+
+// 获取文件预签名地址
+export const Document = (path: string) => {
+  return request.get<DocumentVO>({
+    url: '/infra/file/presigned-url',
+    params: { path }
+  })
+}

src/components/UploadFile/src/useUpload.ts

@@ -71,6 +71,8 @@ function createFile(vo: FileApi.FilePresignedUrlRespVO, name: string, file: Uplo
   return fileVo
 }
 
+
+
 /**
  * 生成文件名称（使用算法SHA256）
  * @param file 要上传的文件

src/utils/dict.ts

@@ -233,6 +233,6 @@ export enum DICT_TYPE {
   MUSEUMS_COLLECTION_STATUS='museums_collection_status',//标本馆藏状态
   MUSEUMS_SOURCE='museums_source',//博物馆标本来源
   MUSEUMS_SPECIMEN_TYPE='museums_specimen_type',//博物馆标本类型
-  MUSEUMS_APPROAL_STATUS='museums_approal_status',//
+  MUSEUMS_APPROAL_STATUS='museums_approal_status',//博物馆标本审批状态
 
 }

src/views/museums/museumsdocument/DocumentForm.vue

@@ -6,6 +6,10 @@
       :rules="formRules"
       label-width="100px"
       v-loading="formLoading"
+      :on-change="handleFileChange"
+      :on-success="submitFormSuccess"
+      :action="uploadUrl"
+      :http-request="httpRequest"
     >
       <el-form-item label="文件名称" prop="fileName">
         <el-input v-model="formData.fileName" placeholder="请输入文件名称" />
@@ -46,18 +50,20 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { DocumentApi, DocumentVO } from '@/api/museums/museumsdocument'
-
+//import { DocumentApi, DocumentVO } from '@/api/museums/museumsdocument'
+import { useUpload } from '@/components/UploadFile/src/useUpload'
 /** 博物馆文件管理 表单 */
 defineOptions({ name: 'DocumentForm' })
-
+const fileList = ref([]) // 文件列表
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const data = ref({ path: '' })
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+// const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const { uploadUrl, httpRequest } = useUpload()
+const uploadRef = ref()
 const formData = ref({
   id: undefined,
   fileName: undefined,
@@ -79,47 +85,81 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+// const open = async (type: string, id?: number) => {
+//   dialogVisible.value = true
+//   dialogTitle.value = t('action.' + type)
+//   formType.value = type
+//   resetForm()
+//   // 修改时，设置数据
+//   if (id) {
+//     formLoading.value = true
+//     try {
+//       formData.value = await DocumentApi.getDocument(id)
+//     } finally {
+//       formLoading.value = false
+//     }
+//   }
+// }
+
+
+/** 打开弹窗 */
+const open = async () => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
   resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await DocumentApi.getDocument(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
+
+/** 处理上传的文件发生变化 */
+const handleFileChange = (file) => {
+  data.value.path = file.name
+}
+
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as DocumentVO
-    if (formType.value === 'create') {
-      await DocumentApi.createDocument(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await DocumentApi.updateDocument(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
+const submitForm = () => {
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
   }
+  unref(uploadRef)?.submit()
 }
 
+/** 文件上传成功处理 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitFormSuccess = () => {
+  // 清理
+  dialogVisible.value = false
+  formLoading.value = false
+  unref(uploadRef)?.clearFiles()
+  // 提示成功，并刷新
+  message.success(t('common.createSuccess'))
+  emit('success')
+}
+
+// /** 提交表单 */
+// const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+// const submitForm = async () => {
+//   // 校验表单
+//   await formRef.value.validate()
+//   // 提交请求
+//   formLoading.value = true
+//   try {
+//     const data = formData.value as unknown as DocumentVO
+//     if (formType.value === 'create') {
+//       await DocumentApi.createDocument(data)
+//       message.success(t('common.createSuccess'))
+//     } else {
+//       await DocumentApi.updateDocument(data)
+//       message.success(t('common.updateSuccess'))
+//     }
+//     dialogVisible.value = false
+//     // 发送操作成功的事件
+//     emit('success')
+//   } finally {
+//     formLoading.value = false
+//   }
+// }
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
@@ -135,4 +175,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>

src/views/museums/museumsdocument/index.vue

@@ -26,24 +26,24 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="路径" prop="path">
-        <el-input
-          v-model="queryParams.path"
-          placeholder="请输入路径"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="文件大小（字节）" prop="fileSize">
-        <el-input
-          v-model="queryParams.fileSize"
-          placeholder="请输入文件大小（字节）"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+<!--      <el-form-item label="路径" prop="path">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.path"-->
+<!--          placeholder="请输入路径"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="文件大小（字节）" prop="fileSize">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.fileSize"-->
+<!--          placeholder="请输入文件大小（字节）"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="文件类型" prop="fileType">
         <el-select
           v-model="queryParams.fileType"
@@ -74,7 +74,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="创建时间"prop="createTime">
+      <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
           value-format="YYYY-MM-DD HH:mm:ss"
@@ -112,21 +112,45 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="文件名称" align="center" prop="fileName" />
-      <el-table-column label="配置编号" align="center" prop="configId" />
+<!--      <el-table-column label="配置编号" align="center" prop="configId" />-->
       <el-table-column label="路径" align="center" prop="path" />
       <el-table-column label="文件 URL" align="center" prop="url" />
-      <el-table-column label="文件大小（字节）" align="center" prop="fileSize" />
+      <el-table-column label="文件大小" align="center" prop="fileSize" />
       <el-table-column label="文件类型" align="center" prop="fileType" />
-      <el-table-column
-        label="上传时间"
-        align="center"
-        prop="uploadDate"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="上传者" align="center" prop="uploadedBy" />
+      <el-table-column label="文件内容" align="center" prop="url" >
+        <template #default="{ row }">
+          <el-image
+            v-if="row.type.includes('image')"
+            class="h-80px w-80px"
+            lazy
+            :src="row.url"
+            :preview-src-list="[row.url]"
+            preview-teleported
+            fit="cover"
+          />
+          <el-link
+            v-else-if="row.type.includes('pdf')"
+            type="primary"
+            :href="row.url"
+            :underline="false"
+            target="_blank"
+          >预览</el-link
+          >
+          <el-link v-else type="primary" download :href="row.url" :underline="false" target="_blank"
+          >下载</el-link
+          >
+        </template>
+      </el-table-column>
+<!--      <el-table-column-->
+<!--        label="上传时间"-->
+<!--        align="center"-->
+<!--        prop="uploadDate"-->
+<!--        :formatter="dateFormatter"-->
+<!--        width="180px"-->
+<!--      />-->
+<!--      <el-table-column label="上传者" align="center" prop="uploadedBy" />-->
       <el-table-column
         label="创建时间"
         align="center"
@@ -206,6 +230,7 @@ const getList = async () => {
     const data = await DocumentApi.getDocumentPage(queryParams)
     list.value = data.list
     total.value = data.total
+    console.log(queryParams)
   } finally {
     loading.value = false
   }

src/views/museums/photogroup/index.vue

@@ -84,7 +84,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="照片组名称" align="center" prop="groupName" />
       <el-table-column
         label="照片组时间"

src/views/museums/photos/index.vue

@@ -183,7 +183,7 @@ const loading = ref(true) // 列表的加载中
 const list = ref<any>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
-  id: 1 ,
+  id: undefined ,
   pageNo: 1,
   pageSize: 10,
   groupId: query.groupId,

src/views/museums/specimeninfo/SpecimenInfoForm.vue

@@ -7,9 +7,9 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="标本类型）" prop="specimenType">
+      <el-form-item label="标本类型" prop="specimenType">
         <el-select v-model="formData.specimenType"
-                   placeholder="请选择标本类型（矿物、岩石矿石、化石、陨石）">
+                   placeholder="请选择标本类型">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_TYPE)"
             :key="dict.value"
@@ -69,7 +69,7 @@
       </el-form-item>
       <el-form-item label="保存类型" prop="preservationType">
         <el-select v-model="formData.preservationType"
-                   placeholder="请选择保存类型（标本、光片、薄片模型及其他）">
+                   placeholder="请选择保存类型">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_INFO)"
             :key="dict.value"
@@ -85,7 +85,7 @@
         <el-input v-model="formData.weight" placeholder="请输入重量"/>
       </el-form-item>
       <el-form-item label="来源" prop="source">
-        <el-select v-model="formData.source" placeholder="请选择来源（采购、捐赠、采集）">
+        <el-select v-model="formData.source" placeholder="请选择来源">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SOURCE)"
             :key="dict.value"
@@ -95,14 +95,14 @@
         </el-select>
       </el-form-item>
       <el-form-item label="标本提供者" prop="provider">
-        <el-input v-model="formData.provider" placeholder="请输入标本提供者（供应商、捐赠人、采集人）"/>
+        <el-input v-model="formData.provider" placeholder="请输入标本提供者"/>
       </el-form-item>
       <el-form-item label="入藏时间" prop="acquisitionTime">
         <el-date-picker
           v-model="formData.acquisitionTime"
           type="date"
           value-format="x"
-          placeholder="选择入藏时间（购买、捐赠、采集时间）"
+          placeholder="选择入藏时间"
         />
       </el-form-item>
       <el-form-item label="用途" prop="purpose">

src/views/museums/specimeninfo/index.vue

@@ -388,6 +388,7 @@
 <!--      <el-table-column label="图片名称" align="center" prop="imageName" />-->
       <el-table-column label="图片" align="center" prop="url" width="110px">
         <template #default="{ row }">
+        <div class="demo-image__preview" v-if="queryParams">
           <el-image
 
             style="width: 40px; height:40px"
@@ -398,6 +399,7 @@
             preview-teleported
             fit="cover"
           />
+        </div>
         </template>
       </el-table-column>
 <!--      <el-table-column label="创建时间" align="center" prop="createTime" />-->
@@ -456,7 +458,7 @@
 
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter, formatDate} from '@/utils/formatTime'
 import download from '@/utils/download'
 import { SpecimenInfoApi, SpecimenInfoVO } from '@/api/museums/specimeninfo'
 import SpecimenInfoForm from './SpecimenInfoForm.vue'

src/views/museums/specimeninfo/specimenDetails.vue

@@ -1,7 +1,5 @@
 <template>
-
-
-
+  <el-skeleton :loading="loading" animated>
   <el-row :gutter="8" justify="space-between">
     <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24">
       <div>
@@ -104,7 +102,7 @@
                     specimenData.provider
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="发现时间">{{
+                <el-descriptions-item label="发现时间">  {{
                     specimenData.discoveryTime
                   }}
                 </el-descriptions-item>
@@ -121,7 +119,6 @@
                 </div>
               </template>
               <el-descriptions
-
                 v-if="specimenData"
                 :column="2"
                 :size="size"
@@ -162,11 +159,11 @@
           <div class="demo-image__preview" v-if="specimenData ">
             <el-image
               style=" align-items: center"
-              :src="url"
+              :src="specimenData.imagePath"
               :zoom-rate="1.2"
               :max-scale="7"
               :min-scale="0.2"
-              :preview-src-list="srcList"
+              :preview-src-list="specimenData.imagePath"
               :initial-index="4"
               fit="cover"
             />
@@ -236,7 +233,7 @@
 
     </el-col>
   </el-row>
-
+  </el-skeleton>
 
 
 
@@ -249,10 +246,11 @@ import {ref, onMounted, computed} from "vue";
 import {useRouter} from 'vue-router';
 import  {SpecimenInfoApi} from "@/api/museums/specimeninfo";
 import {ElCol, ElImage} from 'element-plus';
-
+const loading = ref(false)
 const router = useRouter() // 路由
 const {query} = useRoute() // 查询参数
 import type {ComponentSize} from 'element-plus'
+import {formatDate} from "@/utils/formatTime";
 
 
 const size = ref<ComponentSize>('large')
@@ -271,11 +269,19 @@ const fetchData = async () => {
     console.log(query.dataId)
     let res: any = await SpecimenInfoApi.getSpecimenInfo(query.dataId)
     console.log(res)
+    res.discoveryTime = formatDate(res.discoveryTime)
+    res.fallTime = formatDate(res.fallTime)
+    res.acquisitionTime = formatDate(res.acquisitionTime)
+
+
     specimenData.value = res
-    console.log('tj',specimenData.value)
-    srcList.value = specimenData.value.imagePath.split(',')
-    url.value = srcList.value[0]
-    console.log('tj',srcList.value)
+    console.log(specimenData.value)
+    // 假设res中的图片路径是以逗号分隔的字符串
+    // if (res && res.imagePath) {
+    //   srcList.value = res.imagePath.split(',');
+    //   url.value = srcList.value[0]; // 如果需要，可以设置默认图片URL
+    //   console.log(srcList.value);
+    // }
   }  finally {
   }
 }
@@ -284,7 +290,7 @@ const fetchData = async () => {
 onMounted(async () => {
   console.log(1)
   await fetchData()
-  await fetchRecord()
+
 
 })
 

src/views/museums/specimenoutbound/ApproalProcess.vue

@@ -52,7 +52,8 @@
           clearable
           class="!w-240px"
         >
-          <el-option label="请选择字典生成"  v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_INFO)"
+          <el-option
+                     v-for="dict in getIntDictOptions(DICT_TYPE. MUSEUMS_APPROAL_STATUS)"
                      :key="dict.value"
                      :label="dict.label"
                      :value="dict.value" />
@@ -98,7 +99,11 @@
         width="180px"
       />
       <el-table-column label="用途" align="center" prop="applicationUsage" />
-      <el-table-column label="审批状态" align="center" prop="status" />
+<!--      <el-table-column label="审批状态" align="center" prop="status" >-->
+<!--        <template #default="scope">-->
+<!--          <dict-tag :type="DICT_TYPE.MUSEUMS_APPROAL_STATUS" :value="scope.row.status" />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
         label="出库时间"
         align="center"
@@ -113,8 +118,12 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="标本情况" align="center" prop="specimenCondition" />
-      <el-table-column label="标本状态" align="center" prop="sampleStatus" />
+<!--      <el-table-column label="标本情况" align="center" prop="specimenCondition" />-->
+      <el-table-column label="审批状态" align="center" prop="sampleStatus" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MUSEUMS_APPROAL_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" min-width="150px">
         <template #default="scope" >
           <el-button
@@ -144,6 +153,7 @@ import download from '@/utils/download'
 import { SpecimenOutboundApi, SpecimenOutboundVO } from '@/api/museums/specimenoutbound'
 import {dateFormatter} from "@/utils/formatTime";
 import {ref} from "vue";
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 
 defineOptions({ name: 'ApproalProcess' })
 const message = useMessage() // 消息弹窗

src/views/museums/specimenoutbound/OutboundApplication.vue

@@ -52,7 +52,11 @@
         clearable
         class="!w-240px"
       >
-        <el-option label="请选择字典生成" value="" />
+        <el-option
+        v-for="dict in getIntDictOptions(DICT_TYPE. MUSEUMS_APPROAL_STATUS)"
+        :key="dict.value"
+        :label="dict.label"
+        :value="dict.value" />
       </el-select>
     </el-form-item>
     <el-form-item label="标本状态" prop="sampleStatus">
@@ -105,7 +109,7 @@
         width="180px"
       />
       <el-table-column label="用途" align="center" prop="applicationUsage" />
-      <el-table-column label="审批状态" align="center" prop="status" />
+<!--      <el-table-column label="审批状态" align="center" prop="status" />-->
       <el-table-column
         label="出库时间"
         align="center"
@@ -121,10 +125,14 @@
         width="180px"
       />
       <el-table-column label="标本情况" align="center" prop="specimenCondition" />
-      <el-table-column label="标本状态" align="center" prop="sampleStatus" />
+      <el-table-column label="标本状态" align="center" prop="sampleStatus"/>
+        <el-table-column label="审批状态" align="center" prop="sampleStatus" >
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.MUSEUMS_APPROAL_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
       <el-table-column label="操作" align="center" min-width="150px">
         <template #default="scope" >
-
           <el-button
             link
             type="primary"
@@ -169,6 +177,7 @@ import Approval from "@/views/museums/specimenoutbound/approval.vue";
 import SpecimenOutboundForm from "@/views/museums/specimenoutbound/SpecimenOutboundForm.vue";
 import {ref} from "vue";
 defineOptions({ name: 'OutboundApplication' })
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 

src/views/museums/specimenoutbound/OutboundForm/outboundDetail.vue

@@ -20,73 +20,109 @@
 
 
             >
-              <el-descriptions-item label="序号:"    label-align="right" >{{ outboundData.id }}</el-descriptions-item>
+              <el-descriptions-item label="标本ID:"    label-align="right" >{{ outboundData.infoId }}</el-descriptions-item>
               <el-descriptions-item label="标本编号"    label-align="right">{{
                   outboundData.number
                 }}
               </el-descriptions-item>
-              <el-descriptions-item label="申请人或申请单位:" >{{
+              <el-descriptions-item label="申请人或申请单位:" label-align="right" >{{
                   outboundData.applicantName
                 }}
               </el-descriptions-item>
-              <el-descriptions-item label="申请日期:" >{{
+              <el-descriptions-item label="申请日期:" label-align="right" >{{
                   outboundData.applicationDate
                 }}
               </el-descriptions-item>
-              <el-descriptions-item label="申请出库的用途:" >{{
+              <el-descriptions-item label="申请出库的用途:" label-align="right" >{{
                   outboundData.applicationUsage
                 }}
               </el-descriptions-item>
-              <el-descriptions-item label="审批状态:" >{{
+              <el-descriptions-item label="审批状态:" label-align="right" >{{
                   outboundData.status
                 }}
               </el-descriptions-item>
-              <el-descriptions-item label="审批员:">{{
+              <el-descriptions-item label="审批员:" label-align="right" >{{
                   outboundData.approveUsers
                 }}
               </el-descriptions-item>
-              <el-descriptions-item label="审批时间:">{{
+              <el-descriptions-item label="审批时间:" label-align="right" >{{
                   outboundData.approvalTime
                 }}
               </el-descriptions-item>
-              <el-descriptions-item label="备注信息:" >{{outboundData.remarks}}
+              <el-descriptions-item label="备注信息:" label-align="right" >{{outboundData.remarks}}
               </el-descriptions-item>
-            </el-descriptions>
-          </el-card>
-          <el-card >
-              <template #header>
-                <div class="card-header" style="text-align: center">
-                  <h1 class="text1">标本出库入库详情</h1>
-                </div>
-              </template>
-            <el-descriptions
-              v-if="outboundData"
-              :column="3"
-              :size="small"
-              border
-            >
               <div >
-              <el-descriptions-item label="出库时间:">{{ outboundData.outgoingTime }}</el-descriptions-item>
-              <el-descriptions-item label="出库员:">{{  outboundData.operator}}
-              </el-descriptions-item>
-
-              <el-descriptions-item label="退还日期">{{
-                  outboundData.returnDate
-                }}
-              </el-descriptions-item>
-              <el-descriptions-item label="点收人:">{{
-                  outboundData.receiver
-                }}
-              </el-descriptions-item>
-
-
-              <el-descriptions-item label="退还人">{{
-                  outboundData.returner
-                }}
-              </el-descriptions-item>
+                <el-descriptions-item label="出库时间:" label-align="right" >{{ outboundData.outgoingTime }}</el-descriptions-item>
+                <el-descriptions-item label="出库员:" label-align="right">{{  outboundData.operator}}
+                </el-descriptions-item>
+
+                <el-descriptions-item label="退还日期" label-align="right" >{{
+                    outboundData.returnDate
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="点收人:" label-align="right" >{{
+                    outboundData.receiver
+                  }}
+                </el-descriptions-item>
+
+
+                <el-descriptions-item label="退还人" label-align="right">{{
+                    outboundData.returner
+                  }}
+                </el-descriptions-item>
               </div>
             </el-descriptions>
-            </el-card>
+          </el-card>
+<!--          <el-card >-->
+<!--              <template #header>-->
+<!--                <div class="card-header" style="text-align: center">-->
+<!--                  <h1 class="text1">标本出库入库详情</h1>-->
+<!--                </div>-->
+<!--              </template>-->
+<!--            <el-descriptions-->
+<!--              v-if="outboundData"-->
+<!--              :column="3"-->
+<!--              :size="small"-->
+<!--              border-->
+<!--            >-->
+<!--              <div >-->
+<!--              <el-descriptions-item label="出库时间:" label-align="right" >{{ outboundData.outgoingTime }}</el-descriptions-item>-->
+<!--              <el-descriptions-item label="出库员:">{{  outboundData.operator}}-->
+<!--              </el-descriptions-item>-->
+
+<!--              <el-descriptions-item label="退还日期" label-align="right" >{{-->
+<!--                  outboundData.returnDate-->
+<!--                }}-->
+<!--              </el-descriptions-item>-->
+<!--              <el-descriptions-item label="点收人:" label-align="right" >{{-->
+<!--                  outboundData.receiver-->
+<!--                }}-->
+<!--              </el-descriptions-item>-->
+
+
+<!--              <el-descriptions-item label="退还人" label-align="right">{{-->
+<!--                  outboundData.returner-->
+<!--                }}-->
+<!--              </el-descriptions-item>-->
+<!--              </div>-->
+<!--            </el-descriptions>-->
+<!--            </el-card>-->
+
+            <ContentWrap>
+              <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+                <el-table-column label="标本ID" align="center" prop="infoId" />
+                <el-table-column label="中文名称" align="center" prop="chineseName" />
+                <el-table-column label="标本编号" align="center" prop="specimenNumber" />
+                <el-table-column label="标本图片" align="center" prop="imagePath" />
+              </el-table>
+              <!-- 分页 -->
+              <Pagination
+                :total="total"
+                v-model:page="queryParams.pageNo"
+                v-model:limit="queryParams.pageSize"
+                @pagination="getList"
+              />
+            </ContentWrap>
 
         </el-col>
       </div>
@@ -98,13 +134,39 @@
 import {ElCol} from "element-plus";
 import {ref} from "vue";
 
-import {SpecimenOutboundApi} from "@/api/museums/specimenoutbound";
+import {SpecimenOutboundApi, SpecimenOutboundVO} from "@/api/museums/specimenoutbound";
+import {dateFormatter, formatDate} from "@/utils/formatTime";
+defineOptions({ name: 'outboundDetail' })
 const {query} = useRoute() // 查询参数
+const loading = ref(true) // 列表的加载中
+const list = ref<SpecimenOutboundVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
 
+let outboundData = ref(null); // 初始化响应式数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  infoId: undefined,
+  chineseName: undefined,
+  specimenNumber: undefined,
+  attachments: undefined,
+  processInstanceId: undefined,
+  specimenCondition: undefined,
+  imagePath:undefined
+})
 
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SpecimenOutboundApi.getSpecimenOutbound(queryParams)
+    list.value = data.list
+    total.value = data.total
 
-
-let outboundData = ref(null); // 初始化响应式数据
+  } finally {
+    loading.value = false
+  }
+}
 const fetchData = async () => {
   try {
     console.log(query.dataId)
@@ -112,6 +174,11 @@ const fetchData = async () => {
     console.log(res)
     outboundData.value = res
     console.log(outboundData.value)
+    res.applicationDate = formatDate(res.applicationDate)
+    res.approvalTime = formatDate(res.approvalTime)
+    res.outgoingTime = formatDate(res.outgoingTime)
+    res.returnDate = formatDate(res.returnDate)
+
   }  finally {
   }
 }
@@ -119,6 +186,7 @@ const fetchData = async () => {
 // // 在组件加载时获取数据
 onMounted(async () => {
   await fetchData()
+  await getList()
 })
 
 </script>

src/views/museums/specimenoutbound/OutboundForm/ReturnForm.vue → src/views/museums/specimenoutbound/OutboundForm/specimenReturnForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" ref="formRef" >
     <el-form
       ref="formRef"
       :model="formData"
@@ -24,18 +24,22 @@
         <el-input v-model="formData.specimenCondition" placeholder="请输入标本情况"/>
       </el-form-item>
     </el-form>
-
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
   </Dialog>
 </template>
 
 <script setup lang="ts">
-import { SpecimenOutboundApi } from '@/api/museums/specimenoutbound'
+import {SpecimenOutboundApi, SpecimenOutboundVO} from '@/api/museums/specimenoutbound'
 import {ref,reactive} from "vue"
 /** 标本出库回库信息 表单 */
 defineOptions({ name: 'ReturnForm' })
-
+const {t} = useI18n() // 国际化
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
+const message = useMessage() // 消息弹窗
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
@@ -70,6 +74,7 @@ const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
+  dialogTitle.value = t('回库表单')
   formType.value = type
   resetForm()
   if (id) {
@@ -107,4 +112,29 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+
+/** 提交回库表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as SpecimenOutboundVO
+    if (formType.value === 'create') {
+      await SpecimenOutboundApi.updateSpecimenOutbound(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SpecimenOutboundApi.updateSpecimenOutbound(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+
 </script>

src/views/museums/specimenoutbound/OutboundManagement.vue

@@ -52,7 +52,11 @@
           clearable
           class="!w-240px"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE. MUSEUMS_APPROAL_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="标本状态" prop="sampleStatus">
@@ -98,7 +102,11 @@
         width="180px"
       />
       <el-table-column label="用途" align="center" prop="applicationUsage" />
-      <el-table-column label="审批状态" align="center" prop="status" />
+      <el-table-column label="审批状态" align="center" prop="status"  >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MUSEUMS_APPROAL_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column
         label="出库时间"
         align="center"
@@ -134,7 +142,7 @@
           <el-button
             link
             type="success"
-            @click="handleReturn(scope.row.id)"
+            @click=" openForm(scope.row.id)"
           >
             回库
           </el-button>
@@ -151,13 +159,15 @@
   </ContentWrap>
 
   <!-- 表单弹窗：回库 -->
-  <ReturnForm ref="returnFormRef" @success="getList" />
+  <specimenReturnForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
+import download from '@/utils/download'
+import { dateFormatter } from '@/utils/formatTime'
 import {defineComponent, ref} from "vue";
 import { SpecimenOutboundApi, SpecimenOutboundVO } from '@/api/museums/specimenoutbound'
-
+import specimenReturnForm from '@/views/museums/specimenoutbound/OutboundForm/specimenReturnForm.vue'
  defineComponent({name:'OutboundManagement'})
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -208,6 +218,13 @@ const handleQuery = () => {
   getList()
 }
 
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {
@@ -227,6 +244,7 @@ const handleExport = async () => {
 
 /** 查看详情页面 **/
 import { useRouter } from 'vue-router';
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 const router = useRouter();
 const detail=(dataId: number) => {
   router.push({
@@ -251,9 +269,9 @@ const handleOutbound = async (id: number) => {
 }
 
 /** 回库 */
-const returnFormRef = ref()
-const handleReturn= (type: string, id?: number) => {
-  returnFormRef.value.open(type, id)
+const formRef = ref
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
 }
 
 

src/views/museums/specimenoutbound/SpecimenOutboundForm.vue

@@ -4,7 +4,7 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="140px"
       v-loading="formLoading"
     >
       <el-form-item label="标本ID" prop="infoId">
@@ -16,7 +16,7 @@
       <el-form-item label="标本编号" prop="specimenNumber">
         <el-input v-model="formData.specimenNumber" placeholder="请输入标本编号" />
       </el-form-item>
-      <el-form-item label="申请人或申请单位" prop="applicantName">
+      <el-form-item label="申请人或申请单位"  prop="applicantName">
         <el-input v-model="formData.applicantName" placeholder="请输入申请人或申请单位" />
       </el-form-item>
       <el-form-item label="申请日期" prop="applicationDate">
@@ -31,7 +31,10 @@
         <el-input v-model="formData.applicationUsage" placeholder="请输入申请出库的用途" />
       </el-form-item>
       <el-form-item label="附件上传" prop="attachments">
-        <el-input v-model="formData.attachments" placeholder="请输入附件上传" />
+        <el-upload v-model="formData.attachments" placeholder="请输入附件上传" >
+          <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+          <div class="el-upload__text"> 将文件拖到此处，或 <em>点击上传</em></div>
+        </el-upload>
       </el-form-item>
 <!--      <el-form-item label="审批状态" prop="status">-->
 <!--        <el-select v-model="formData.status" placeholder="请选择审批状态">-->
@@ -44,17 +47,17 @@
 <!--      <el-form-item label="流程实例的编号" prop="processInstanceId">-->
 <!--        <el-input v-model="formData.processInstanceId" placeholder="请输入流程实例的编号" />-->
 <!--      </el-form-item>-->
-      <el-form-item label="出库员" prop="operator">
-        <el-input v-model="formData.operator" placeholder="请输入出库员" />
-      </el-form-item>
-      <el-form-item label="出库时间" prop="outgoingTime">
-        <el-date-picker
-          v-model="formData.outgoingTime"
-          type="date"
-          value-format="x"
-          placeholder="选择出库时间"
-        />
-      </el-form-item>
+<!--      <el-form-item label="出库员" prop="operator">-->
+<!--        <el-input v-model="formData.operator" placeholder="请输入出库员" />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="出库时间" prop="outgoingTime">-->
+<!--        <el-date-picker-->
+<!--          v-model="formData.outgoingTime"-->
+<!--          type="date"-->
+<!--          value-format="x"-->
+<!--          placeholder="选择出库时间"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="退还人" prop="returner">-->
 <!--        <el-input v-model="formData.returner" placeholder="请输入退还人" />-->
 <!--      </el-form-item>-->
@@ -86,7 +89,7 @@
 </template>
 <script setup lang="ts">
 import { SpecimenOutboundApi, SpecimenOutboundVO } from '@/api/museums/specimenoutbound'
-
+import { UploadFilled } from '@element-plus/icons-vue'
 /** 标本出库回库信息 表单 */
 defineOptions({ name: 'SpecimenOutboundForm' })
 

src/views/museums/specimenoutbound/approval.vue

@@ -18,8 +18,10 @@
           v-model="chkRemarks"
           style="width:800px ;height: 200px"
           placeholder="请输入驳回原因"
-
+          type="textarea"
+          autosize
         />
+
       </el-form-item>
     </el-form>