Merge remote-tracking branch 'origin/master'

src/views/museums/specimeninfo/SpecimenImportForm.vue

@@ -18,10 +18,10 @@
       <div class="el-upload__text">将xlsx表拖到此处，或<em>点击上传</em></div>
       <template #tip>
         <div class="el-upload__tip text-center">
-          <div class="el-upload__tip">
-            <el-checkbox v-model="updateSupport" />
-            是否更新已经存在的标本数据
-          </div>
+<!--          <div class="el-upload__tip">-->
+<!--            <el-checkbox v-model="updateSupport" />-->
+<!--            是否更新已经存在的标本数据-->
+<!--          </div>-->
           <span>仅允许导入 xls、xlsx 格式文件。</span>
           <el-link
             :underline="false"
@@ -57,6 +57,10 @@
 <!--          <el-checkbox v-model="updateSupport" />-->
 <!--          是否更新已经存在的标本图片-->
         <span>仅允许导入 .zip 格式文件。</span>
+          <div class="el-upload__tip">
+            <el-checkbox v-model="updateSupport" />
+            是否更新已经存在的标本数据
+          </div>
                 </div>
       </template>
     </el-upload>

src/views/museums/specimenoutbound/ApproalProcess.vue

@@ -1,159 +1,193 @@
 <template>
   <el-skeleton :loading="loading" animated>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px">
