Merge remote-tracking branch 'origin/master'

src/views/museums/specimeninfo/specimenDetails.vue

@@ -18,42 +18,53 @@
                   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">{{ specimenTypeText }}
-                  </el-descriptions-item>
-                  <el-descriptions-item label-class-name="my-label" label="保存状态:"
-                                        label-align="right">{{
-                      saveStatusText
-                    }}
-                  </el-descriptions-item>
                   <el-descriptions-item label-class-name="my-label" label="标本编号:"
                                         label-align="right">{{
                       specimenData.specimenNumber
                     }}
                   </el-descriptions-item>
+                  <el-descriptions-item label-class-name="my-label" label="标本类型:"
+                                        label-align="right">{{ specimenTypeText }}
+                  </el-descriptions-item>
                   <el-descriptions-item label="资产号:" label-align="right"
                                         label-class-name="my-label">{{
                       specimenData.assetNumber
                     }}
                   </el-descriptions-item>
-                  <el-descriptions-item label="存放位置:" label-align="right"
-                                        label-class-name="my-label">{{
-                      specimenData.storageLocation
-                    }}
-                  </el-descriptions-item>
 
+                  <el-descriptions-item label="保存类型:" label-class-name="my-label"
+                                        label-align="right">{{ preservationTypeText }}
+                  </el-descriptions-item>
                   <el-descriptions-item label="中文名称:" label-align="right"
                                         label-class-name="my-label">{{
                       specimenData.chineseName
                     }}
                   </el-descriptions-item>
-
+                  <el-descriptions-item label-class-name="my-label" label="保存状态:"
+                                        label-align="right">{{
+                      saveStatusText
+                    }}
+                  </el-descriptions-item>
+                  <!--                  <el-descriptions-item label="存放位置:" label-align="right"-->
+                  <!--                                        label-class-name="my-label">{{-->
+                  <!--                      specimenData.storageLocation-->
+                  <!--                    }}-->
+                  <!--                  </el-descriptions-item>-->
                   <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.storageLocation
+                    }}
+                  </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"
                                         v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 ">
@@ -66,7 +77,6 @@
                       specimenData.country
                     }}
                   </el-descriptions-item>
-                  \
                   <el-descriptions-item label="省:" label-align="right" label-class-name="my-label">
                     {{
                       specimenData.economize
@@ -106,14 +116,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 ">
@@ -156,12 +166,22 @@
                       specimenData.size
                     }}
                   </el-descriptions-item>
+                  <el-descriptions-item label="主要用途:" label-class-name="my-label"
+                                        label-align="right">{{
+                      mainPurposeText
+                    }}
+                  </el-descriptions-item>
+                  <el-descriptions-item label="具体用途:" label-class-name="my-label"
+                                        label-align="right">{{
+                      specimenData.purpose
+                    }}
+                  </el-descriptions-item>
                 </el-descriptions>
               </el-card>
               <el-card style="margin-bottom: 5px">
                 <template #header>
                   <div class="card-header" style="text-align: center">
-                    <h1 class="text1">标本保存与来源</h1>
+                    <h1 class="text1">标本来源</h1>
                   </div>
                 </template>
                 <el-descriptions
@@ -171,9 +191,6 @@
                   :size="size"
                   border
                 >
-                  <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>
@@ -197,26 +214,26 @@
                       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">
                 <template #header>
                   <div class="card-header" style="text-align: center">
-                    <h1 class="text1" style="">标本用途与资料</h1>
+                    <h1 class="text1" style="">标本文献资料</h1>
                   </div>
                 </template>
                 <el-descriptions
@@ -226,22 +243,10 @@
                   :size="size"
                   border
                 >
-
-                  <el-descriptions-item label="主要用途:" label-class-name="my-label"
-                                        label-align="right">{{
-                      mainPurposeText
-                    }}
-                  </el-descriptions-item>
-                  <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"
                                         label-align="right">
                     <div v-html="specimenData.description">
-                  </div>
+                    </div>
                   </el-descriptions-item>
                 </el-descriptions>
               </el-card>
@@ -299,7 +304,7 @@
         <el-card style="margin-top: 10px">
           <template #header>
             <div class="card-header">
-              <h1 class="text1" style="margin-bottom: 10px">馆藏状态</h1>
+              <h1 class="text1" style="margin-bottom: 10px">馆藏状态：{{ collectionStatusText }}</h1>
             </div>
           </template>
           <el-scrollbar height="650px">
@@ -312,7 +317,7 @@
               >
                 <h4>{{ formatDate(item.createTime) }}</h4>
                 <el-card>
-                  <h4>操作状态：{{ item.subType }}</h4>
+                  <h4>操作类型：{{ item.subType }}</h4>
                   <div style="line-height: 30px">操作人：{{ item.userName }}</div>
                   <div style="line-height: 20px">操作内容：{{ item.action }}</div>
                 </el-card>
@@ -462,6 +467,22 @@ const mainPurposeText = computed(() => {
       return '';
   }
 });
+/**馆藏状态**/
+const collectionStatusText = computed(() => {
+  if (specimenData.value === null) {
+    return '';
+  }
+  switch (specimenData.value.collectionStatus) {
+    case 0:
+      return '在馆';
+    case 1:
+      return '借出';
+    case 2:
+      return '展陈';
+    default:
+      return '';
+  }
+});
 // // 在组件加载时获取数据
 onMounted(async () => {
   await fetchData()