Merge remote-tracking branch 'origin/master'

src/api/museums/specimenoutbound/index.ts

@@ -41,7 +41,7 @@ export const SpecimenOutboundApi = {
 
   // 查询标本出库回库信息详情
   getSpecimenOutbound: async (id: number) => {
-    return await request.get({ url: `/museums/specimen-outbound/query?id=` + id })
+    return await request.get({ url: `/museums/specimen-outbound/get?id=` + id })
   },
 
   // 新增标本出库回库申请
@@ -91,8 +91,11 @@ export const SpecimenOutboundApi = {
   },
 
   // 查询标本出库回库详情页面分页
-  getSpecimenOutboundDetailsPage: async (params: any) => {
-    return await request.get({ url: `/museums/specimen-outbound/specimenInfo`, params })
+  getSpecimenOutboundDetailsPage: async (id: number, pageParams: any) => {
+    return await request.get({ url: `museums/specimen-outbound/specimenInfo`, params: {
+        id: id, // 确保传递 id 参数
+        pageParams // 展开其他分页参数
+      } })
   },
 
   // 修改标本出库申请

src/views/museums/specimeninfo/SpecimenInfoForm.vue

@@ -27,6 +27,9 @@
       <el-form-item label="存放位置" prop="storageLocation">
         <el-input v-model="formData.storageLocation" placeholder="请输入存放位置"/>
       </el-form-item>
+      <el-form-item label="保存状态" prop="composition">
+        <el-input v-model="formData.composition" placeholder="请输入（完整/受损/严重受损/无实物）"/>
+      </el-form-item>
       <el-form-item label="中文名称" prop="chineseName">
         <el-input v-model="formData.chineseName" placeholder="请输入中文名称"/>
       </el-form-item>
@@ -79,12 +82,15 @@
         />
       </el-form-item>
 
-      <el-form-item label="尺寸" prop="size">
+      <el-form-item label="规格（cm）" prop="size">
         <el-input v-model="formData.size" placeholder="请输入尺寸"/>
       </el-form-item>
-      <el-form-item label="重量" prop="weight">
+      <el-form-item label="重量（g）" prop="weight">
         <el-input v-model="formData.weight" placeholder="请输入重量"/>
       </el-form-item>
+      <el-form-item label="成分/化学式）" prop="weight">
+        <el-input v-model="formData.composition" placeholder="请输入成分/化学式"/>
+      </el-form-item>
       <el-form-item label="价格" prop="specimenAmount">
         <el-input v-model="formData.specimenAmount" placeholder="请输入价格"/>
       </el-form-item>
@@ -112,10 +118,13 @@
           placeholder="选择入藏时间"
         />
       </el-form-item>
-      <el-form-item label="用途" prop="purpose">
+      <el-form-item label="主要用途" prop="mainPurpose">
+        <el-input v-model="formData.mainPurpose" placeholder="请输入主要用途"/>
+      </el-form-item>
+      <el-form-item label="具体用途" prop="purpose">
         <el-input v-model="formData.purpose" placeholder="请输入用途"/>
       </el-form-item>
-      <el-form-item label="描述" prop="description">
+      <el-form-item label="文献资料" prop="description">
         <Editor v-model="formData.description" height="150px"/>
       </el-form-item>
       <el-form-item label="馆藏状态" prop="collectionStatus">
@@ -162,9 +171,9 @@
 <!--      <el-form-item label="注销原因" prop="deletedReason">-->
 <!--        <el-input v-model="formData.deletedReason" 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="operator">-->
+<!--        <el-input v-model="formData.operator" placeholder="请输入入库操作员"/>-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="入库时间" prop="entryDate">-->
 <!--        <el-date-picker-->
 <!--          v-model="formData.entryDate"-->
@@ -229,7 +238,8 @@ const formData = ref({
   imagePath: [],
   deletedReason: undefined,
   operator: undefined,
-  entryDate: undefined
+  entryDate: undefined,
+  mainPurpose:undefined
 })
 const formRules = reactive({
   specimenType: [{

src/views/museums/specimeninfo/specimenDetails.vue

@@ -17,10 +17,14 @@
                 :size="size"
                 border
               >
-                <el-descriptions-item label-class-name="my-label" label="序号:" label-align="right">{{ specimenData.id }}</el-descriptions-item>
+<!--                <el-descriptions-item label-class-name="my-label" label="序号:" label-align="right">{{ specimenData.id }}</el-descriptions-item>-->
 
                 <el-descriptions-item  label-class-name="my-label" label="标本类型:" label-align="right" >{{ specimenTypeText }}
                 </el-descriptions-item>
+                <el-descriptions-item  label-class-name="my-label" label="保存状态:" label-align="right">{{
+                    specimenData.saveStatus
+                  }}
+                </el-descriptions-item>
                 <el-descriptions-item  label-class-name="my-label" label="标本编号:" label-align="right">{{
                     specimenData.specimenNumber
                   }}
@@ -33,14 +37,28 @@
                     specimenData.storageLocation
                   }}
                 </el-descriptions-item>
+
                 <el-descriptions-item label="中文名称:" label-align="right" label-class-name="my-label" >{{
                     specimenData.chineseName
                   }}
                 </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" >{{
                     specimenData.englishName
                   }}
                 </el-descriptions-item>
+                <el-descriptions-item label="国际命名:"  label-align="right" label-class-name="my-label" > {{
+                    specimenData.internationalName
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="国家:" label-align="right" label-class-name="my-label" >{{
+                    specimenData.country
+                  }}
+                </el-descriptions-item>
+                \    <el-descriptions-item label="省:" label-align="right" label-class-name="my-label" >{{
+                  specimenData.economize
+                }}
+              </el-descriptions-item>
               </el-descriptions>
 
             </el-card>
@@ -57,11 +75,12 @@
                 :size="size"
                 border
               >
-                <el-descriptions-item label="成分:"  label-align="right" label-class-name="my-label" > {{
+
+                <el-descriptions-item label="成分/化学式:"  label-align="right" label-class-name="my-label" > {{
                     specimenData.composition
                   }}
                 </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" >{{
                     specimenData.origin
                   }}
                 </el-descriptions-item>
@@ -72,14 +91,26 @@
                 </el-descriptions-item>
                 <el-descriptions-item label="陨石类型:" label-width="100px" label-align="right" label-class-name="my-label" >{{ specimenData.meteoriteType }}
                 </el-descriptions-item>
-                <el-descriptions-item label="国际命名:" label-width="100px" label-align="right" label-class-name="my-label" >{{
-                    specimenData.internationalName
+                <el-descriptions-item label="形成时代:" label-width="100px" label-align="right" label-class-name="my-label" >{{
+                    specimenData.era
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="地质产状或层位:" label-width="100px" label-align="right" label-class-name="my-label" >{{
+                    specimenData.preservedLayer
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="分类:" label-width="100px" label-align="right" label-class-name="my-label" >{{
+                    specimenData.meteoriteType
                   }}
                 </el-descriptions-item>
                 <el-descriptions-item label="重量(g):" label-width="100px" label-align="right" label-class-name="my-label" >{{
                     specimenData.weight
                   }}
                 </el-descriptions-item>
+                <el-descriptions-item label="规格(cm):" label-align="right" label-class-name="my-label" >{{
+                    specimenData.size
+                  }}
+                </el-descriptions-item>
               </el-descriptions>
             </el-card>
             <el-card style="margin-bottom: 5px">
@@ -95,18 +126,26 @@
                 :size="size"
                 border
               >
-                <el-descriptions-item label="保存类型" label-class-name="my-label" >{{ preservationTypeText }}
+                <el-descriptions-item label="保存类型:" label-class-name="my-label" label-align="right">{{ preservationTypeText }}
+                </el-descriptions-item>
+                <el-descriptions-item label="来源:" label-class-name="my-label" label-align="right">{{ sourceText }}</el-descriptions-item>
+                <el-descriptions-item label="单价：" label-class-name="my-label" label-align="right">{{
+                    specimenData.specimenPrice
+                  }}
+                </el-descriptions-item>
+                <el-descriptions-item label="数量（件/套）:" label-align="right" label-class-name="my-label" >{{
+                    specimenData.specimenAmount
+                  }}
                 </el-descriptions-item>
-                <el-descriptions-item label="来源" label-class-name="my-label" >{{ sourceText }}</el-descriptions-item>
-                <el-descriptions-item label="标本提供者" label-class-name="my-label" >{{
+                <el-descriptions-item label="标本提供者：" label-class-name="my-label" label-align="right">{{
                     specimenData.provider
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="发现时间" label-class-name="my-label" >  {{
+                <el-descriptions-item label="发现时间：" label-class-name="my-label" label-align="right">  {{
                     specimenData.discoveryTime
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="降落时间" label-class-name="my-label" >{{
+                <el-descriptions-item label="降落时间：" label-class-name="my-label" label-align="right">{{
                     specimenData.fallTime
                   }}
                 </el-descriptions-item>
@@ -124,19 +163,23 @@
                 :size="size"
                 border
               >
-                <el-descriptions-item label="入馆时间" label-class-name="my-label" >{{
+                <el-descriptions-item label="入馆时间：" label-class-name="my-label" label-align="right">{{
                     specimenData.acquisitionTime
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="描述" label-class-name="my-label" >{{
-                    specimenData.description
+<!--                <el-descriptions-item label="文献资料：" label-class-name="my-label" label-align="right">{{-->
+<!--                    specimenData.description-->
+<!--                  }}-->
+<!--                </el-descriptions-item>-->
+                <el-descriptions-item label="主要用途：" label-class-name="my-label" label-align="right">{{
+                    specimenData.mainPurpose
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="用途" label-class-name="my-label" >{{
+                <el-descriptions-item label="具体用途：" label-class-name="my-label" label-align="right">{{
                     specimenData.purpose
                   }}
                 </el-descriptions-item>
-                <el-descriptions-item label="备注" label-class-name="my-label" >{{
+                <el-descriptions-item label="备注：" label-class-name="my-label" label-align="right">{{
                     specimenData.notes
                   }}
                 </el-descriptions-item>

src/views/museums/specimenoutbound/ApproalProcess.vue

@@ -87,6 +87,7 @@
       <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"
@@ -107,6 +108,7 @@
           <el-link v-else type="primary" download :href="row.attachments" :underline="false" target="_blank"
           >下载</el-link
           >
+          </div>
         </template>
       </el-table-column>
 

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

@@ -51,13 +51,9 @@
                label-class-name="my-label"
                class-name="my-content"
              >
-<!--               <div class="demo-image__preview" v-if="outboundData" >-->
-<!--                 <div class="demo-image__preview" v-if="outboundData">-->
-<!--                   <a :href="outboundData.attachments" target="_blank">下载附件</a>-->
-<!--                 </div>-->
-
-<!--               </div>-->
-
+                 <div class="demo-image__preview" v-if="outboundData">
+                   <a :href="outboundData.attachments" target="_blank">下载附件</a>
+                 </div>
              </el-descriptions-item>
            </el-descriptions>
 <!--           <div class="demo-image__preview" v-if="outboundData ">-->
@@ -119,7 +115,7 @@
            </el-table-column>
            <el-table-column label="标本图片" align="center" prop="url" >
              <template #default="{ row }">
-               <div class="demo-image__preview" v-if="queryParams" >
+               <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"
@@ -137,18 +133,18 @@
          <!-- 分页 -->
          <Pagination
            :total="total"
-           v-model:page="queryParams.pageNo"
-           v-model:limit="queryParams.pageSize"
+           v-model:page="pageParams.pageNo"
+           v-model:limit="pageParams.pageSize"
            @pagination="getList"
          />
-<!--         <div v-if="outboundData.status === 0 || outboundData.status === 1 ">-->
+         <div v-if="outboundData.status === 0 || outboundData.status === 1 ">
          <el-button
            @click="handleApproval"
            type="primary"
            style="float: right; margin-left: 20px;margin-top: 20px;margin-bottom: 20px"
          > 审批
          </el-button>
-<!--         </div>-->
+         </div>
        </el-card>
      </el-col>
 
@@ -174,7 +170,7 @@ const {query} = useRoute() // 查询参数
 const loading = ref(true) // 列表的加载中
 const list = ref<SpecimenOutboundVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const queryParams = reactive({
+const pageParams = reactive({
   id:query.dataId,
   pageNo: 1,
   pageSize: 10,
@@ -191,9 +187,10 @@ const queryParams = reactive({
 const getList = async () => {
   loading.value = true
   try {
-    const data = await SpecimenOutboundApi.getSpecimenOutboundDetailsPage(queryParams)
-    list.value = data.list
-    total.value = data.total
+    const id =  query.dataId as unknown as number
+    const data = await SpecimenOutboundApi.getSpecimenOutboundDetailsPage(id,pageParams)
+    list.value = data.specimenInfoList.list
+    total.value = data.specimenInfoList.total
   } finally {
     loading.value = false
   }
@@ -234,15 +231,7 @@ const StatusText = computed(() => {
   }
 });
 
-watch(
-  () => [queryParams.pageNo, queryParams.pageSize],
-  (newValues) => {
-    queryParams.pageNo = newValues[0];
-    queryParams.pageSize = newValues[1];
-    getList();
-  },
-  { immediate: true }
-);
+
 
 // // 在组件加载时获取数据
 onMounted(async () => {

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

@@ -105,11 +105,7 @@
                   :size="size"
                   border
                 >
-                  <!--              <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
                     :rowspan="4"
                     :width="140"
@@ -117,21 +113,67 @@
                     align="center"
                     label-class-name="my-label"
                     class-name="my-content"
-                  ><div class="demo-image__preview" v-if="outboundData" >
-
+                  >
+                    <div v-if="outboundData.attachments && outboundData.attachments.type && outboundData.attachments.type.includes('image')" class="image-container">
                       <el-image
-                        style="width: 40px; height:40px;margin-right: 5px"
                         class="h-80px w-80px"
                         lazy
                         :src="outboundData.attachments"
-                        :preview-src-list="outboundData.attachments"
+                        :preview-src-list="outboundData.attachments ? [outboundData.attachments] : []"
                         preview-teleported
                         fit="cover"
-
-
                       />
-
-                  </div>
+                    </div>
+                    <el-link
+                      v-else-if="outboundData.attachments"
+                      type="primary"
+                      :href="outboundData.attachments"
+                      :underline="false"
+                      target="_blank"
+                    >下载</el-link>
+
+<!--                    <div v-if="outboundData.attachments && outboundData.attachments.type('image')" class="image-container">-->
+<!--                      <el-image-->
+<!--                        class="h-80px w-80px"-->
+<!--                        lazy-->
+<!--                        :src="outboundData.attachments.url"-->
+<!--                        :preview-src-list="[attachments]"-->
+<!--                        preview-teleported-->
+<!--                        fit="cover"-->
+<!--                      />-->
+<!--                    </div>-->
+<!--                    <el-link-->
+<!--                      v-else-if="outboundData.attachments && outboundData.attachments.type.includes('pdf')"-->
+<!--                      type="primary"-->
+<!--                      :href="outboundData.attachments"-->
+<!--                      :underline="false"-->
+<!--                      target="_blank"-->
+<!--                    >预览</el-link>-->
+<!--                    <el-link-->
+<!--                      v-else-->
+<!--                      type="primary"-->
+<!--                      download-->
+<!--                      :href="outboundData.attachments"-->
+<!--                      :underline="false"-->
+<!--                      target="_blank"-->
+<!--                    >下载</el-link>-->
+
+
+                    <!--                    <div class="demo-image__preview" v-if="outboundData" >-->
+
+                    <!--                      <el-image-->
+                    <!--                        style="width: 40px; height:40px;margin-right: 5px"-->
+                    <!--                        class="h-80px w-80px"-->
+                    <!--                        lazy-->
+                    <!--                        :src="outboundData.attachments"-->
+                    <!--                        :preview-src-list="outboundData.attachments"-->
+                    <!--                        preview-teleported-->
+                    <!--                        fit="cover"-->
+
+
+                    <!--                      />-->
+
+                    <!--                  </div>-->
 
                   </el-descriptions-item>
                   <el-descriptions-item
@@ -143,18 +185,34 @@
                     class-name="my-content"
                   ><div class="demo-image__preview" v-if="outboundData" >
 
-                    <el-image
-                      style="width: 40px; height:40px;margin-right: 5px"
-                      class="h-80px w-80px"
-                      lazy
-                      :src="outboundData.sampleStatus"
-                      :preview-src-list="outboundData.sampleStatus"
-                      preview-teleported
-                      fit="cover"
-
+<!--                    <el-image-->
+<!--                      style="width: 40px; height:40px;margin-right: 5px"-->
+<!--                      class="h-80px w-80px"-->
+<!--                      lazy-->
+<!--                      :src="outboundData.sampleStatus"-->
+<!--                      :preview-src-list="outboundData.sampleStatus"-->
+<!--                      preview-teleported-->
+<!--                      fit="cover"-->
 
-                    />
 
+<!--                    />-->
+                    <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>
@@ -168,14 +226,14 @@
 
 
             <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" />
@@ -193,10 +251,10 @@
                     </el-table-column>
                     <el-table-column label="标本图片" align="center" prop="url" >
                       <template #default="{ row }">
-                        <div class="demo-image__preview" v-if="queryParams" >
+                        <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"
@@ -211,12 +269,12 @@
                   <!-- 分页 -->
                   <Pagination
                     :total="total"
-                    v-model:page="queryParams.pageNo"
-                    v-model:limit="queryParams.pageSize"
+                    v-model:page="pageParams.pageNo"
+                    v-model:limit="pageParams.pageSize"
                     @pagination="getList"
                   />
-
                 </el-card>
+
             </el-col>
       </el-row>
   </el-skeleton>
@@ -237,7 +295,7 @@ const list = ref<SpecimenOutboundVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 
 let outboundData = ref(null); // 初始化响应式数据
-const queryParams = reactive({
+const pageParams = reactive({
   pageNo: 1,
   pageSize: 10,
   id: query.dataId,
@@ -254,10 +312,12 @@ const queryParams = reactive({
 const getList = async () => {
   loading.value = true
   try {
-    const data = await SpecimenOutboundApi.getSpecimenOutboundDetailsPage(queryParams)
-    console.log(data)
-    list.value = data.list
-    total.value = data.total
+    const id =  query.dataId as unknown as number
+
+    const data = await SpecimenOutboundApi.getSpecimenOutboundDetailsPage(id,pageParams)
+    console.log('t27348932',data)
+    list.value = data.specimenInfoList.list
+    total.value = data.specimenInfoList.total
   } finally {
     loading.value = false
   }

src/views/museums/specimenoutbound/OutboundManagement.vue

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

src/views/museums/specimenoutbound/SpecimenOutboundForm.vue

@@ -110,7 +110,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  infoId: undefined,
+  infoId: [],
   chineseName: undefined,// 确保初始值为数组
   number:[''] ,// 确保初始值为数组
   applicantName: undefined,
@@ -218,7 +218,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    infoId: undefined,
+    infoId: [],
     chineseName: undefined,// 确保初始值为数组
     number: [],// 确保初始值为数组
     applicantName: undefined,

src/views/museums/specimenoutbound/approval.vue

@@ -63,13 +63,15 @@ const formData = ref({
   twoApproveUsers: undefined, // 二审批员
   approvalTime: null, // 一审时间
   twoApprovalTime: null, // 二审时间
+
 })
 /** 打开弹窗 */
 const open = async (id?: number) => {
   dialogVisible.value = true
   approvalStatus.value = 0
   chkRemarks.value = '';
-  formData.value.id = id
+  formData.value.id = id;
+
   resetForm()
   console.log(id)
 
@@ -80,30 +82,55 @@ defineExpose({ open })// 提供 open 方法，用于打开弹窗
 
 /** 提交审批 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+// const submitApproval = async () => {
+//   // 检查是否有驳回原因
+//   if (approvalStatus.value === 2   && !formData.value.rejectionReasons.trim()) {
+//     message.error(t('请输入驳回原因'))
+//     return// 阻止表单提交
+//   }
+//   try {
+//     formLoading.value = true;
+//     const data = {
+//       ...formData.value,
+//      status: approvalStatus.value, // 确保传入审批状态
+//       processInstanceId:  approvalStatus.value === 2 ? formData.value.rejectionReasons : formData.value.processInstanceId // 如果是驳回，则传入驳回原因
+//     };
+//     console.log(data,"wozaizheli")
+//     await SpecimenOutboundApi.ApprovalSpecimenOutbound(data)
+//     message.success(t('审批成功'));
+//     dialogVisible.value = false
+//     // 发送操作成功的事件
+//     emit('success')
+//   } finally {
+//     formLoading.value = false
+//   }
+// }
 const submitApproval = async () => {
-  // 检查是否有驳回原因
-  if (approvalStatus.value === 2   && !formData.value.rejectionReasons.trim()) {
-    message.error(t('请输入驳回原因'))
-    return// 阻止表单提交
+  if (approvalStatus.value === 2 && !formData.value.rejectionReasons.trim()) {
+    message.error(t('请输入驳回原因'));
+    return;
   }
   try {
     formLoading.value = true;
+    let statusCode;
+    if (approvalStatus.value === 1) {
+      statusCode = formData.value.status === 1 ? 1 : 5;
+    } else {
+      statusCode = formData.value.status === 1 ? 2 : 6;
+    }
     const data = {
       ...formData.value,
-     status: approvalStatus.value, // 确保传入审批状态
-      processInstanceId:  approvalStatus.value === 2 ? formData.value.rejectionReasons : formData.value.processInstanceId // 如果是驳回，则传入驳回原因
+      status: statusCode,
+      processInstanceId: approvalStatus.value === 2 ? formData.value.rejectionReasons : formData.value.processInstanceId,
     };
-    console.log(data,"wozaizheli")
-    await SpecimenOutboundApi.ApprovalSpecimenOutbound(data)
+    await SpecimenOutboundApi.ApprovalSpecimenOutbound(data);
     message.success(t('审批成功'));
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
+    dialogVisible.value = false;
+    emit('success');
   } finally {
-    formLoading.value = false
+    formLoading.value = false;
   }
-}
-
+};
 /** 重置表单 */
 const resetForm = async (): Promise<void> => {
   // 重置上传状态和文件