-      <el-form-item label="申请人姓名" prop="applicantName" label-width="85px">
-        <el-input
-          v-model="queryParams.applicantName"
-          placeholder="请输入申请人姓名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="申请单位" prop="applicationUsage" label-width="85px">
-        <el-input
-          v-model="queryParams.applicationUsage"
-          placeholder="请输入申请单位"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="研究项目名称" prop="projectName" label-width="100px">
-        <el-input
-          v-model="queryParams.projectName"
-          placeholder="请输入研究项目名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="申请日期" prop="applicationDate">
-        <el-date-picker
-          v-model="queryParams.applicationDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="审批状态" prop="status"  label-width="85px">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择审批状态"
-          clearable
-          class="!w-240px"
-        >
-          <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="status">-->
-<!--        <el-select-->
-<!--          v-model="queryParams.status"-->
-<!--          placeholder="请选择审批状态"-->
-<!--          clearable-->
-<!--          class="!w-240px"-->
-<!--        >-->
-<!--          <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  >
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['museums:specimen-outbound:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <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" width="120px" prop="applicantName" />
-      <el-table-column label="申请单位" align="center" width="120px" prop="applicationUsage" />
-      <el-table-column label="研究项目名称" align="center" prop="projectName" />
-      <el-table-column label="附件" align="center" prop="attachments" >
-        <template #default="{ row }">
-          <div v-if="row.attachments">
-          <el-link
-            type="primary"
-            download
-            :href="row.attachments"
-            :underline="false"
-            target="_blank"
-          >下载</el-link
+    <ContentWrap>
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px">
+        <el-form-item label="申请人姓名" prop="applicantName" label-width="85px">
+          <el-input
+            v-model="queryParams.applicantName"
+            placeholder="请输入申请人姓名"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="申请单位" prop="applicationUsage" label-width="85px">
+          <el-input
+            v-model="queryParams.applicationUsage"
+            placeholder="请输入申请单位"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="研究项目名称" prop="projectName" label-width="100px">
+          <el-input
+            v-model="queryParams.projectName"
+            placeholder="请输入研究项目名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="申请日期" prop="applicationDate">
+          <el-date-picker
+            v-model="queryParams.applicationDate"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+            class="!w-220px"
+          />
+        </el-form-item>
+        <el-form-item label="审批状态" prop="status" label-width="85px">
+          <el-select
+            v-model="queryParams.status"
+            placeholder="请选择审批状态"
+            clearable
+            class="!w-240px"
           >
-          </div>
-        </template>
-      </el-table-column>
+            <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="status">-->
+        <!--        <el-select-->
+        <!--          v-model="queryParams.status"-->
+        <!--          placeholder="请选择审批状态"-->
+        <!--          clearable-->
+        <!--          class="!w-240px"-->
+        <!--        >-->
+        <!--          <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>
+          <el-button @click="handleQuery">
+            <Icon icon="ep:search" class="mr-5px"/>
+            搜索
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon icon="ep:refresh" class="mr-5px"/>
+            重置
+          </el-button>
 
-      <el-table-column
-        label="申请日期"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column
-        label="项目开始时间"
-        align="center"
-        prop="startTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <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"
-            @click="ApproalDetails(scope.row.id)"
+            type="success"
+            plain
+            @click="handleExport"
+            :loading="exportLoading"
+            v-hasPermi="['museums:specimen-outbound:export']"
           >
-            查看
+            <Icon icon="ep:download" class="mr-5px"/>
+            导出
           </el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <!-- 列表 -->
+    <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" width="120px" prop="applicantName"/>
+        <el-table-column label="申请单位" align="center" width="120px" prop="applicationUsage"/>
+        <el-table-column label="研究项目名称" align="center" prop="projectName"/>
+
+        <el-table-column
+          label="申请日期"
+          align="center"
+          prop="createTime"
+          :formatter="dateFormatter"
+          width="180px"
+        />
+        <el-table-column
+          label="项目开始时间"
+          align="center"
+          prop="startTime"
+          :formatter="dateFormatter"
+          width="180px"
+        />
+        <el-table-column label="附件" align="center" prop="attachments">
+<!--          <template #default="{ row }">-->
+<!--            <div v-if="row.attachments">-->
+<!--&lt;!&ndash;              <a&ndash;&gt;-->
+<!--&lt;!&ndash;                download&ndash;&gt;-->
+<!--&lt;!&ndash;                :href="row.attachments"&ndash;&gt;-->
+<!--&lt;!&ndash;                :underline="false"&ndash;&gt;-->
+<!--&lt;!&ndash;                style="color: #dcb56d&ndash;&gt;-->
+<!--&lt;!&ndash;                ; text-decoration: none;"&ndash;&gt;-->
+<!--&lt;!&ndash;              >下载</a&ndash;&gt;-->
+<!--&lt;!&ndash;              >&ndash;&gt;-->
+<!--              <el-link  type="primary" download :href="queryParams.attachments" :underline="false" target="_blank" >下载</el-link-->
+<!--              >-->
+<!--            </div>-->
+<!--          </template>-->
+          <template #default="{ row }">
+            <div v-if="row.attachments">
+              <el-image
+                v-if="row.attachments.includes('image')"
+                class="h-80px w-80px"
+                lazy
+                :src="row.attachments"
+                :preview-src-list="[row.url]"
+                preview-teleported
+                fit="cover"
+              />
+              <el-link
+                v-else-if="row.attachments.includes('pdf')"
+                type="primary"
+                :href="row.attachments"
+                :underline="false"
+                target="_blank"
+              >预览</el-link
+              >
+              <el-link v-else type="primary" download :href="row.attachments" :underline="false" target="_blank"
+              >下载</el-link
+              >
+            </div>
+          </template>
+
+        </el-table-column>
+        <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"
+              @click="ApproalDetails(scope.row.id)"
+            >
+              查看
+            </el-button>
 
-        </template>
-      </el-table-column>
-    </el-table>
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+          </template>
+        </el-table-column>
+      </el-table>
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
       />
-   </ContentWrap>
-<!--  <Approval ref="ApprovalRef" @success="getList" />-->
+    </ContentWrap>
+    <!--  <Approval ref="ApprovalRef" @success="getList" />-->
   </el-skeleton>
 </template>
 
@@ -161,12 +195,12 @@
 <script setup lang="ts">
 // import Approval from "@/views/museums/specimenoutbound/approval.vue"
 import download from '@/utils/download'
-import { SpecimenOutboundApi, SpecimenOutboundVO } from '@/api/museums/specimenoutbound'
+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' })
+defineOptions({name: 'ApproalProcess'})
 const message = useMessage() // 消息弹窗
 //const { t } = useI18n() // 国际化
 
@@ -195,7 +229,7 @@ const queryParams = reactive({
   createTime: [],
   sampleStatus: undefined,
   estimatedReturnTime: [],
-  startTime:[],
+  startTime: [],
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -209,7 +243,7 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await  SpecimenOutboundApi.getSpecimenOutboundPage(queryParams)
+    const data = await SpecimenOutboundApi.getSpecimenOutboundPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -253,10 +287,10 @@ const handleExport = async () => {
 }
 
 /** 查看出库入库申请审批详情页面 **/
-import { useRouter } from 'vue-router';
+import {useRouter} from 'vue-router';
 
 const router = useRouter();
-const ApproalDetails=(dataId: number) => {
+const ApproalDetails = (dataId: number) => {
   router.push({
     name: 'ApproalDetails',
     query: {

src/views/museums/specimenoutbound/OutboundApplication.vue

@@ -47,7 +47,7 @@
             class="!w-220px"
           />
         </el-form-item>
-        <el-form-item label="审批状态" prop="status"  label-width="85px">
+        <el-form-item label="审批状态" prop="status" label-width="85px">
           <el-select
             v-model="queryParams.status"
             placeholder="请选择审批状态"
@@ -98,36 +98,10 @@
     <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" width="120px" prop="applicantName" />
-        <el-table-column label="申请单位" align="center" width="120px" prop="applicationUsage" />
-        <el-table-column label="研究项目名称" align="center" prop="projectName" />
-        <el-table-column label="申请附件" align="center" prop="attachments">
-          <template #default="{ row }">
-            <div v-if="row.attachments">
-            <el-image
-              v-if="row.type && row.type.includes('image')"
-              class="h-80px w-80px"
-              lazy
-              :src="row.attachments"
-              :preview-src-list="[row.attachments]"
-              preview-teleported
-              fit="cover"
-            />
-            <el-link
-              v-else-if="row.type && row.type.includes('pdf')"
-              type="primary"
-              :href="row.attachments"
-              :underline="false"
-              target="_blank"
-            >预览</el-link
-            >
-            <el-link v-else type="primary" download :href="row.attachments" :underline="false" target="_blank"
-            >下载</el-link
-            >
-            </div>
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="序号" align="center" prop="id"/>-->
+        <el-table-column label="申请人姓名" align="center" width="120px" prop="applicantName"/>
+        <el-table-column label="申请单位" align="center" width="120px" prop="applicationUsage"/>
+        <el-table-column label="研究项目名称" align="center" prop="projectName"/>
         <el-table-column
           label="申请日期"
           align="center"
@@ -135,15 +109,54 @@
           :formatter="dateFormatter"
           width="180px"
         />
+        <el-table-column label="附件" align="center" prop="attachments">
+<!--          <template #default="{ row }">
+            <div v-if="row.attachments">
+              <a
+                download
+                :href="row.attachments"
+                :underline="false"
+                style="color: #dcb56d
+                ; text-decoration: none;"
+              >下载</a
+              >
+            </div>
+          </template>-->
+          <template #default="{ row }">
+            <div v-if="row.attachments">
+              <el-image
+                v-if="row.attachments.includes('image')"
+                class="h-80px w-80px"
+                lazy
+                :src="row.attachments"
+                :preview-src-list="[row.url]"
+                preview-teleported
+                fit="cover"
+              />
+              <el-link
+                v-else-if="row.attachments.includes('pdf')"
+                type="primary"
+                :href="row.attachments"
+                :underline="false"
+                target="_blank"
+              >预览</el-link
+              >
+              <el-link v-else type="primary" download :href="row.attachments" :underline="false" target="_blank"
+              >下载</el-link
+              >
+            </div>
+          </template>
+        </el-table-column>
+
 
         <!--      <el-table-column label="审批状态" align="center" prop="status" />-->
-<!--        <el-table-column-->
-<!--          label="出库时间"-->
-<!--          align="center"-->
-<!--          prop="outgoingTime"-->
-<!--          :formatter="dateFormatter"-->
-<!--          width="180px"-->
-<!--        />-->
+        <!--        <el-table-column-->
+        <!--          label="出库时间"-->
+        <!--          align="center"-->
+        <!--          prop="outgoingTime"-->
+        <!--          :formatter="dateFormatter"-->
+        <!--          width="180px"-->
+        <!--        />-->
         <!--      <el-table-column label="申请附件" align="center" prop="url">-->
         <!--          <template #default="{ row }">-->
         <!--            <el-image-->
@@ -194,7 +207,7 @@
               @click="openForm('update', scope.row.id)"
 
             >
-             修改申请
+              修改申请
             </el-button>
             <el-button
               link
@@ -217,9 +230,9 @@
     </ContentWrap>
 
     <!-- 表单弹窗：编辑标本出库申请 -->
-<!--    <InitiativeProcessInstance ref="initiativeFormRef" @success="getList" />-->
+    <!--    <InitiativeProcessInstance ref="initiativeFormRef" @success="getList" />-->
     <SpecimenOutboundForm ref="formRef" @success="getList"/>
-<!--    <InitiativeProcessInstance ref="initiativeFormRef" @success="getList" />-->
+    <!--    <InitiativeProcessInstance ref="initiativeFormRef" @success="getList" />-->
   </el-skeleton>
 </template>
 
@@ -357,8 +370,6 @@ const handleExport = async () => {
 }
 
 
-
-
 /** 初始化 **/
 onMounted(() => {
   getList()
@@ -367,7 +378,7 @@ onMounted(() => {
 
 </script>
 <style lang="scss" scoped>
-.custom-message-box .el-message-box__content  {
+.custom-message-box .el-message-box__content {
   width: 800px !important;
 }
 

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

@@ -70,7 +70,8 @@
                   class-name="my-content"
                 >
                   <div class="demo-image__preview" v-if="outboundData && outboundData.attachments">
-                    <a :href="outboundData.attachments" target="_blank">下载附件</a>
+                    <a :href="outboundData.attachments" download style="color: #dcb56d
+                ; text-decoration: none;">下载附件</a>
                   </div>
                 </el-descriptions-item>
               </el-descriptions>
@@ -148,18 +149,18 @@
                 v-model:limit="pageParams.pageSize"
                 @pagination="getList"
               />
-      </el-col>
+            </el-col>
             <el-col>
-          <div v-if="outboundData.status === 0 || outboundData.status === 1 ">
-            <el-button
-              @click="handleApproval"
-              type="primary"
-              style="float:right; margin-left: 20px;margin-top:10px;margin-bottom:10px"
-            > 审批
-            </el-button>
-          </div>
+              <div v-if="outboundData.status === 0 || outboundData.status === 1 ">
+                <el-button
+                  @click="handleApproval"
+                  type="primary"
+                  style="float:right; margin-left: 20px;margin-top:10px;margin-bottom:10px"
+                > 审批
+                </el-button>
+              </div>
             </el-col>
-    </el-row>
+          </el-row>
         </el-card>
       </el-col>
 

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

@@ -1,242 +1,252 @@
 <template>
   <el-skeleton :loading="loading" animated>
-  <el-row :gutter="8" justify="space-between">
+    <el-row :gutter="8" justify="space-between">
 
-        <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" >
-          <el-card style="margin-bottom: 10px">
+      <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+        <el-card style="margin-bottom: 10px">
 
-            <template #header>
-              <div class="card-header" style="text-align: center">
-                <h1 class="text1">标本出库入库详情</h1>
-              </div>
-            </template>
+          <template #header>
+            <div class="card-header" style="text-align: center">
+              <h1 class="text1">标本出库入库详情</h1>
+            </div>
+          </template>
 
-<el-row>
-           <el-col :xl="11" :lg="11" :md="24" :sm="24" :xs="24" >
+          <el-row>
+            <el-col :xl="11" :lg="11" :md="24" :sm="24" :xs="24">
               <el-descriptions
                 :column="1"
                 v-if="outboundData"
                 :size="size"
 
                 border>
-              <el-descriptions-item label="申请人姓名:" label-align="right" label-class-name="my-label">{{
-                  outboundData.applicantName
-                }}
-              </el-descriptions-item>
-              <el-descriptions-item label="申请单位:" label-align="right" label-class-name="my-label">{{
-                  outboundData.applicationUsage
-                }}
-              </el-descriptions-item>
-              <el-descriptions-item label="电话号码:" label-align="right" label-class-name="my-label">{{
-                  outboundData.phoneNumber
-                }}
-              </el-descriptions-item>
-                <el-descriptions-item label="研究项目名称:" label-align="right" label-class-name="my-label">{{
-                    outboundData.projectName }}</el-descriptions-item>
-                <el-descriptions-item label="项目开始时间:" label-align="right" label-class-name="my-label">{{
-                    outboundData.startTime }}</el-descriptions-item>
-                <el-descriptions-item label="项目结束时间:" label-align="right" label-class-name="my-label">{{
+                <el-descriptions-item label="申请人姓名:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.applicantName
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请单位:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.applicationUsage
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="电话号码:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.phoneNumber
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="研究项目名称:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.projectName
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目开始时间:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.startTime
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目结束时间:" label-align="right"
+                                      label-class-name="my-label">{{
                     outboundData.endTime
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="一级审批时间:" label-align="right" label-class-name="my-label">{{
+                <el-descriptions-item label="一级审批时间:" label-align="right"
+                                      label-class-name="my-label">{{
                     outboundData.approvalTime
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="一级审批员:" label-align="right"  label-class-name="my-label">{{
+                <el-descriptions-item label="一级审批员:" label-align="right"
+                                      label-class-name="my-label">{{
                     outboundData.approveUsers
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="一级审批建议:" label-align="right"  label-class-name="my-label">{{
+                <el-descriptions-item label="一级审批建议:" label-align="right"
+                                      label-class-name="my-label">{{
                     outboundData.processInstanceId
                   }}
                 </el-descriptions-item>
-            </el-descriptions>
-    </el-col>
-  <el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24" >
-    <el-descriptions
-      :column="1"
-      v-if="outboundData"
-      :size="size"
-      border>
-      <el-descriptions-item label="二级审批时间:" label-align="right" label-class-name="my-label">{{
-          outboundData.twoApprovalTime
-        }}
-      </el-descriptions-item>
-      <el-descriptions-item label="二级审批员:" label-align="right"  label-class-name="my-label">{{
-          outboundData.twoApproveUsers
-        }}
-      </el-descriptions-item>
-      <el-descriptions-item label="二级审批建议" label-align="right"  label-class-name="my-label">{{
-          outboundData.rejectionReasons
-        }}
-      </el-descriptions-item>
-      <el-descriptions-item label="出库时间:" label-align="right" label-class-name="my-label">{{ outboundData.outgoingTime }}</el-descriptions-item>
-      <el-descriptions-item label="出库员:" label-align="right">{{  outboundData.operator}}
-      </el-descriptions-item>
-
-      <el-descriptions-item label="退还日期:" label-align="right" label-class-name="my-label">{{
-          outboundData.returnDate
-        }}
-      </el-descriptions-item>
-      <el-descriptions-item label="退还人:" label-align="right" label-class-name="my-label">{{
-          outboundData.returner
-        }}
-      </el-descriptions-item>
-      <el-descriptions-item label="点收人:" label-align="right" label-class-name="my-label">{{
-          outboundData.receiver
-        }}
-      </el-descriptions-item>
+              </el-descriptions>
+            </el-col>
+            <el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">
+              <el-descriptions
+                :column="1"
+                v-if="outboundData"
+                :size="size"
+                border>
+                <el-descriptions-item label="二级审批时间:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.twoApprovalTime
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="二级审批员:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.twoApproveUsers
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="二级审批建议" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.rejectionReasons
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="出库时间:" label-align="right"
+                                      label-class-name="my-label">{{ outboundData.outgoingTime }}
+                </el-descriptions-item>
+                <el-descriptions-item label="出库员:" label-align="right">
+                  {{ outboundData.operator }}
+                </el-descriptions-item>
 
-      <el-descriptions-item label="回库备注信息:" label-align="right" label-class-name="my-label">{{outboundData.remarks}}
-      </el-descriptions-item>
+                <el-descriptions-item label="退还日期:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.returnDate
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="退还人:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.returner
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="点收人:" label-align="right"
+                                      label-class-name="my-label">{{
+                    outboundData.receiver
+                  }}
+                </el-descriptions-item>
 
+                <el-descriptions-item label="回库备注信息:" label-align="right"
+                                      label-class-name="my-label">{{ outboundData.remarks }}
+                </el-descriptions-item>
 
-    </el-descriptions>
-  </el-col>
 
-              <el-col :xl="3" :lg="3" :md="24" :sm="24" :xs="24" >
-                <el-descriptions
-                  v-if="outboundData"
-                  direction="vertical"
-                  :column="1"
-                  :size="size"
-                  border
-                >
+              </el-descriptions>
+            </el-col>
 
-                  <el-descriptions-item
-                    :rowspan="4"
-                    :width="140"
-                    label="申请附件"
-                    align="center"
-                    label-class-name="my-label"
-                    class-name="my-content"
-                  >
-<!--                    <div v-if="outboundData.attachments && outboundData.attachments.type && outboundData.attachments.type.includes('image')" class="image-container">-->
-<!--                      <el-image-->
-<!--                        class="h-80px w-80px"-->
-<!--                        lazy-->
-<!--                        :src="outboundData.attachments"-->
-<!--                        :preview-src-list="outboundData.attachments ? [outboundData.attachments] : []"-->
-<!--                        preview-teleported-->
-<!--                        fit="cover"-->
-<!--                      />-->
-<!--                    </div>-->
-<!--                    <el-link-->
-<!--                      v-else-if="outboundData.attachments"-->
-<!--                      type="primary"-->
-<!--                      :href="outboundData.attachments"-->
-<!--                      :underline="false"-->
-<!--                      target="_blank"-->
-<!--                    >下载</el-link>-->
-                    <div class="demo-image__preview" v-if="outboundData && outboundData.attachments">
-                      <a :href="outboundData.attachments" target="_blank">下载附件</a>
-                    </div>
-                  </el-descriptions-item>
-                  <el-descriptions-item
-                    :rowspan="4"
-                    :width="140"
-                    label="回库附件"
-                    align="center"
-                    label-class-name="my-label"
-                    class-name="my-content"
-                  >
+            <el-col :xl="3" :lg="3" :md="24" :sm="24" :xs="24">
+              <el-descriptions
+                v-if="outboundData"
+                direction="vertical"
+                :column="1"
+                :size="size"
+                border
+              >
 
-                    <div class="demo-image__preview" v-if="outboundData && outboundData.sampleStatus">
-                      <a :href="outboundData.sampleStatus" target="_blank">下载附件</a>
-                    </div>
-<!--                    <div v-if="outboundData.sampleStatus && outboundData.sampleStatus.type && outboundData.sampleStatus.type.includes('image')" class="image-container">-->
-<!--                      <el-image-->
-<!--                        class="h-80px w-80px"-->
-<!--                        lazy-->
-<!--                        :src="outboundData.sampleStatus"-->
-<!--                        :preview-src-list="outboundData.sampleStatus ? [outboundData.sampleStatus] : []"-->
-<!--                        preview-teleported-->
-<!--                        fit="cover"-->
-<!--                      />-->
-<!--                    </div>-->
-<!--                    <el-link-->
-<!--                      v-else-if="outboundData.sampleStatus"-->
-<!--                      type="primary"-->
-<!--                      :href="outboundData.sampleStatus"-->
-<!--                      :underline="false"-->
-<!--                      target="_blank"-->
-<!--                    >下载</el-link>-->
-<!--                  </div>-->
+                <el-descriptions-item
+                  :rowspan="4"
+                  :width="140"
+                  label="申请附件"
+                  align="center"
+                  label-class-name="my-label"
+                  class-name="my-content"
+                >
+                  <!--                    <div v-if="outboundData.attachments && outboundData.attachments.type && outboundData.attachments.type.includes('image')" class="image-container">-->
+                  <!--                      <el-image-->
+                  <!--                        class="h-80px w-80px"-->
+                  <!--                        lazy-->
+                  <!--                        :src="outboundData.attachments"-->
+                  <!--                        :preview-src-list="outboundData.attachments ? [outboundData.attachments] : []"-->
+                  <!--                        preview-teleported-->
+                  <!--                        fit="cover"-->
+                  <!--                      />-->
+                  <!--                    </div>-->
+                  <!--                    <el-link-->
+                  <!--                      v-else-if="outboundData.attachments"-->
+                  <!--                      type="primary"-->
+                  <!--                      :href="outboundData.attachments"-->
+                  <!--                      :underline="false"-->
+                  <!--                      target="_blank"-->
+                  <!--                    >下载</el-link>-->
+                  <div class="demo-image__preview" v-if="outboundData && outboundData.attachments">
+<!--                    <a :href="outboundData.attachments" style="color: #dcb56d-->
+<!--                ; text-decoration: none;" download>下载附件</a>-->
+<!--                    <el-link type="primary" download :href="outboundData.attachments" :underline="false" target="_blank"-->
+<!--                    >下载</el-link-->
+<!--                    >-->
 
-                  </el-descriptions-item>
-                </el-descriptions>
-              </el-col>
-</el-row>
-          </el-card>
-        </el-col>
+                  </div>
+                </el-descriptions-item>
+                <el-descriptions-item
+                  :rowspan="4"
+                  :width="140"
+                  label="回库附件"
+                  align="center"
+                  label-class-name="my-label"
+                  class-name="my-content"
+                >
 
+                  <div class="demo-image__preview" v-if="outboundData && outboundData.sampleStatus">
+                    <a :href="outboundData.sampleStatus" style="color: #dcb56d
+                ; text-decoration: none;" download>下载附件</a>
+                  </div>
 
+                </el-descriptions-item>
+              </el-descriptions>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
 
 
-            <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" >
-              <!-- 列表 -->
+      <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+        <!-- 列表 -->
 
-              <el-card>
-                <template #header>
-                  <div class="card-header" style="text-align: center">
-                    <h1 class="text1">标本信息</h1>
-                  </div>
-                </template>
-                  <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" >
-                    <el-table-column label="标本编号" align="center" prop="specimenNumber" />
-                    <el-table-column label="中文名称" align="center" prop="chineseName" />
-                    <el-table-column label="标本类型" align="center" prop="specimenType">
-                      <template #default="scope">
-                        <dict-tag :type="DICT_TYPE.MUSEUMS_SPECIMEN_TYPE" :value="scope.row.specimenType" />
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="标本重量（g）" align="center" prop="weight" />
-                    <el-table-column label="保存位置" align="center" prop="storageLocation" />
-                    <el-table-column label="保存类型" align="center" prop="preservationType">
-                      <template #default="scope">
-                        <dict-tag :type="DICT_TYPE.MUSEUMS_SPECIMEN_INFO" :value="scope.row.preservationType" />
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="标本图片" align="center" prop="url" >
-                      <template #default="{ row }">
-                        <div class="demo-image__preview" v-if="pageParams" >
-                        <block  v-for="(image, index) in row.imagePath" :key="index">
-                        <el-image
-                          style="width: 40px; height:40px;margin-right: 5px"
-                          class="image-class"
-                          lazy
-                          :src="image"
-                          :preview-src-list="row.imagePath"
-                          preview-teleported
-                          fit="cover" />
-                        </block>
-                        </div>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <!-- 分页 -->
-                  <Pagination
-                    :total="total"
-                    v-model:page="pageParams.pageNo"
-                    v-model:limit="pageParams.pageSize"
-                    @pagination="getList"
-                  />
-                </el-card>
+        <el-card>
+          <template #header>
+            <div class="card-header" style="text-align: center">
+              <h1 class="text1">标本信息</h1>
+            </div>
+          </template>
+          <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+            <el-table-column label="标本编号" align="center" prop="specimenNumber"/>
+            <el-table-column label="中文名称" align="center" prop="chineseName"/>
+            <el-table-column label="标本类型" align="center" prop="specimenType">
+              <template #default="scope">
+                <dict-tag :type="DICT_TYPE.MUSEUMS_SPECIMEN_TYPE" :value="scope.row.specimenType"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="标本重量（g）" align="center" prop="weight"/>
+            <el-table-column label="保存位置" align="center" prop="storageLocation"/>
+            <el-table-column label="保存类型" align="center" prop="preservationType">
+              <template #default="scope">
+                <dict-tag :type="DICT_TYPE.MUSEUMS_SPECIMEN_INFO"
+                          :value="scope.row.preservationType"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="标本图片" align="center" prop="url">
+              <template #default="{ row }">
+                <div class="demo-image__preview" v-if="pageParams">
+                  <block v-for="(image, index) in row.imagePath" :key="index">
+                    <el-image
+                      style="width: 40px; height:40px;margin-right: 5px"
+                      class="image-class"
+                      lazy
+                      :src="image"
+                      :preview-src-list="row.imagePath"
+                      preview-teleported
+                      fit="cover"/>
+                  </block>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!-- 分页 -->
+          <Pagination
+            :total="total"
+            v-model:page="pageParams.pageNo"
+            v-model:limit="pageParams.pageSize"
+            @pagination="getList"
+          />
+        </el-card>
 
-            </el-col>
-      </el-row>
+      </el-col>
+    </el-row>
   </el-skeleton>
 </template>
 <script setup lang="ts">
 import {type ComponentSize, ElCol} from "element-plus";
 import {ref, reactive, onMounted, computed} from "vue";
 import {SpecimenOutboundApi, SpecimenOutboundVO} from "@/api/museums/specimenoutbound";
-import { formatDate} from "@/utils/formatTime";
+import {formatDate} from "@/utils/formatTime";
 import {DICT_TYPE} from "@/utils/dict";
 
 
-defineOptions({ name: 'outboundDetail' })
+defineOptions({name: 'outboundDetail'})
 const size = ref<ComponentSize>('large')
 const {query} = useRoute() // 查询参数
 const loading = ref(true) // 列表的加载中
@@ -254,17 +264,17 @@ const pageParams = reactive({
   attachments: undefined,
   processInstanceId: undefined,
   specimenCondition: undefined,
-  imagePath:undefined
+  imagePath: undefined
 })
 
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
-    const id =  query.dataId as unknown as number
+    const id = query.dataId as unknown as number
 
-    const data = await SpecimenOutboundApi.getSpecimenOutboundDetailsPage(id,pageParams)
-    console.log('t27348932',data)
+    const data = await SpecimenOutboundApi.getSpecimenOutboundDetailsPage(id, pageParams)
+    console.log('t27348932', data)
     list.value = data.specimenInfoList.list
     total.value = data.specimenInfoList.total
   } finally {
@@ -285,7 +295,7 @@ const fetchData = async () => {
     res.outgoingTime = formatDate(res.outgoingTime)
     res.returnDate = formatDate(res.returnDate)
 
-  }  finally {
+  } finally {
   }
 }
 
@@ -297,10 +307,10 @@ onMounted(async () => {
 
 /**审批状态**/
 const statusText = computed(() => {
-  if ( outboundData.value === null) {
+  if (outboundData.value === null) {
     return '';
   }
-  switch ( outboundData.value.status) {
+  switch (outboundData.value.status) {
     case 0:
       return '审批中';
     case 1:
@@ -327,8 +337,9 @@ const statusText = computed(() => {
   background: #FAF8F7 !important;
   width: 180px;
 }
+
 :deep(.my-content) {
-  height:167px;
+  height: 167px;
 }
 
 </style>