Merge remote-tracking branch 'origin/master'

src/views/museums/specimeninfo/specimenDetails.vue

@@ -72,6 +72,11 @@
                       specimenData.economize
                     }}
                   </el-descriptions-item>
+                  <el-descriptions-item label="备注:" label-class-name="my-label"
+                                        label-align="right">{{
+                      specimenData.notes
+                    }}
+                  </el-descriptions-item>
                 </el-descriptions>
 
               </el-card>
@@ -101,14 +106,14 @@
                     }}
                   </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="保存地层:" 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="形成时代:" label-width="100px" label-align="right"
                                         label-class-name="my-label"
                                         v-if="specimenData.specimenType !== 1 && specimenData.specimenType !== 3 ">
@@ -126,6 +131,20 @@
                       specimenData.meteoriteType
                     }}
                   </el-descriptions-item>
+                  <el-descriptions-item label="发现时间:" label-class-name="my-label"
+                                        label-align="right"
+                                        v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 ">
+                    {{
+                      specimenData.discoveryTime
+                    }}
+                  </el-descriptions-item>
+                  <el-descriptions-item label="降落时间:" label-class-name="my-label"
+                                        label-align="right"
+                                        v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 ">
+                    {{
+                      specimenData.fallTime
+                    }}
+                  </el-descriptions-item>
                   <el-descriptions-item label="重量(g):" label-width="100px" label-align="right"
                                         label-class-name="my-label"
                                         v-if="specimenData.specimenType !== 2">{{
@@ -178,20 +197,20 @@
                       specimenData.provider
                     }}
                   </el-descriptions-item>
-                  <el-descriptions-item label="发现时间:" label-class-name="my-label"
-                                        label-align="right"
-                                        v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 ">
-                    {{
-                      specimenData.discoveryTime
-                    }}
-                  </el-descriptions-item>
-                  <el-descriptions-item label="降落时间:" label-class-name="my-label"
-                                        label-align="right"
-                                        v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 ">
-                    {{
-                      specimenData.fallTime
-                    }}
-                  </el-descriptions-item>
+<!--                  <el-descriptions-item label="发现时间:" label-class-name="my-label"-->
+<!--                                        label-align="right"-->
+<!--                                        v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 ">-->
+<!--                    {{-->
+<!--                      specimenData.discoveryTime-->
+<!--                    }}-->
+<!--                  </el-descriptions-item>-->
+<!--                  <el-descriptions-item label="降落时间:" label-class-name="my-label"-->
+<!--                                        label-align="right"-->
+<!--                                        v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 ">-->
+<!--                    {{-->
+<!--                      specimenData.fallTime-->
+<!--                    }}-->
+<!--                  </el-descriptions-item>-->
                 </el-descriptions>
               </el-card>
               <el-card style="margin-bottom: 5px">
@@ -218,11 +237,7 @@
                       specimenData.purpose
                     }}
                   </el-descriptions-item>
-                  <el-descriptions-item label="备注:" label-class-name="my-label"
-                                        label-align="right">{{
-                      specimenData.notes
-                    }}
-                  </el-descriptions-item>
+
                   <el-descriptions-item label="文献资料：" label-class-name="my-label"
                                         label-align="right">
                     <div v-html="specimenData.description">

src/views/museums/specimenoutbound/ApproalProcess.vue

@@ -150,11 +150,11 @@ 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";
+import {DICT_TYPE} from "@/utils/dict";
 
 defineOptions({ name: 'ApproalProcess' })
 const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+//const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
 const list = ref<SpecimenOutboundVO[]>([]) // 列表的数据

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

@@ -96,7 +96,7 @@
              <h1 class="text1">申请出库标本信息</h1>
            </div>
          </template>
-         <el-table v-loading="loading" :data="outboundData.specimenInfoList.list" :stripe="true" :show-overflow-tooltip="true" >
+         <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" >
 <!--           <el-table-column label="标本ID" align="center" prop="id" />-->
            <el-table-column label="标本编号" align="center" prop="specimenNumber" />
            <el-table-column label="中文名称" align="center" prop="chineseName" />
@@ -130,6 +130,7 @@
              </template>
            </el-table-column>
          </el-table>
+
          <!-- 分页 -->
          <Pagination
            :total="total"
@@ -137,11 +138,12 @@
            v-model:limit="pageParams.pageSize"
            @pagination="getList"
          />
+
          <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"
+           style="float:right; margin-left: 20px;margin-top:70px;margin-bottom: 20px"
          > 审批
          </el-button>
          </div>