Merge remote-tracking branch 'origin/master'

src/views/museums/specimeninfo/SpecimenInfoForm.vue

@@ -7,44 +7,39 @@
       label-width="110px"
       v-loading="formLoading"
     >
-      <el-form-item label="标本类型" prop="specimenType">
-        <el-select v-model="formData.specimenType"
-                   placeholder="请选择标本类型">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="标本编号" prop="specimenNumber">
         <el-input v-model="formData.specimenNumber" placeholder="请输入标本编号"/>
       </el-form-item>
       <el-form-item label="资产号" prop="assetNumber">
         <el-input v-model="formData.assetNumber" placeholder="请输入资产号"/>
       </el-form-item>
-      <el-form-item label="存放位置" prop="storageLocation">
-        <el-input v-model="formData.storageLocation" placeholder="请输入存放位置"/>
+      <el-form-item label="中文名称" prop="chineseName">
+        <el-input v-model="formData.chineseName" placeholder="请输入中文名称"/>
       </el-form-item>
-      <el-form-item label="保存状态" prop="saveStatus">
-
-        <el-select v-model="formData.saveStatus"
-                   placeholder="请选择保存状态">
+      <el-form-item label="外文名称" prop="englishName">
+        <el-input v-model="formData.englishName" placeholder="请输入英文名称"/>
+      </el-form-item>
+      <el-form-item label="国际命名" prop="internationalName">
+        <el-input v-model="formData.internationalName" placeholder="请输入国际命名"/>
+      </el-form-item>
+      <el-form-item label="国家" prop="country">
+        <el-input v-model="formData.country" placeholder="请输入国家"/>
+      </el-form-item>
+      <el-form-item label="省" prop="economize">
+        <el-input v-model="formData.economize" placeholder="请输入省"/>
+      </el-form-item>
+      <el-form-item label="标本类型" prop="specimenType">
+        <el-select v-model="formData.specimenType"
+                   placeholder="请选择标本类型">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_PRESERVATION_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="中文名称" prop="chineseName">
-        <el-input v-model="formData.chineseName" placeholder="请输入中文名称"/>
-      </el-form-item>
-      <el-form-item label="外文名称" prop="englishName">
-        <el-input v-model="formData.englishName" placeholder="请输入英文名称"/>
-      </el-form-item>
       <el-form-item label="保存类型" prop="preservationType">
         <el-select v-model="formData.preservationType"
                    placeholder="请选择保存类型">
@@ -55,48 +50,56 @@
             :value="dict.value"
           />
         </el-select>
+      </el-form-item >
+      <el-form-item label="保存状态" prop="saveStatus">
+
+      <el-select v-model="formData.saveStatus"
+                 placeholder="请选择保存状态">
+        <el-option
+          v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_PRESERVATION_STATUS)"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+      </el-select>
+    </el-form-item>
+      <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="country">
-        <el-input v-model="formData.origin" placeholder="请输入产地"/>
-      </el-form-item>
-      <el-form-item label="国家" prop="country">
-        <el-input v-model="formData.country" placeholder="请输入国家"/>
-      </el-form-item>
-      <el-form-item label="省" prop="economize">
-        <el-input v-model="formData.economize" placeholder="请输入省"/>
+
+
+      <el-form-item label="成分/化学式" prop="weight">
+        <el-input v-model="formData.composition" placeholder="请输入成分/化学式"/>
       </el-form-item>
       <el-form-item label="形成时代" prop="era">
         <el-input v-model="formData.era" placeholder="请输入形成时代"/>
       </el-form-item>
-      <el-form-item label="地质产状或层位" prop="preservedLayer">
-        <el-input v-model="formData.preservedLayer" placeholder="请输入地质产状或层位"/>
-      </el-form-item>
-      <el-form-item label="分类" prop="meteoriteType">
-        <el-input v-model="formData.meteoriteType"
-                  placeholder="请输入矿物的类型/岩石的类型/化石的类型/陨石的类型"/>
-      </el-form-item>
-      <el-form-item label="国际命名" prop="internationalName">
-        <el-input v-model="formData.internationalName" placeholder="请输入国际命名"/>
-      </el-form-item>
-      <el-form-item label="发现时间" prop="discoveryTime">
+      <el-form-item label="降落时间" prop="fallTime">
         <el-date-picker
