Merge remote-tracking branch 'origin/master'

src/utils/dict.ts

@@ -234,5 +234,6 @@ export enum DICT_TYPE {
   MUSEUMS_SOURCE='museums_source',//博物馆标本来源
   MUSEUMS_SPECIMEN_TYPE='museums_specimen_type',//博物馆标本类型
   MUSEUMS_APPROAL_STATUS='museums_approal_status',//博物馆标本审批状态
-
+  MUSEUMS_SPECIMEN_PRESERVATION_STATUS = 'museums_specimen_preservation_status',//博物馆标本保存状态
+  MUSEUMS_SPECIMEN_MAIN_USES ='museums_specimen_main_uses'
 }

src/views/museums/specimeninfo/SpecimenInfoForm.vue

@@ -1,10 +1,10 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" >
     <el-form
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="110px"
       v-loading="formLoading"
     >
       <el-form-item label="标本类型" prop="specimenType">
@@ -27,13 +27,22 @@
       <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 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="chineseName">
         <el-input v-model="formData.chineseName" placeholder="请输入中文名称"/>
       </el-form-item>
-      <el-form-item label="英文名称" prop="englishName">
+      <el-form-item label="外文名称" prop="englishName">
         <el-input v-model="formData.englishName" placeholder="请输入英文名称"/>
       </el-form-item>
       <el-form-item label="保存类型" prop="preservationType">
@@ -50,16 +59,22 @@
       <el-form-item label="成分" prop="composition">
         <el-input v-model="formData.composition" placeholder="请输入成分"/>
       </el-form-item>
-      <el-form-item label="产地" prop="origin">
+      <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>
       <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 label="地质产状或层位" prop="preservedLayer">
+        <el-input v-model="formData.preservedLayer" placeholder="请输入地质产状或层位"/>
       </el-form-item>
-      <el-form-item label="陨石类型" prop="meteoriteType">
+      <el-form-item label="分类" prop="meteoriteType">
         <el-input v-model="formData.meteoriteType" placeholder="请输入陨石类型"/>
       </el-form-item>
       <el-form-item label="国际命名" prop="internationalName">
@@ -83,18 +98,18 @@
       </el-form-item>
 
       <el-form-item label="规格（cm）" prop="size">
-        <el-input v-model="formData.size" placeholder="请输入尺寸"/>
+        <el-input v-model="formData.size" placeholder="请输入规格"/>
       </el-form-item>
       <el-form-item label="重量（g）" prop="weight">
         <el-input v-model="formData.weight" placeholder="请输入重量"/>
       </el-form-item>
-      <el-form-item label="成分/化学式）" prop="weight">
+      <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 label="单价" prop="specimenAmount">
+        <el-input v-model="formData.specimenAmount" placeholder="请输入单价"/>
       </el-form-item>
-      <el-form-item label="数量" prop="specimenPrice">
+      <el-form-item label="数量（件/套）" prop="specimenPrice">
         <el-input v-model="formData.specimenPrice" placeholder="请输入数量"/>
       </el-form-item>
       <el-form-item label="来源" prop="source">
@@ -119,10 +134,17 @@
         />
       </el-form-item>
       <el-form-item label="主要用途" prop="mainPurpose">
-        <el-input v-model="formData.mainPurpose" placeholder="请输入主要用途"/>
+        <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-input v-model="formData.purpose" placeholder="请输入具体用途"/>
       </el-form-item>
       <el-form-item label="文献资料" prop="description">
         <Editor v-model="formData.description" height="150px"/>
@@ -239,7 +261,10 @@ const formData = ref({
   deletedReason: undefined,
   operator: undefined,
   entryDate: undefined,
-  mainPurpose:undefined
+  mainPurpose:undefined,
+  saveStatus:undefined,
+  country:undefined,
+  economize:undefined
 })
 const formRules = reactive({
   specimenType: [{