-          v-model="formData.discoveryTime"
+          v-model="formData.fallTime"
           type="date"
           value-format="x"
-          placeholder="选择发现时间"
+          placeholder="选择降落时间"
         />
       </el-form-item>
-      <el-form-item label="降落时间" prop="fallTime">
+      <el-form-item label="发现时间" prop="discoveryTime">
         <el-date-picker
-          v-model="formData.fallTime"
+          v-model="formData.discoveryTime"
           type="date"
           value-format="x"
-          placeholder="选择降落时间"
+          placeholder="选择发现时间"
         />
       </el-form-item>
+      <el-form-item label="产地" prop="country">
+        <el-input v-model="formData.origin" placeholder="请输入产地"/>
+      </el-form-item>
+      <el-form-item label="地质产状或层位" prop="preservedLayer">
+        <el-input v-model="formData.preservedLayer" placeholder="请输入地质产状或层位"/>
+      </el-form-item>
+      <el-form-item label="分类" prop="meteoriteType">
+        <el-input v-model="formData.meteoriteType"
+                  placeholder="请输入矿物的类型/岩石的类型/化石的类型/陨石的类型"/>
+      </el-form-item>
 
       <el-form-item label="规格（cm）" prop="size">
         <el-input v-model="formData.size" placeholder="请输入规格"/>
@@ -104,15 +107,26 @@
       <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="specimenPrice">
         <el-input v-model="formData.specimenPrice" placeholder="请输入单价"/>
       </el-form-item>
       <el-form-item label="数量（件/套）" prop="specimenAmount">
         <el-input v-model="formData.specimenAmount" placeholder="请输入数量"/>
       </el-form-item>
+      <el-form-item label="主要用途" prop="mainPurpose">
+        <el-select v-model="formData.mainPurpose" placeholder="请选择主要用途">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_MAIN_USES)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="具体用途" prop="purpose">
+        <el-input v-model="formData.purpose" placeholder="请输入具体用途"/>
+      </el-form-item>
       <el-form-item label="来源" prop="source">
         <el-select v-model="formData.source" placeholder="请选择来源">
           <el-option
@@ -123,9 +137,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="标本提供者" prop="provider">
-        <el-input v-model="formData.provider" placeholder="请输入标本提供者"/>
-      </el-form-item>
+
       <el-form-item label="入藏时间" prop="acquisitionTime">
         <el-date-picker
           v-model="formData.acquisitionTime"
@@ -134,19 +146,10 @@
           placeholder="选择入藏时间"
         />
       </el-form-item>
-      <el-form-item label="主要用途" prop="mainPurpose">
-        <el-select v-model="formData.mainPurpose" placeholder="请选择主要用途">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_MAIN_USES)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="具体用途" prop="purpose">
-        <el-input v-model="formData.purpose" placeholder="请输入具体用途"/>
+      <el-form-item label="标本提供者" prop="provider">
+        <el-input v-model="formData.provider" placeholder="请输入标本提供者"/>
       </el-form-item>
+
       <el-form-item label="文献资料" prop="description">
         <Editor v-model="formData.description" height="250px"/>
       </el-form-item>

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

@@ -69,7 +69,7 @@
                   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 && outboundData.attachments">
                     <a :href="outboundData.attachments" target="_blank">下载附件</a>
                   </div>
                 </el-descriptions-item>

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

@@ -129,7 +129,7 @@
 <!--                      :underline="false"-->
 <!--                      target="_blank"-->
 <!--                    >下载</el-link>-->
-                    <div class="demo-image__preview" v-if="outboundData">
+                    <div class="demo-image__preview" v-if="outboundData && outboundData.attachments">
                       <a :href="outboundData.attachments" target="_blank">下载附件</a>
                     </div>
                   </el-descriptions-item>
@@ -142,7 +142,7 @@
                     class-name="my-content"
                   >
 
-                    <div class="demo-image__preview" v-if="outboundData">
+                    <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">-->